Merge alternate hangup and meetme patches from Matt N.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3529 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-07-28 19:25:14 +00:00
parent 5733f64bdd
commit bf70a01da6
5 changed files with 53 additions and 31 deletions

View File

@@ -66,8 +66,8 @@ static char *descrip =
" 'v' -- video mode\n"
" 'q' -- quiet mode (don't play enter/leave sounds)\n"
" 'M' -- enable music on hold when the conference has a single caller\n"
" 'x' -- exit the conference if the last marked user left\n"
" 'w' -- wait until a marked user has entered the conference\n"
" 'x' -- close the conference when last user marked with 'x' exits\n"
" 'w' -- wait until a user marked with the 'x' option 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"