summaryrefslogtreecommitdiff
path: root/main/message.c
diff options
context:
space:
mode:
authorMatthew Jordan <mjordan@digium.com>2012-10-06 01:47:00 +0000
committerMatthew Jordan <mjordan@digium.com>2012-10-06 01:47:00 +0000
commit15b35972ff82e52864edd7b280c45c678e491002 (patch)
treece58ae89e4b62116ab190cabf99e88c0c30ec1f2 /main/message.c
parent5f9f6f38678b43c3bd1ed3a95ac22b9f8aeafd3e (diff)
Update documentation for MessageSend application/command's From field for XMPP
When using the channel technology agnostic application/AMI command MessageSend, the "From" field is technically optional for the SIP channel driver. However, if being sent by the XMPP resource module (either res_xmpp or res_jabber), the "From" field is necessary, and must correspond to a defined account. This patch updates the documentation for this application/AMI command to reflect this. (closes issue ASTERISK-20405) Reported by: Leif Madsen ........ Merged revisions 374611 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374612 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/message.c')
-rw-r--r--main/message.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/main/message.c b/main/message.c
index 83486b890..b1700547e 100644
--- a/main/message.c
+++ b/main/message.c
@@ -129,6 +129,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<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='SIPMessageFromInfo'])" />
+ <xi:include xpointer="xpointer(/docs/info[@name='XMPPMessageFromInfo'])" />
</parameter>
</syntax>
<description>
@@ -171,6 +172,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<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='SIPMessageFromInfo'])" />
+ <xi:include xpointer="xpointer(/docs/info[@name='XMPPMessageFromInfo'])" />
</parameter>
<parameter name="Body">
<para>The message body text. This must not contain any newlines as that