Update MeetMe p and X option documentation when interacting with the s option.
authorRichard Mudgett <rmudgett@digium.com>
Wed, 12 Oct 2011 17:52:55 +0000 (17:52 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Wed, 12 Oct 2011 17:52:55 +0000 (17:52 +0000)
commit796ed62f4774525032444479d72d2b239583abc4
treef5c434451b349d797ca359beb23cf9ac69b2aa5b
parentf2cc666a9974ae8ef39ffaaed2cf555098163482
Update MeetMe p and X option documentation when interacting with the s option.

ASTERISK-12175 changed the p and X options to not interfere with the s
option when they are used together.  It makes more sense for the s option
to have priority for the DTMF '*' key since it cannot change its
activation code.  Otherwise, you could not use option s with the p or X
options.

JIRA AST-671
........

Merged revisions 340470 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 340471 from http://svn.asterisk.org/svn/asterisk/branches/10

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