summaryrefslogtreecommitdiff
path: root/res
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 /res
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 'res')
-rw-r--r--res/res_xmpp.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/res/res_xmpp.c b/res/res_xmpp.c
index bec68b786..3a2ad13c9 100644
--- a/res/res_xmpp.c
+++ b/res/res_xmpp.c
@@ -284,6 +284,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<para>Specifying a prefix of <literal>xmpp:</literal> will send the
message as an XMPP chat message.</para>
</info>
+ <info name="XMPPMessageFromInfo" language="en_US" tech="XMPP">
+ <para>Specifying a prefix of <literal>xmpp:</literal> will specify the
+ account defined in <literal>xmpp.conf</literal> to send the message from.
+ Note that this field is required for XMPP messages.</para>
+ </info>
***/
/*! \brief Supported general configuration flags */