diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-02-05 11:49:10 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-02-05 11:49:10 -0600 |
| commit | 2177dbea50749456d909a1625a7aeda3f8c4979f (patch) | |
| tree | c52692abcfff00ac8adea56ddfe94982cfe66aee /configs | |
| parent | 6a799cd78f0f26f26afab8b123e04f16c0308c36 (diff) | |
| parent | 1d0abf86e798c61a5eff83cdfa3ed38154e0fe3e (diff) | |
Merge topic 'ASTERISK-20987' into 13
* changes:
app_confbridge: Add ability to get the muted conference state.
app_confbridge.c: Update CONFBRIDGE and CONFBRIDGE_INFO documentation.
app_confbridge: Make non-admin users join a muted conference muted.
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/samples/confbridge.conf.sample | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/configs/samples/confbridge.conf.sample b/configs/samples/confbridge.conf.sample index 0419001eb..d0bdd6fd9 100644 --- a/configs/samples/confbridge.conf.sample +++ b/configs/samples/confbridge.conf.sample @@ -334,10 +334,12 @@ type=bridge ; upon release of the video src. ; admin_toggle_mute_participants ; This action allows an administrator to toggle the mute - ; state for all non-admins within a conference. All - ; admin users are unaffected by this option. Note that all - ; users, regardless of their admin status, are notified - ; that the conference is muted. + ; state for all non-admins within a conference. + ; Subsequent non-admins joining a muted conference will + ; start muted. All admin users are unaffected by this + ; option. Note that all users, regardless of their admin + ; status, are notified that the conference is muted when + ; the state is toggled. ; participant_count ; This action plays back the number of participants currently ; in a conference |