[asterisk-commits] pabelanger: branch pabelanger/issue18556 r300567 - in /team/pabelanger/issue1...

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Tue Jan  4 21:12:23 2011
New Revision: 300567

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=300567
Log:
Resync and automerge

Modified:
    team/pabelanger/issue18556/   (props changed)
    team/pabelanger/issue18556/channels/chan_agent.c
    team/pabelanger/issue18556/channels/chan_iax2.c
    team/pabelanger/issue18556/channels/chan_sip.c
    team/pabelanger/issue18556/main/xmldoc.c

Propchange: team/pabelanger/issue18556/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/pabelanger/issue18556/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Propchange: team/pabelanger/issue18556/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jan  4 21:12:23 2011
@@ -1,1 +1,1 @@
-/trunk:1-300505
+/trunk:1-300505,300522

Modified: team/pabelanger/issue18556/channels/chan_agent.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue18556/channels/chan_agent.c?view=diff&rev=300567&r1=300566&r2=300567
==============================================================================
--- team/pabelanger/issue18556/channels/chan_agent.c (original)
+++ team/pabelanger/issue18556/channels/chan_agent.c Tue Jan  4 21:12:23 2011
@@ -167,7 +167,7 @@
 				</enumlist>
 			</parameter>
 		</syntax>
-		<description />
+		<description></description>
 	</function>
 	<manager name="Agents" language="en_US">
 		<synopsis>

Modified: team/pabelanger/issue18556/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue18556/channels/chan_iax2.c?view=diff&rev=300567&r1=300566&r2=300567
==============================================================================
--- team/pabelanger/issue18556/channels/chan_iax2.c (original)
+++ team/pabelanger/issue18556/channels/chan_iax2.c Tue Jan  4 21:12:23 2011
@@ -164,7 +164,7 @@
 				</enumlist>
 			</parameter>
 		</syntax>
-		<description />
+		<description></description>
 		<see-also>
 			<ref type="function">SIPPEER</ref>
 		</see-also>
@@ -176,7 +176,7 @@
 		<syntax>
 			<parameter name="varname" required="true" />
 		</syntax>
-		<description />
+		<description></description>
 	</function>
 	<manager name="IAXpeers" language="en_US">
 		<synopsis>

Modified: team/pabelanger/issue18556/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue18556/channels/chan_sip.c?view=diff&rev=300567&r1=300566&r2=300567
==============================================================================
--- team/pabelanger/issue18556/channels/chan_sip.c (original)
+++ team/pabelanger/issue18556/channels/chan_sip.c Tue Jan  4 21:12:23 2011
@@ -429,7 +429,7 @@
 				</enumlist>
 			</parameter>
 		</syntax>
-		<description />
+		<description></description>
 	</function>
 	<function name="SIPCHANINFO" language="en_US">
 		<synopsis>
@@ -463,7 +463,7 @@
 				</enumlist>
 			</parameter>
 		</syntax>
-		<description />
+		<description></description>
 	</function>
 	<function name="CHECKSIPDOMAIN" language="en_US">
 		<synopsis>

Modified: team/pabelanger/issue18556/main/xmldoc.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue18556/main/xmldoc.c?view=diff&rev=300567&r1=300566&r2=300567
==============================================================================
--- team/pabelanger/issue18556/main/xmldoc.c (original)
+++ team/pabelanger/issue18556/main/xmldoc.c Tue Jan  4 21:12:23 2011
@@ -1793,7 +1793,7 @@
 	node = ast_xml_find_element(ast_xml_node_get_children(node), var, NULL, NULL);
 
 	if (!node || !ast_xml_node_get_children(node)) {
-		ast_debug(1, "Cannot find variable '%s' in tree '%s'\n", name, var);
+		ast_debug(1, "Cannot find variable '%s' in tree '%s'\n", var, name);
 		return ret;
 	}