kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Multiple revisions 379209-379210

Browse Source 
........
  r379209 | mjordan | 2013-01-16 09:27:44 -0600 (Wed, 16 Jan 2013) | 8 lines
  
  Add module tags to documentation for res_jabber/res_xmpp
  
  Since res_jabber/res_xmpp provide the same APIs (app/func/manager/etc.),
  the XML documentation for each needs to call out which module is providing
  the documentation. The module attribute has been added to the various XML
  fragments for this purpose.
........
  r379210 | mjordan | 2013-01-16 09:30:20 -0600 (Wed, 16 Jan 2013) | 4 lines
  
  Update the dtd to actually *support* the module attribute in all elements
  
  Mea culpa.
........

Merged revisions 379209-379210 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@379211 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2013-01-16 15:33:05 +00:00
parent 02e70d78b6
commit b84d37a711
3 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/appdocsxml.dtd
View File

@@ -24,14 +24,17 @@
<!ELEMENT agi (synopsis?,syntax?,description?,see-also?)> <!ELEMENT agi (synopsis?,syntax?,description?,see-also?)>
<!ATTLIST agi name CDATA #REQUIRED> <!ATTLIST agi name CDATA #REQUIRED>
<!ATTLIST agi language CDATA #REQUIRED> <!ATTLIST agi language CDATA #REQUIRED>
<!ATTLIST agi module CDATA #IMPLIED>
<!ELEMENT manager (synopsis?,syntax?,description?,see-also?)> <!ELEMENT manager (synopsis?,syntax?,description?,see-also?)>
<!ATTLIST manager name CDATA #REQUIRED> <!ATTLIST manager name CDATA #REQUIRED>
<!ATTLIST manager language CDATA #REQUIRED> <!ATTLIST manager language CDATA #REQUIRED>
<!ATTLIST manager module CDATA #IMPLIED>
<!ELEMENT managerEvent (managerEventInstance+)> <!ELEMENT managerEvent (managerEventInstance+)>
<!ATTLIST managerEvent name CDATA #REQUIRED> <!ATTLIST managerEvent name CDATA #REQUIRED>
<!ATTLIST managerEvent language CDATA #REQUIRED> <!ATTLIST managerEvent language CDATA #REQUIRED>
<!ATTLIST managerEvent module CDATA #IMPLIED>
<!ELEMENT managerEventInstance (synopsis?,syntax?,description?,see-also?)*> <!ELEMENT managerEventInstance (synopsis?,syntax?,description?,see-also?)*>
<!ATTLIST managerEventInstance class CDATA #REQUIRED> <!ATTLIST managerEventInstance class CDATA #REQUIRED>

16
res/res_jabber.c
View File

