diff options
| author | Rusty Newton <rnewton@digium.com> | 2014-01-21 21:48:15 +0000 |
|---|---|---|
| committer | Rusty Newton <rnewton@digium.com> | 2014-01-21 21:48:15 +0000 |
| commit | a1d6e8ebab243a8c7975b4ad45e9bdac2b40ee11 (patch) | |
| tree | 3d8902e0395b44812ea49db2e154f24a470d72af /res | |
| parent | 9a88cc33f8c2a8cd37d3040d3eb11c8b74367dcc (diff) | |
res_pjsip: Documentation improvement for Endpoint and AOR mailbox options.
Making the help text for both more explicit regarding the format of mailbox identifiers. i.e. clarifying the format for app_voicemail mailboxes vs mailboxes from external MWI sources through modules such as res_external_mwi.
........
Merged revisions 406133 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@406134 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_pjsip.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/res/res_pjsip.c b/res/res_pjsip.c index e5da2eb31..fc4afedc5 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -270,9 +270,12 @@ <description><para> Asterisk will send unsolicited MWI NOTIFY messages to the endpoint when state changes happen for any of the specified mailboxes. More than one mailbox can be - specified with a comma-delimited string. Mailboxes must be specified as mailbox@context; - for example: mailboxes=6001@default. - For endpoints that SUBSCRIBE for MWI, you can set the <literal>mailboxes</literal> option in your AOR + specified with a comma-delimited string. app_voicemail mailboxes must be specified + as mailbox@context; for example: mailboxes=6001@default. For mailboxes provided by + external sources, such as through the res_external_mwi module, you must specify + strings supported by the external system. + </para><para> + For endpoints that SUBSCRIBE for MWI, use the <literal>mailboxes</literal> option in your AOR configuration. </para></description> </configOption> @@ -930,12 +933,17 @@ <synopsis>Default expiration time in seconds for contacts that are dynamically bound to an AoR.</synopsis> </configOption> <configOption name="mailboxes"> - <synopsis>Mailbox(es) to be associated with</synopsis> + <synopsis>Allow subscriptions for the specified mailbox(es)</synopsis> <description><para>This option applies when an external entity subscribes to an AoR - for message waiting indications. The mailboxes specified will be subscribed to. - More than one mailbox can be specified with a comma-delimited string. - For endpoints that cannot SUBSCRIBE for MWI, you can set the <literal>mailboxes</literal> option in your - Endpoint configuration section. + for Message Waiting Indications. The mailboxes specified will be subscribed to. + More than one mailbox can be specified with a comma-delimited string. + app_voicemail mailboxes must be specified as mailbox@context; + for example: mailboxes=6001@default. For mailboxes provided by external sources, + such as through the res_external_mwi module, you must specify strings supported by + the external system. + </para><para> + For endpoints that cannot SUBSCRIBE for MWI, you can set the <literal>mailboxes</literal> option in your + endpoint configuration section to enable unsolicited MWI NOTIFYs to the endpoint. </para></description> </configOption> <configOption name="maximum_expiration" default="7200"> |