[asterisk-commits] mjordan: trunk r379211 - in /trunk: ./ doc/ res/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Jan 16 09:33:09 CST 2013
Author: mjordan
Date: Wed Jan 16 09:33:05 2013
New Revision: 379211
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=379211
Log:
Multiple revisions 379209-379210
........
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
Modified:
trunk/ (props changed)
trunk/doc/appdocsxml.dtd
trunk/res/res_jabber.c
trunk/res/res_xmpp.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.
Modified: trunk/doc/appdocsxml.dtd
URL: http://svnview.digium.com/svn/asterisk/trunk/doc/appdocsxml.dtd?view=diff&rev=379211&r1=379210&r2=379211
==============================================================================
--- trunk/doc/appdocsxml.dtd (original)
+++ trunk/doc/appdocsxml.dtd Wed Jan 16 09:33:05 2013
@@ -24,14 +24,17 @@
<!ELEMENT agi (synopsis?,syntax?,description?,see-also?)>
<!ATTLIST agi name CDATA #REQUIRED>
<!ATTLIST agi language CDATA #REQUIRED>
+ <!ATTLIST agi module CDATA #IMPLIED>
<!ELEMENT manager (synopsis?,syntax?,description?,see-also?)>
<!ATTLIST manager name CDATA #REQUIRED>
<!ATTLIST manager language CDATA #REQUIRED>
+ <!ATTLIST manager module CDATA #IMPLIED>
<!ELEMENT managerEvent (managerEventInstance+)>
<!ATTLIST managerEvent name CDATA #REQUIRED>
<!ATTLIST managerEvent language CDATA #REQUIRED>
+ <!ATTLIST managerEvent module CDATA #IMPLIED>
<!ELEMENT managerEventInstance (synopsis?,syntax?,description?,see-also?)*>
<!ATTLIST managerEventInstance class CDATA #REQUIRED>
Modified: trunk/res/res_jabber.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_jabber.c?view=diff&rev=379211&r1=379210&r2=379211
==============================================================================
--- trunk/res/res_jabber.c (original)
+++ trunk/res/res_jabber.c Wed Jan 16 09:33:05 2013
@@ -75,7 +75,7 @@
#include "asterisk/message.h"
/*** DOCUMENTATION
- <application name="JabberSend" language="en_US">
+ <application name="JabberSend" language="en_US" module="res_jabber">
<synopsis>
Sends an XMPP message to a buddy.
</synopsis>
@@ -105,7 +105,7 @@
<ref type="function">JABBER_RECEIVE</ref>
</see-also>
</application>
- <function name="JABBER_RECEIVE" language="en_US">
+ <function name="JABBER_RECEIVE" language="en_US" module="res_jabber">
<synopsis>
Reads XMPP messages.
</synopsis>
@@ -134,7 +134,7 @@
<ref type="application">JabberSend</ref>
</see-also>
</function>
- <function name="JABBER_STATUS" language="en_US">
+ <function name="JABBER_STATUS" language="en_US" module="res_jabber">
<synopsis>
Retrieves a buddy's status.
</synopsis>
@@ -164,7 +164,7 @@
<ref type="application">JabberSend</ref>
</see-also>
</function>
- <application name="JabberSendGroup" language="en_US">
+ <application name="JabberSendGroup" language="en_US" module="res_jabber">
<synopsis>
Send a Jabber Message to a specified chat room
</synopsis>
@@ -187,7 +187,7 @@
<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>
</application>
- <application name="JabberJoin" language="en_US">
+ <application name="JabberJoin" language="en_US" module="res_jabber">
<synopsis>
Join a chat room
</synopsis>
@@ -207,7 +207,7 @@
<para>Allows Asterisk to join a chat room.</para>
</description>
</application>
- <application name="JabberLeave" language="en_US">
+ <application name="JabberLeave" language="en_US" module="res_jabber">
<synopsis>
Leave a chat room
</synopsis>
@@ -226,7 +226,7 @@
<para>Allows Asterisk to leave a chat room.</para>
</description>
</application>
- <application name="JabberStatus" language="en_US">
+ <application name="JabberStatus" language="en_US" module="res_jabber">
<synopsis>
Retrieve the status of a jabber list member
</synopsis>
@@ -270,7 +270,7 @@
</enumlist>
</description>
</application>
- <manager name="JabberSend" language="en_US">
+ <manager name="JabberSend" language="en_US" module="res_jabber">
<synopsis>
Sends a message to a Jabber Client.
</synopsis>
Modified: trunk/res/res_xmpp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_xmpp.c?view=diff&rev=379211&r1=379210&r2=379211
==============================================================================
--- trunk/res/res_xmpp.c (original)
+++ trunk/res/res_xmpp.c Wed Jan 16 09:33:05 2013
@@ -64,7 +64,7 @@
#include "asterisk/config_options.h"
/*** DOCUMENTATION
- <application name="JabberSend" language="en_US">
+ <application name="JabberSend" language="en_US" module="res_xmpp">
<synopsis>
Sends an XMPP message to a buddy.
</synopsis>
@@ -94,7 +94,7 @@
<ref type="function">JABBER_RECEIVE</ref>
</see-also>
</application>
- <function name="JABBER_RECEIVE" language="en_US">
+ <function name="JABBER_RECEIVE" language="en_US" module="res_xmpp">
<synopsis>
Reads XMPP messages.
</synopsis>
@@ -123,7 +123,7 @@
<ref type="application">JabberSend</ref>
</see-also>
</function>
- <function name="JABBER_STATUS" language="en_US">
+ <function name="JABBER_STATUS" language="en_US" module="res_xmpp">
<synopsis>
Retrieves a buddy's status.
</synopsis>
@@ -153,7 +153,7 @@
<ref type="application">JabberSend</ref>
</see-also>
</function>
- <application name="JabberSendGroup" language="en_US">
+ <application name="JabberSendGroup" language="en_US" module="res_xmpp">
<synopsis>
Send a Jabber Message to a specified chat room
</synopsis>
@@ -176,7 +176,7 @@
<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>
</application>
- <application name="JabberJoin" language="en_US">
+ <application name="JabberJoin" language="en_US" module="res_xmpp">
<synopsis>
Join a chat room
</synopsis>
@@ -196,7 +196,7 @@
<para>Allows Asterisk to join a chat room.</para>
</description>
</application>
- <application name="JabberLeave" language="en_US">
+ <application name="JabberLeave" language="en_US" module="res_xmpp">
<synopsis>
Leave a chat room
</synopsis>
@@ -215,7 +215,7 @@
<para>Allows Asterisk to leave a chat room.</para>
</description>
</application>
- <application name="JabberStatus" language="en_US">
+ <application name="JabberStatus" language="en_US" module="res_xmpp">
<synopsis>
Retrieve the status of a jabber list member
</synopsis>
@@ -259,7 +259,7 @@
</enumlist>
</description>
</application>
- <manager name="JabberSend" language="en_US">
+ <manager name="JabberSend" language="en_US" module="res_xmpp">
<synopsis>
Sends a message to a Jabber Client.
</synopsis>
More information about the asterisk-commits
mailing list