[Asterisk-cvs] asterisk/apps app_authenticate.c, 1.19,
1.20 app_chanspy.c, 1.30, 1.31 app_meetme.c, 1.119,
1.120 app_queue.c, 1.174, 1.175 app_record.c, 1.42,
1.43 app_voicemail.c, 1.260, 1.261
russell
russell
Sun Nov 6 00:42:55 CST 2005
Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv20247/apps
Modified Files:
app_authenticate.c app_chanspy.c app_meetme.c app_queue.c
app_record.c app_voicemail.c
Log Message:
alphabetize option lists
Index: app_authenticate.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_authenticate.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- app_authenticate.c 26 Oct 2005 19:48:14 -0000 1.19
+++ app_authenticate.c 6 Nov 2005 05:34:13 -0000 1.20
@@ -56,11 +56,11 @@
"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"
Index: app_chanspy.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_chanspy.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- app_chanspy.c 3 Nov 2005 21:19:10 -0000 1.30
+++ app_chanspy.c 6 Nov 2005 05:34:13 -0000 1.31
@@ -53,11 +53,11 @@
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"
Index: app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- app_meetme.c 6 Nov 2005 04:52:44 -0000 1.119
+++ app_meetme.c 6 Nov 2005 05:34:13 -0000 1.120
@@ -72,34 +72,34 @@
"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 *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;
Index: app_queue.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_queue.c,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- app_queue.c 26 Oct 2005 19:48:14 -0000 1.174
+++ app_queue.c 6 Nov 2005 05:34:13 -0000 1.175
@@ -126,16 +126,16 @@
"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"
Index: app_record.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_record.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- app_record.c 1 Nov 2005 17:22:25 -0000 1.42
+++ app_record.c 6 Nov 2005 05:34:13 -0000 1.43
@@ -55,11 +55,11 @@
"- '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"
Index: app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -d -r1.260 -r1.261
--- app_voicemail.c 6 Nov 2005 05:15:29 -0000 1.260
+++ app_voicemail.c 6 Nov 2005 05:34:13 -0000 1.261
@@ -287,11 +287,11 @@
" 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 @@
"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";
More information about the svn-commits
mailing list