diff options
| author | Leif Madsen <leif@leifmadsen.com> | 2011-01-04 21:54:20 +0000 |
|---|---|---|
| committer | Leif Madsen <leif@leifmadsen.com> | 2011-01-04 21:54:20 +0000 |
| commit | 783ea39ba13365b8a865e688f5662b5e285deeee (patch) | |
| tree | e8eb964930e1a4dd429e58751f00da60b446936f | |
| parent | b9271a15e526a648640ebfe5ab3057b6a99997cb (diff) | |
Merged revisions 300521 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r300521 | lmadsen | 2011-01-04 15:53:27 -0600 (Tue, 04 Jan 2011) | 17 lines
Merged revisions 300520 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r300520 | lmadsen | 2011-01-04 15:52:41 -0600 (Tue, 04 Jan 2011) | 9 lines
Fix backwards and broken XML documentation.
(closes issue #18547)
Reported by: jcovert
Patches:
xmldoc.c.patch uploaded by jcovert (license 551)
chan_iax2.c.doc.patch uploaded by jcovert (license 551)
chan_sip.c.patch uploaded by jcovert (license 551)
chan_agent.c.patch uploaded by jcovert (license 551)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300522 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_agent.c | 2 | ||||
| -rw-r--r-- | channels/chan_iax2.c | 4 | ||||
| -rw-r--r-- | channels/chan_sip.c | 4 | ||||
| -rw-r--r-- | main/xmldoc.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 37a6688d7..7cf5e69d7 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -167,7 +167,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") </enumlist> </parameter> </syntax> - <description /> + <description></description> </function> <manager name="Agents" language="en_US"> <synopsis> diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index a6d716b3c..9532edb56 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -164,7 +164,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") </enumlist> </parameter> </syntax> - <description /> + <description></description> <see-also> <ref type="function">SIPPEER</ref> </see-also> @@ -176,7 +176,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") <syntax> <parameter name="varname" required="true" /> </syntax> - <description /> + <description></description> </function> <manager name="IAXpeers" language="en_US"> <synopsis> diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 5a30d7f25..289cf82c6 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -429,7 +429,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") </enumlist> </parameter> </syntax> - <description /> + <description></description> </function> <function name="SIPCHANINFO" language="en_US"> <synopsis> @@ -463,7 +463,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") </enumlist> </parameter> </syntax> - <description /> + <description></description> </function> <function name="CHECKSIPDOMAIN" language="en_US"> <synopsis> diff --git a/main/xmldoc.c b/main/xmldoc.c index 04b5a067f..d3597056e 100644 --- a/main/xmldoc.c +++ b/main/xmldoc.c @@ -1793,7 +1793,7 @@ static char *xmldoc_build_field(const char *type, const char *name, const char * node = ast_xml_find_element(ast_xml_node_get_children(node), var, NULL, NULL); if (!node || !ast_xml_node_get_children(node)) { - ast_log(LOG_DEBUG, "Cannot find variable '%s' in tree '%s'\n", name, var); + ast_log(LOG_DEBUG, "Cannot find variable '%s' in tree '%s'\n", var, name); return ret; } |