documentation: Add PJSIP technology to messaging documentation

........

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

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

diff --git a/main/message.c b/main/message.c
index 132ef302a37357c716c794836ed8377e5bcd080e..ef2c97f1fa0d7b697f565adc2869941754885a22 100644 (file)
--- a/main/message.c
+++ b/main/message.c
@@ -122,12 +122,14 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                <syntax>
                        <parameter name="to" required="true">
                                <para>A To URI for the message.</para>
+                               <xi:include xpointer="xpointer(/docs/info[@name='PJSIPMessageToInfo'])" />
                                <xi:include xpointer="xpointer(/docs/info[@name='SIPMessageToInfo'])" />
                                <xi:include xpointer="xpointer(/docs/info[@name='XMPPMessageToInfo'])" />
                        </parameter>
                        <parameter name="from" required="false">
                                <para>A From URI for the message if needed for the
                                message technology being used to send this message.</para>
+                               <xi:include xpointer="xpointer(/docs/info[@name='PJSIPMessageFromInfo'])" />
                                <xi:include xpointer="xpointer(/docs/info[@name='SIPMessageFromInfo'])" />
                                <xi:include xpointer="xpointer(/docs/info[@name='XMPPMessageFromInfo'])" />
                        </parameter>
@@ -165,12 +167,14 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
                        <parameter name="To" required="true">
                                <para>The URI the message is to be sent to.</para>
+                               <xi:include xpointer="xpointer(/docs/info[@name='PJSIPMessageToInfo'])" />
                                <xi:include xpointer="xpointer(/docs/info[@name='SIPMessageToInfo'])" />
                                <xi:include xpointer="xpointer(/docs/info[@name='XMPPMessageToInfo'])" />
                        </parameter>
                        <parameter name="From">
                                <para>A From URI for the message if needed for the
                                message technology being used to send this message.</para>
+                               <xi:include xpointer="xpointer(/docs/info[@name='PJSIPMessageFromInfo'])" />
                                <xi:include xpointer="xpointer(/docs/info[@name='SIPMessageFromInfo'])" />
                                <xi:include xpointer="xpointer(/docs/info[@name='XMPPMessageFromInfo'])" />
                        </parameter>

diff --git a/res/res_pjsip_messaging.c b/res/res_pjsip_messaging.c
index 00923b23bad5a6ae249ab919e1ef3625a6245da7..f5f419b1f5d0e7f4df2613f1c17c2b2e8aa98c67 100644 (file)
--- a/res/res_pjsip_messaging.c
+++ b/res/res_pjsip_messaging.c
@@ -23,6 +23,16 @@
        <support_level>core</support_level>
  ***/
 
+/*** DOCUMENTATION
+       <info name="PJSIPMessageFromInfo" language="en_US" tech="PJSIP">
+               <para>The <literal>from</literal> parameter can be a configured endpoint
+               or in the form of "display-name" &lt;URI&gt;.</para>
+       </info>
+       <info name="PJSIPMessageToInfo" language="en_US" tech="PJSIP">
+               <para>Specifying a prefix of <literal>pjsip:</literal> will send the
+               message as a SIP MESSAGE request.</para>
+       </info>
+ ***/
 #include "asterisk.h"
 
 #include "pjsua-lib/pjsua.h"