alphabetize option lists

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6975 65c4cc65-6c06-0410-ace0-fbb531ad65f3

7 files changed, 42 insertions, 38 deletions

diff --git a/ChangeLog b/ChangeLog
index a7121067f..4271b9de6 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-06  Russell Bryant <russell@digium.com>
+
+	* many files: alphabetize options in applicaiton descriptions
+
 2005-11-05  Kevin P. Fleming  <kpfleming@digium.com>
 
 	* Makefile: don't rebuild asterisk/build.h unless the asterisk binary is going to be relinked for some other reason (stops spurious recompile/link every time 'make' is issued); clean up variable substitutions to use consistent syntax
diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c
index 350fdc51c..42309b2db 100755
--- a/apps/app_authenticate.c
+++ b/apps/app_authenticate.c
@@ -56,11 +56,11 @@ static char *descrip =
 "of the following letters:\n"
 "     a - Set account code to the password that is entered\n"
 "     d - Interpret path as database key, not literal file\n"
+"     j - Support jumping to n+101\n"
 "     m - Interpret path as a file which contains a list of\n"
 "         account codes and password hashes delimited with ':'\n"
 "         one per line. When password matched, corresponding\n"
 "         account code will be set\n"
-"     j - Support jumping to n+101\n"
 "     r - Remove database key upon successful entry (valid with 'd' only)\n"
 "\n"
 "When using a database key, the value associated with the key can be\n"
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index 116441cb9..d9dbd7cba 100755
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -53,11 +53,11 @@ static const char *synopsis = "Tap into any type of asterisk channel and listen
 static const char *app = "ChanSpy";
 static const char *desc = "   Chanspy([<scanspec>][|<options>])\n\n"
 "Valid Options:\n"
-" - q: quiet, don't announce channels beep, etc.\n"
 " - b: bridged, only spy on channels involved in a bridged call.\n"
-" - v([-4..4]): adjust the initial volume. (negative is quieter)\n"
 " - g(grp): enforce group.  Match only calls where their ${SPYGROUP} is 'grp'.\n"
+" - q: quiet, don't announce channels beep, etc.\n"
 " - r[(basename)]: Record session to monitor spool dir (with optional basename, default is 'chanspy')\n\n"
+" - v([-4..4]): adjust the initial volume. (negative is quieter)\n"
 "If <scanspec> is specified, only channel names *beginning* with that string will be scanned.\n"
 "('all' or an empty string are also both valid <scanspec>)\n\n"
 "While Spying:\n\n"
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 84eab66d3..e5e02975b 100755
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -72,34 +72,34 @@ static char *descrip =
 "Please note: A ZAPTEL INTERFACE MUST BE INSTALLED FOR CONFERENCING TO WORK!\n\n"
 
 "The option string may contain zero or more of the following characters:\n"
-"      'm' -- set monitor only mode (Listen only, no talking)\n"
-"      't' -- set talk only mode. (Talk only, no listening)\n"
-"      'T' -- set talker detection (sent to manager interface and meetme list)\n"
-"      'i' -- announce user join/leave\n"
-"      'p' -- allow user to exit the conference by pressing '#'\n"
-"      'X' -- allow user to exit the conference by entering a valid single\n"
-"             digit extension ${MEETME_EXIT_CONTEXT} or the current context\n"
-"             if that variable is not defined.\n"
+"      'a' -- set admin mode\n"
+"      'A' -- set marked mode\n"
+"      'b' -- run AGI script specified in ${MEETME_AGI_BACKGROUND}\n"
+"             Default: conf-background.agi\n"
+"             (Note: This does not work with non-Zap channels in the same conference)\n"
+"      'c' -- announce user(s) count on joining a conference\n"
 "      'd' -- dynamically add conference\n"
 "      'D' -- dynamically add conference, prompting for a PIN\n"
 "      'e' -- select an empty conference\n"
 "      'E' -- select an empty pinless conference\n"
-"      'v' -- video mode\n"
+"      'i' -- announce user join/leave\n"
+"      'm' -- set monitor only mode (Listen only, no talking)\n"
+"      'M' -- enable music on hold when the conference has a single caller\n"
+"      'p' -- allow user to exit the conference by pressing '#'\n"
+"      'P' -- always prompt for the pin even if it is specified\n"
+"      'q' -- quiet mode (don't play enter/leave sounds)\n"
 "      'r' -- Record conference (records as ${MEETME_RECORDINGFILE}\n"
 "             using format ${MEETME_RECORDINGFORMAT}). Default filename is\n"
 "             meetme-conf-rec-${CONFNO}-${UNIQUEID} and the default format is wav.\n"
-"      'q' -- quiet mode (don't play enter/leave sounds)\n"
-"      'c' -- announce user(s) count on joining a conference\n"
-"      'M' -- enable music on hold when the conference has a single caller\n"
-"      'x' -- close the conference when last marked user exits\n"
-"      'w' -- wait until the marked user enters the conference\n"
-"      'b' -- run AGI script specified in ${MEETME_AGI_BACKGROUND}\n"
-"         Default: conf-background.agi\n"
-"        (Note: This does not work with non-Zap channels in the same conference)\n"
 "      's' -- Present menu (user or admin) when '*' is received ('send' to menu)\n"
