[asterisk-commits] mjordan: trunk r379229 - in /trunk: ./ doc/ res/

[SVN commits to the Asterisk project]

Author: mjordan
Date: Wed Jan 16 11:46:15 2013
New Revision: 379229

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=379229
Log:
Let documentation reference links specify which module they're linking to

Again, since res_jabber/res_xmpp have duplicate APIs, their documentation ref
links have to specify which reference they're referring to. The various
documentation parsers can interpret the module attribute however they want
in order to construct the appropriate links.
........

Merged revisions 379228 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=379229&r1=379228&r2=379229
==============================================================================
--- trunk/doc/appdocsxml.dtd (original)
+++ trunk/doc/appdocsxml.dtd Wed Jan 16 11:46:15 2013
@@ -48,6 +48,7 @@
 
   <!ELEMENT ref (#PCDATA)>
   <!ATTLIST ref type (application|function|astcli|link|manpage|filename|agi|manager|managerEvent) #REQUIRED>
+  <!ATTLIST ref module CDATA #IMPLIED>
 
   <!ELEMENT synopsis (#PCDATA)>
 

Modified: trunk/res/res_jabber.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_jabber.c?view=diff&rev=379229&r1=379228&r2=379229
==============================================================================
--- trunk/res/res_jabber.c (original)
+++ trunk/res/res_jabber.c Wed Jan 16 11:46:15 2013
@@ -101,8 +101,8 @@
 			<replaceable>asterisk</replaceable>, configured in jabber.conf.</para>
 		</description>
 		<see-also>
-			<ref type="function">JABBER_STATUS</ref>
-			<ref type="function">JABBER_RECEIVE</ref>
+			<ref type="function" module="res_jabber">JABBER_STATUS</ref>
+			<ref type="function" module="res_jabber">JABBER_RECEIVE</ref>
 		</see-also>
 	</application>
 	<function name="JABBER_RECEIVE" language="en_US" module="res_jabber">
@@ -130,8 +130,8 @@
 			the <replaceable>asterisk</replaceable> XMPP account configured in jabber.conf.</para>
 		</description>
 		<see-also>
-			<ref type="function">JABBER_STATUS</ref>
-			<ref type="application">JabberSend</ref>
+			<ref type="function" module="res_jabber">JABBER_STATUS</ref>
+			<ref type="application" module="res_jabber">JabberSend</ref>
 		</see-also>
 	</function>
 	<function name="JABBER_STATUS" language="en_US" module="res_jabber">
@@ -160,8 +160,8 @@
 			the associated XMPP account configured in jabber.conf.</para>
 		</description>
 		<see-also>
-			<ref type="function">JABBER_RECEIVE</ref>
-			<ref type="application">JabberSend</ref>
+			<ref type="function" module="res_jabber">JABBER_RECEIVE</ref>
+			<ref type="application" module="res_jabber">JabberSend</ref>
 		</see-also>
 	</function>
 	<application name="JabberSendGroup" language="en_US" module="res_jabber">
@@ -269,7 +269,7 @@
 				</enum>
 			</enumlist>
 		</description>
-        </application>
+	</application>
 	<manager name="JabberSend" language="en_US" module="res_jabber">
 		<synopsis>
 			Sends a message to a Jabber Client.

Modified: trunk/res/res_xmpp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_xmpp.c?view=diff&rev=379229&r1=379228&r2=379229
==============================================================================
--- trunk/res/res_xmpp.c (original)
+++ trunk/res/res_xmpp.c Wed Jan 16 11:46:15 2013
@@ -90,8 +90,8 @@
 			<replaceable>asterisk</replaceable>, configured in xmpp.conf.</para>
 		</description>
 		<see-also>
-			<ref type="function">JABBER_STATUS</ref>
-			<ref type="function">JABBER_RECEIVE</ref>
+			<ref type="function" module="res_xmpp">JABBER_STATUS</ref>
+			<ref type="function" module="res_xmpp">JABBER_RECEIVE</ref>
 		</see-also>
 	</application>
 	<function name="JABBER_RECEIVE" language="en_US" module="res_xmpp">
@@ -119,8 +119,8 @@
 			the <replaceable>asterisk</replaceable> XMPP account configured in xmpp.conf.</para>
 		</description>
 		<see-also>
-			<ref type="function">JABBER_STATUS</ref>
-			<ref type="application">JabberSend</ref>
+			<ref type="function" module="res_xmpp">JABBER_STATUS</ref>
+			<ref type="application" module="res_xmpp">JabberSend</ref>
 		</see-also>
 	</function>
 	<function name="JABBER_STATUS" language="en_US" module="res_xmpp">
@@ -149,8 +149,8 @@
 			the associated XMPP account configured in xmpp.conf.</para>
 		</description>
 		<see-also>
-			<ref type="function">JABBER_RECEIVE</ref>
-			<ref type="application">JabberSend</ref>
+			<ref type="function" module="res_xmpp">JABBER_RECEIVE</ref>
+			<ref type="application" module="res_xmpp">JabberSend</ref>
 		</see-also>
 	</function>
 	<application name="JabberSendGroup" language="en_US" module="res_xmpp">