From 472e29df62519e6353bbc3c4ee10544b4534bedb Mon Sep 17 00:00:00 2001 From: Matthew Jordan Date: Wed, 16 Jan 2013 17:46:15 +0000 Subject: [PATCH] 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 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@379229 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- doc/appdocsxml.dtd | 1 + res/res_jabber.c | 14 +++++++------- res/res_xmpp.c | 12 ++++++------ 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/doc/appdocsxml.dtd b/doc/appdocsxml.dtd index c379843d3f..561e3d38cd 100644 --- a/doc/appdocsxml.dtd +++ b/doc/appdocsxml.dtd @@ -48,6 +48,7 @@ + diff --git a/res/res_jabber.c b/res/res_jabber.c index fe05274ef3..e8e79051e4 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -101,8 +101,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") asterisk, configured in jabber.conf. - JABBER_STATUS - JABBER_RECEIVE + JABBER_STATUS + JABBER_RECEIVE @@ -130,8 +130,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") the asterisk XMPP account configured in jabber.conf. - JABBER_STATUS - JabberSend + JABBER_STATUS + JabberSend @@ -160,8 +160,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") the associated XMPP account configured in jabber.conf. - JABBER_RECEIVE - JabberSend + JABBER_RECEIVE + JabberSend @@ -269,7 +269,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - + Sends a message to a Jabber Client. diff --git a/res/res_xmpp.c b/res/res_xmpp.c index c924080981..3e84e41932 100644 --- a/res/res_xmpp.c +++ b/res/res_xmpp.c @@ -90,8 +90,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") asterisk, configured in xmpp.conf. - JABBER_STATUS - JABBER_RECEIVE + JABBER_STATUS + JABBER_RECEIVE @@ -119,8 +119,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") the asterisk XMPP account configured in xmpp.conf. - JABBER_STATUS - JabberSend + JABBER_STATUS + JabberSend @@ -149,8 +149,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") the associated XMPP account configured in xmpp.conf. - JABBER_RECEIVE - JabberSend + JABBER_RECEIVE + JabberSend -- 2.47.2