diff options
| author | Matthew Nicholson <mnicholson@digium.com> | 2011-10-10 14:16:27 +0000 |
|---|---|---|
| committer | Matthew Nicholson <mnicholson@digium.com> | 2011-10-10 14:16:27 +0000 |
| commit | bb07ca66a174bdf92bbdfcc4f58c9065c90b3af3 (patch) | |
| tree | 51dd35a6ca2c2285c9414e4bcec538b835fc0ddc /res | |
| parent | 7cb2ac866495b44b5525fc34650478114f40182e (diff) | |
Merged revisions 340109 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
................
r340109 | mnicholson | 2011-10-10 09:15:41 -0500 (Mon, 10 Oct 2011) | 18 lines
Merged revisions 340108 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r340108 | mnicholson | 2011-10-10 09:14:48 -0500 (Mon, 10 Oct 2011) | 11 lines
Load the proper XML documentation when multiple modules document the same application.
This patch adds an optional "module" attribute to the XML documentation spec
that allows the documentation processor to match apps with identical names from
different modules to their documentation. This patch also fixes a number of
bugs with the documentation processor and should make it a little more
efficient. Support for multiple languages has also been properly implemented.
ASTERISK-18130
Review: https://reviewboard.asterisk.org/r/1485/
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340110 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_agi.c | 8 | ||||
| -rw-r--r-- | res/res_fax.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/res/res_agi.c b/res/res_agi.c index d9c45e94d..edb7b9c38 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -3147,10 +3147,10 @@ int AST_OPTIONAL_API_NAME(ast_agi_register)(struct ast_module *mod, agi_command *((enum ast_doc_src *) &cmd->docsrc) = AST_STATIC_DOC; if (ast_strlen_zero(cmd->summary) && ast_strlen_zero(cmd->usage)) { #ifdef AST_XML_DOCS - *((char **) &cmd->summary) = ast_xmldoc_build_synopsis("agi", fullcmd); - *((char **) &cmd->usage) = ast_xmldoc_build_description("agi", fullcmd); - *((char **) &cmd->syntax) = ast_xmldoc_build_syntax("agi", fullcmd); - *((char **) &cmd->seealso) = ast_xmldoc_build_seealso("agi", fullcmd); + *((char **) &cmd->summary) = ast_xmldoc_build_synopsis("agi", fullcmd, NULL); + *((char **) &cmd->usage) = ast_xmldoc_build_description("agi", fullcmd, NULL); + *((char **) &cmd->syntax) = ast_xmldoc_build_syntax("agi", fullcmd, NULL); + *((char **) &cmd->seealso) = ast_xmldoc_build_seealso("agi", fullcmd, NULL); *((enum ast_doc_src *) &cmd->docsrc) = AST_XML_DOC; #endif #ifndef HAVE_NULLSAFE_PRINTF diff --git a/res/res_fax.c b/res/res_fax.c index c3c5a2ed6..468a2de6b 100644 --- a/res/res_fax.c +++ b/res/res_fax.c @@ -84,7 +84,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/translate.h" /*** DOCUMENTATION - <application name="ReceiveFAX" language="en_US"> + <application name="ReceiveFAX" language="en_US" module="res_fax"> <synopsis> Receive a FAX and save as a TIFF/F file. </synopsis> @@ -116,7 +116,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") <ref type="function">FAXOPT</ref> </see-also> </application> - <application name="SendFAX" language="en_US"> + <application name="SendFAX" language="en_US" module="res_fax"> <synopsis> Sends a specified TIFF/F file as a FAX. </synopsis> @@ -155,7 +155,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") <ref type="function">FAXOPT</ref> </see-also> </application> - <function name="FAXOPT" language="en_US"> + <function name="FAXOPT" language="en_US" module="res_fax"> <synopsis> Gets/sets various pieces of information about a fax session. </synopsis> |