[Asterisk-cvs] asterisk/apps app_dial.c,1.169,1.170

[kpfleming]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv23797/apps

Modified Files:
	app_dial.c 
Log Message:
ensure Dial() options are sorted in help output (issue #5386)


Index: app_dial.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_dial.c,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- app_dial.c	13 Oct 2005 23:14:19 -0000	1.169
+++ app_dial.c	14 Oct 2005 00:11:50 -0000	1.170
@@ -82,45 +82,22 @@
 "  This application returns -1 if the originating channel hangs up, or if the\n"
 "call is bridged and either of the parties in the bridge terminate the call.\n"
 "The option string may contain zero or more of the following characters:\n"
-"      'd' -- allow the calling user to dial a 1 digit extension while waiting for a call to\n"
-"             be answered exiting to that extension if it exists in the context defined by\n"
-"             ${EXITCONTEXT} or the current context.\n"
-"      't' -- allow the called user to transfer the calling user by hitting #.\n"
-"      'T' -- allow the calling user to transfer the call by hitting #.\n"
-"      'w' -- allow the called user to write the conversation to disk via Monitor\n"
-"      'W' -- allow the calling user to write the conversation to disk via Monitor\n"
-"      'f' -- Forces callerid to be set as the extension of the line \n"
-"             making/redirecting the outgoing call. For example, some PSTNs\n"
-"             don't allow callerids from other extensions then the ones\n"
-"             that are assigned to you.\n"
-"      'o' -- Original (inbound) Caller*ID should be placed on the outbound leg of the call\n" 
-"             instead of using the destination extension (old style asterisk behavior)\n"
-"      'r' -- indicate ringing to the calling party, pass no audio until answered.\n"
-"      'm[(class)]' -- provide hold music to the calling party until answered (optionally\n"
-"                      with the specified class.\n"
-"      'M(x[^arg])' -- Executes the macro (x with ^ delim arg list) upon connect of the call.\n"
-"                      Also, the macro can set the MACRO_RESULT variable to do the following:\n"
-"                     -- ABORT - Hangup both legs of the call.\n"
-"                     -- CONGESTION - Behave as if line congestion was encountered.\n"
-"                     -- BUSY - Behave as if a busy signal was encountered. (n+101)\n"
-"                     -- CONTINUE - Hangup the called party and continue on in the dialplan.\n"
-"                     -- GOTO:<context>^<exten>^<priority> - Transfer the call.\n"
-"      'h' -- allow callee to hang up by hitting *.\n"
-"      'H' -- allow caller to hang up by hitting *.\n"
-"      'C' -- reset call detail record for this call.\n"
-"      'P[(x)]' -- privacy mode, using 'x' as database if provided, or the extension is used if not provided.\n"
-"      'p' -- screening mode.  Basically Privacy mode without memory.\n"
-"       'n' -- modifier for screen/privacy mode. No intros are to be saved in the priv-callerintros dir.\n"
-"       'N' -- modifier for screen/privacy mode. if callerID is present, do not screen the call.\n"
-"      'g' -- goes on in context if the destination channel hangs up\n"
-"      'G(context^exten^pri)' -- If the call is answered transfer both parties to the specified exten.\n"
-"      'A(x)' -- play an announcement to the called party, using x as file\n"
-"      'S(x)' -- hangup the call after x seconds AFTER called party picked up\n"  	
-"      'D([called][:calling])'  -- Send DTMF strings *after* called party has answered, but before the\n"
-"             call gets bridged. The 'called' DTMF string is sent to the called party, and the\n"
-"             'calling' DTMF string is sent to the calling party. Both parameters can be used alone.\n"  	
-"      'L(x[:y][:z])' -- Limit the call to 'x' ms warning when 'y' ms are left\n"
-"             repeated every 'z' ms) Only 'x' is required, 'y' and 'z' are optional.\n"
+"	'A(x)' -- play an announcement to the called party, using x as file\n"
+"	'C' -- reset call detail record for this call.\n"
+"	'd' -- allow the calling user to dial a 1 digit extension while waiting for a call to\n"
+"		be answered exiting to that extension if it exists in the context defined by\n"
+"		${EXITCONTEXT} or the current context.\n"
+"	'D([called][:calling])'  -- Send DTMF strings *after* called party has answered, but before the\n"
+"		call gets bridged. The 'called' DTMF string is sent to the called party, and the\n"
+"		'calling' DTMF string is sent to the calling party. Both parameters can be used alone.\n"  	
+"	'f' -- Forces callerid to be set as the extension of the line \n"
+"	'g' -- goes on in context if the destination channel hangs up\n"
+"	'G(context^exten^pri)' -- If the call is answered transfer both parties to the specified exten.\n"
+"	'h' -- allow callee to hang up by hitting *.\n"
+"	'H' -- allow caller to hang up by hitting *.\n"
+"	'j' -- Jump to n+101 if all of the channels were busy.\n"
+"	'L(x[:y][:z])' -- Limit the call to 'x' ms warning when 'y' ms are left\n"
+"		repeated every 'z' ms) Only 'x' is required, 'y' and 'z' are optional.\n"
 "             The following special variables are optional:\n"
 "             * LIMIT_PLAYAUDIO_CALLER    yes|no (default yes)\n"
 "                                         Play sounds to the caller.\n"
@@ -131,7 +108,30 @@
 "             * LIMIT_WARNING_FILE        File to play as warning if 'y' is defined.\n"
 "                        'timeleft' is a special sound macro to auto-say the time \n"
 "                        left and is the default.\n"
-"       'j' -- Jump to n+101 if all of the channels were busy.\n\n"
+"	'm[(class)]' -- provide hold music to the calling party until answered (optionally\n"
+"                      with the specified class.\n"
+"	'M(x[^arg])' -- Executes the macro (x with ^ delim arg list) upon connect of the call.\n"
+"                      Also, the macro can set the MACRO_RESULT variable to do the following:\n"
+"                     -- ABORT - Hangup both legs of the call.\n"
+"                     -- CONGESTION - Behave as if line congestion was encountered.\n"
+"                     -- BUSY - Behave as if a busy signal was encountered. (n+101)\n"
+"                     -- CONTINUE - Hangup the called party and continue on in the dialplan.\n"
+"                     -- GOTO:<context>^<exten>^<priority> - Transfer the call.\n"
+"	'n' -- modifier for screen/privacy mode. No intros are to be saved in the priv-callerintros dir.\n"
+"	'N' -- modifier for screen/privacy mode. if callerID is present, do not screen the call.\n"
+"	'o' -- Original (inbound) Caller*ID should be placed on the outbound leg of the call\n" 
+"             instead of using the destination extension (old style asterisk behavior)\n"
+"	'p' -- screening mode.  Basically Privacy mode without memory.\n"
+"	'P[(x)]' -- privacy mode, using 'x' as database if provided, or the extension is used if not provided.\n"
+"	'r' -- indicate ringing to the calling party, pass no audio until answered.\n"
+"	'S(x)' -- hangup the call after x seconds AFTER called party picked up\n"  	
+"	't' -- allow the called user to transfer the calling user by hitting #.\n"
+"	'T' -- allow the calling user to transfer the call by hitting #.\n"
+"             making/redirecting the outgoing call. For example, some PSTNs\n"
+"             don't allow callerids from other extensions then the ones\n"
+"             that are assigned to you.\n"
+"	'w' -- allow the called user to write the conversation to disk via Monitor\n"
+"	'W' -- allow the calling user to write the conversation to disk via Monitor\n\n"
 "  In addition to transferring the call, a call may be parked and then picked\n"
 "up by another user.\n"
 "  The optional URL will be sent to the called party if the channel supports it.\n"