-"      'a' -- set admin mode\n"
-"      'A' -- set marked mode\n"
-"      'P' -- always prompt for the pin even if it is specified\n";
+"      't' -- set talk only mode. (Talk only, no listening)\n"
+"      'T' -- set talker detection (sent to manager interface and meetme list)\n"
+"      'v' -- video mode\n"
+"      'w' -- wait until the marked user enters the conference\n"
+"      'x' -- close the conference when last marked user exits\n"
+"      'X' -- allow user to exit the conference by entering a valid single\n"
+"             digit extension ${MEETME_EXIT_CONTEXT} or the current context\n"
+"             if that variable is not defined.\n";
 
 static char *descrip2 =
 "  MeetMeCount(confno[|var]): Plays back the number of users in the specifiedi\n"
@@ -109,15 +109,15 @@ static char *descrip2 =
 
 static char *descrip3 = 
 "  MeetMeAdmin(confno,command[,user]): Run admin command for conference\n"
-"      'K' -- Kick all users out of conference\n"
-"      'k' -- Kick one user out of conference\n"
 "      'e' -- Eject last user that joined\n"
-"      'L' -- Lock conference\n"
+"      'k' -- Kick one user out of conference\n"
+"      'K' -- Kick all users out of conference\n"
 "      'l' -- Unlock conference\n"
-"      'M' -- Mute conference\n"
+"      'L' -- Lock conference\n"
 "      'm' -- Unmute conference\n"
-"      'N' -- Mute entire conference (except admin)\n"
+"      'M' -- Mute conference\n"
 "      'n' -- Unmute entire conference (except admin)\n"
+"      'N' -- Mute entire conference (except admin)\n"
 "";
 
 STANDARD_LOCAL_USER;
diff --git a/apps/app_queue.c b/apps/app_queue.c
index daa543235..207cb5ee1 100755
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -126,16 +126,16 @@ static char *descrip =
 "call is bridged and  either of the parties in the bridge terminate the call.\n"
 "Returns 0 if the queue is full, nonexistent, or has no members.\n"
 "The option string may contain zero or more of the following characters:\n"
-"      't' -- allow the called user transfer the calling user\n"
-"      'T' -- to allow the calling user to transfer the call.\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"
 "      'd' -- data-quality (modem) call (minimum delay).\n"
 "      'h' -- allow callee to hang up by hitting *.\n"
 "      'H' -- allow caller to hang up by hitting *.\n"
 "      'n' -- no retries on the timeout; will exit this application and \n"
 "	      go to the next step.\n"
 "      'r' -- ring instead of playing MOH\n"
+"      't' -- allow the called user transfer the calling user\n"
+"      'T' -- to allow the calling user to transfer the call.\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"
 "  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\n"
diff --git a/apps/app_record.c b/apps/app_record.c
index c5fa93280..150aac216 100755
--- a/apps/app_record.c
+++ b/apps/app_record.c
@@ -55,11 +55,11 @@ static char *descrip =
 "- 'maxduration' is the maximum recording duration in seconds. If missing\n"
 "or 0 there is no maximum.\n"
 "- 'options' may contain any of the following letters:\n"
-"     's' : skip recording if the line is not yet answered\n"
-"     'n' : do not answer, but record anyway if line not yet answered\n"
 "     'a' : append to existing recording rather than replacing\n"
-"     't' : use alternate '*' terminator key instead of default '#'\n"
+"     'n' : do not answer, but record anyway if line not yet answered\n"
 "     'q' : quiet (do not play a beep tone)\n"
+"     's' : skip recording if the line is not yet answered\n"
+"     't' : use alternate '*' terminator key instead of default '#'\n"
 "\n"
 "If filename contains '%d', these characters will be replaced with a number\n"
 "incremented by one each time the file is recorded. \n\n"
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 103bdfe5e..03448726f 100755
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -287,11 +287,11 @@ static char *descrip_vm =
 "  VoiceMail(mailbox[@context][&mailbox[@context]][...][|options]):  Leaves"
 "voicemail for a given mailbox (must be configured in voicemail.conf).\n"
 " If the options contain: \n"
-"* 's'    instructions for leaving the message will be skipped.\n"
-"* 'u'    the \"unavailable\" greeting will be played.\n"
 "* 'b'    the \"busy\" greeting will be played.\n"
 "* 'g(#)' the specified amount of gain will be requested during message\n"
 "         recording (units are whole-number decibels (dB))\n"
+"* 's'    instructions for leaving the message will be skipped.\n"
+"* 'u'    the \"unavailable\" greeting will be played.\n"
 "If the caller presses '0' (zero) during the prompt, the call jumps to\n"
 "extension 'o' in the current context.\n"
 "If the caller presses '*' during the prompt, the call jumps to\n"
@@ -313,12 +313,12 @@ static char *descrip_vmain =
 "for the checking of voicemail. The mailbox can be passed in,\n"
 "which will stop the voicemail system from prompting the user for the mailbox.\n"
 "If the options contain: \n"
-"* 's'    the password check will be skipped.\n"
 "* 'p'    the supplied mailbox is prepended to the user's entry and\n"
 "         the resulting string is used as the mailbox number. This can\n"
 "         be useful for virtual hosting of voicemail boxes.\n"
 "* 'g(#)' the specified amount of gain will be requested during message\n"
 "         recording (units are whole-number decibels (dB))\n"
+"* 's'    the password check will be skipped.\n"
 "If a context is specified, mailboxes are considered in that voicemail context only.\n"
 "Returns -1 if the user hangs up or 0 otherwise.\n";