[asterisk-commits] newtonr: trunk r405778 - in /trunk: ./ res/res_pjsip.c

[SVN commits to the Asterisk project]

Author: newtonr
Date: Fri Jan 17 09:14:03 2014
New Revision: 405778

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=405778
Log:
res_pjsip: enhance documentation for mailboxes options, for both endpoints and aors

Made documentation more explicit as to the use of the both options.

(issue ASTERISK-23071)
(closes issue ASTERISK-23071)
Reported by: Matt Jordan
........

Merged revisions 405777 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/res/res_pjsip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip.c?view=diff&rev=405778&r1=405777&r2=405778
==============================================================================
--- trunk/res/res_pjsip.c (original)
+++ trunk/res/res_pjsip.c Fri Jan 17 09:14:03 2014
@@ -266,7 +266,14 @@
 					</description>
 				</configOption>
 				<configOption name="mailboxes">
-					<synopsis>Mailbox(es) to be associated with</synopsis>
+					<synopsis>NOTIFY the endpoint when state changes for any of the specified mailboxes</synopsis>
+					<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 endpoints that SUBSCRIBE for MWI, you can set the <literal>mailboxes</literal> option in your AOR
+						configuration.
+					</para></description>
 				</configOption>
 				<configOption name="moh_suggest" default="default">
 					<synopsis>Default Music On Hold class</synopsis>
@@ -925,7 +932,10 @@
 					<synopsis>Mailbox(es) to be associated with</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.</para></description>
+					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.
+					</para></description>
 				</configOption>
 				<configOption name="maximum_expiration" default="7200">
 					<synopsis>Maximum time to keep an AoR</synopsis>