@@ -75,7 +75,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/message.h" #include "asterisk/message.h"
/*** DOCUMENTATION /*** DOCUMENTATION
<application name="JabberSend" language="en_US"> <application name="JabberSend" language="en_US" module="res_jabber">
<synopsis> <synopsis>
Sends an XMPP message to a buddy. Sends an XMPP message to a buddy.
</synopsis> </synopsis>
@@ -105,7 +105,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<ref type="function">JABBER_RECEIVE</ref> <ref type="function">JABBER_RECEIVE</ref>
</see-also> </see-also>
</application> </application>
<function name="JABBER_RECEIVE" language="en_US"> <function name="JABBER_RECEIVE" language="en_US" module="res_jabber">
<synopsis> <synopsis>
Reads XMPP messages. Reads XMPP messages.
</synopsis> </synopsis>
@@ -134,7 +134,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<ref type="application">JabberSend</ref> <ref type="application">JabberSend</ref>
</see-also> </see-also>
</function> </function>
<function name="JABBER_STATUS" language="en_US"> <function name="JABBER_STATUS" language="en_US" module="res_jabber">
<synopsis> <synopsis>
Retrieves a buddy's status. Retrieves a buddy's status.
</synopsis> </synopsis>
@@ -164,7 +164,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<ref type="application">JabberSend</ref> <ref type="application">JabberSend</ref>
</see-also> </see-also>
</function> </function>
<application name="JabberSendGroup" language="en_US"> <application name="JabberSendGroup" language="en_US" module="res_jabber">
<synopsis> <synopsis>
Send a Jabber Message to a specified chat room Send a Jabber Message to a specified chat room
</synopsis> </synopsis>
@@ -187,7 +187,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<note><para>To be able to send messages to a chat room, a user must have previously joined it. Use the <replaceable>JabberJoin</replaceable> function to do so.</para></note> <note><para>To be able to send messages to a chat room, a user must have previously joined it. Use the <replaceable>JabberJoin</replaceable> function to do so.</para></note>
</description> </description>
</application> </application>
<application name="JabberJoin" language="en_US"> <application name="JabberJoin" language="en_US" module="res_jabber">
<synopsis> <synopsis>
Join a chat room Join a chat room
</synopsis> </synopsis>
@@ -207,7 +207,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<para>Allows Asterisk to join a chat room.</para> <para>Allows Asterisk to join a chat room.</para>
</description> </description>
</application> </application>
<application name="JabberLeave" language="en_US"> <application name="JabberLeave" language="en_US" module="res_jabber">
<synopsis> <synopsis>
Leave a chat room Leave a chat room
</synopsis> </synopsis>
@@ -226,7 +226,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<para>Allows Asterisk to leave a chat room.</para> <para>Allows Asterisk to leave a chat room.</para>
</description> </description>
</application> </application>
<application name="JabberStatus" language="en_US"> <application name="JabberStatus" language="en_US" module="res_jabber">
<synopsis> <synopsis>
Retrieve the status of a jabber list member Retrieve the status of a jabber list member
</synopsis> </synopsis>
@@ -270,7 +270,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
</enumlist> </enumlist>
</description> </description>
</application> </application>
<manager name="JabberSend" language="en_US"> <manager name="JabberSend" language="en_US" module="res_jabber">
<synopsis> <synopsis>
Sends a message to a Jabber Client. Sends a message to a Jabber Client.
</synopsis> </synopsis>

16
res/res_xmpp.c
View File

@@ -64,7 +64,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/config_options.h" #include "asterisk/config_options.h"
/*** DOCUMENTATION /*** DOCUMENTATION
<application name="JabberSend" language="en_US"> <application name="JabberSend" language="en_US" module="res_xmpp">
<synopsis> <synopsis>
Sends an XMPP message to a buddy. Sends an XMPP message to a buddy.
</synopsis> </synopsis>
@@ -94,7 +94,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<ref type="function">JABBER_RECEIVE</ref> <ref type="function">JABBER_RECEIVE</ref>
</see-also> </see-also>
</application> </application>
<function name="JABBER_RECEIVE" language="en_US"> <function name="JABBER_RECEIVE" language="en_US" module="res_xmpp">
<synopsis> <synopsis>
Reads XMPP messages. Reads XMPP messages.
</synopsis> </synopsis>
@@ -123,7 +123,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<ref type="application">JabberSend</ref> <ref type="application">JabberSend</ref>
</see-also> </see-also>
</function> </function>
<function name="JABBER_STATUS" language="en_US"> <function name="JABBER_STATUS" language="en_US" module="res_xmpp">
<synopsis> <synopsis>
Retrieves a buddy's status. Retrieves a buddy's status.
</synopsis> </synopsis>
@@ -153,7 +153,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<ref type="application">JabberSend</ref> <ref type="application">JabberSend</ref>
</see-also> </see-also>
</function> </function>
<application name="JabberSendGroup" language="en_US"> <application name="JabberSendGroup" language="en_US" module="res_xmpp">
<synopsis> <synopsis>
Send a Jabber Message to a specified chat room Send a Jabber Message to a specified chat room
</synopsis> </synopsis>
@@ -176,7 +176,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<note><para>To be able to send messages to a chat room, a user must have previously joined it. Use the <replaceable>JabberJoin</replaceable> function to do so.</para></note> <note><para>To be able to send messages to a chat room, a user must have previously joined it. Use the <replaceable>JabberJoin</replaceable> function to do so.</para></note>
</description> </description>
</application> </application>
<application name="JabberJoin" language="en_US"> <application name="JabberJoin" language="en_US" module="res_xmpp">
<synopsis> <synopsis>
Join a chat room Join a chat room
</synopsis> </synopsis>
@@ -196,7 +196,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<para>Allows Asterisk to join a chat room.</para> <para>Allows Asterisk to join a chat room.</para>
</description> </description>
</application> </application>
<application name="JabberLeave" language="en_US"> <application name="JabberLeave" language="en_US" module="res_xmpp">
<synopsis> <synopsis>
Leave a chat room Leave a chat room
</synopsis> </synopsis>
@@ -215,7 +215,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<para>Allows Asterisk to leave a chat room.</para> <para>Allows Asterisk to leave a chat room.</para>
</description> </description>
</application> </application>
<application name="JabberStatus" language="en_US"> <application name="JabberStatus" language="en_US" module="res_xmpp">
<synopsis> <synopsis>
Retrieve the status of a jabber list member Retrieve the status of a jabber list member
</synopsis> </synopsis>
@@ -259,7 +259,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
</enumlist> </enumlist>
</description> </description>
</application> </application>
<manager name="JabberSend" language="en_US"> <manager name="JabberSend" language="en_US" module="res_xmpp">
<synopsis> <synopsis>
Sends a message to a Jabber Client. Sends a message to a Jabber Client.
</synopsis> </synopsis>