[asterisk-commits] eliel: branch group/appdocsxml r147094 - in /team/group/appdocsxml: apps/ main/

[SVN commits to the Asterisk project]

Author: eliel
Date: Tue Oct  7 09:14:38 2008
New Revision: 147094

URL: http://svn.digium.com/view/asterisk?view=rev&rev=147094
Log:
Allow inserting an <enumlist> element inside an <option> element.

Modified:
    team/group/appdocsxml/apps/app_chanspy.c
    team/group/appdocsxml/main/pbx.c

Modified: team/group/appdocsxml/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/apps/app_chanspy.c?view=diff&rev=147094&r1=147093&r2=147094
==============================================================================
--- team/group/appdocsxml/apps/app_chanspy.c (original)
+++ team/group/appdocsxml/apps/app_chanspy.c Tue Oct  7 09:14:38 2008
@@ -71,9 +71,17 @@
 					<option name="d">
 						<para>Override the typical numeric DTMF functionality and instead
 						use DTMF to switch between spy modes.</para>
-						<para><literal>4</literal> = spy mode</para>
-						<para><literal>5</literal> = whisper mode</para>
-						<para><literal>6</literal> = barge mode</para>
+						<enumlist>
+							<enum name="4">
+								<para>spy mode</para>
+							</enum>
+							<enum name="5">
+								<para>whisper mode</para>
+							</enum>
+							<enum name="6">
+								<para>barge mode</para>
+							</enum>
+						</enumlist>
 					</option>
 					<option name="g">
 						<argument name="grp" required="true">
@@ -181,9 +189,17 @@
 					<option name="d">
 						<para>Override the typical numeric DTMF functionality and instead
 						use DTMF to switch between spy modes.</para>
-						<para><literal>4</literal> = spy mode</para>
-						<para><literal>5</literal> = whisper mode</para>
-						<para><literal>6</literal> = barge mode</para>
+						<enumlist>
+							<enum name="4">
+								<para>spy mode</para>
+							</enum>
+							<enum name="5">
+								<para>whisper mode</para>
+							</enum>
+							<enum name="6">
+								<para>barge mode</para>
+							</enum>
+						</enumlist>
 					</option>
 					<option name="g">
 						<argument name="grp" required="true">

Modified: team/group/appdocsxml/main/pbx.c
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/main/pbx.c?view=diff&rev=147094&r1=147093&r2=147094
==============================================================================
--- team/group/appdocsxml/main/pbx.c (original)
+++ team/group/appdocsxml/main/pbx.c Tue Oct  7 09:14:38 2008
@@ -3926,9 +3926,9 @@
 			ret = 1;
 		}
 		
-		if (xmldoc_parse_variablelist(node, "        ", buffer)) {
-			ast_str_append(buffer, 0, "\n");
-		}
+		xmldoc_parse_variablelist(node, "        ", buffer);
+		
+		xmldoc_parse_enumlist(node, "        ", buffer);
 
 		node = node->AST_XML_NEXT;	
 	}