[asterisk-commits] eliel: branch group/appdocsxml r144299 - in /team/group/appdocsxml: ./ apps/ ...

[SVN commits to the Asterisk project]

Author: eliel
Date: Wed Sep 24 06:34:26 2008
New Revision: 144299

URL: http://svn.digium.com/view/asterisk?view=rev&rev=144299
Log:
Fix some issues in the XML deffinition of some applications.
Complete the DTD definition.
Install appdocsxml.dtd to the same directory where core-en_US.xml is being installed (for validation purposes).

Modified:
    team/group/appdocsxml/Makefile
    team/group/appdocsxml/apps/app_dial.c
    team/group/appdocsxml/apps/app_fax.c
    team/group/appdocsxml/apps/app_senddtmf.c
    team/group/appdocsxml/doc/appdocsxml.dtd

Modified: team/group/appdocsxml/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/Makefile?view=diff&rev=144299&r1=144298&r2=144299
==============================================================================
--- team/group/appdocsxml/Makefile (original)
+++ team/group/appdocsxml/Makefile Wed Sep 24 06:34:26 2008
@@ -485,6 +485,7 @@
 documentation:
 	@echo -n "Building Documentation For: "
 	@echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > doc/core-en_US.xml
+	@echo "<!DOCTYPE docs SYSTEM \"appdocsxml.dtd\">" >> doc/core-en_US.xml
 	@echo "<docs>" >> doc/core-en_US.xml
 	@for x in $(MOD_SUBDIRS); do \
 		echo -n "$$x " ; \
@@ -550,6 +551,7 @@
 	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
 	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
 	$(INSTALL) -m 644 doc/core-*.xml $(ASTVARLIBDIR) 
+	$(INSTALL) -m 644 doc/appdocsxml.dtd $(ASTVARLIBDIR)
 	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
 	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
 	$(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8

Modified: team/group/appdocsxml/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/apps/app_dial.c?view=diff&rev=144299&r1=144298&r2=144299
==============================================================================
--- team/group/appdocsxml/apps/app_dial.c (original)
+++ team/group/appdocsxml/apps/app_dial.c Wed Sep 24 06:34:26 2008
@@ -400,11 +400,11 @@
 					<value name="CANCEL" />
 					<value name="DONTCALL">
 						For the Privacy and Screening Modes.
-						Will be set if the called party chooses to send the calling partey to the <literal>Go Away</literal> script.
+						Will be set if the called party chooses to send the calling partey to the 'Go Away' script.
 					</value>
 					<value name="TORTURE">
 						For the Privacy and Screening Modes.
-						Will be set if the called party chooses to send the calling partey to the <literal>torture</literal> script.
+						Will be set if the called party chooses to send the calling partey to the 'torture' script.
 					</value>
 					<value name="INVALIDARGS" />
 				</variable>

Modified: team/group/appdocsxml/apps/app_fax.c
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/apps/app_fax.c?view=diff&rev=144299&r1=144298&r2=144299
==============================================================================
--- team/group/appdocsxml/apps/app_fax.c (original)
+++ team/group/appdocsxml/apps/app_fax.c Wed Sep 24 06:34:26 2008
@@ -85,10 +85,6 @@
 				</variable>
 			</variablelist>
 		</description>
-		<return>
-	   		<value name="0">Success</value>
-			<value name="1">Failure</value>
-		</return>
 	</application>
 	<application name="ReceiveFAX" language="en_US">
 		<synopsis>
@@ -137,10 +133,6 @@
 				</variable>
 			</variablelist>
 		</description>
-		<return>
-	   		<value name="0">Success</value>
-			<value name="-1">Failure if user hangup or channel error</value>
-		</return>
 	</application>
 
  ***/

Modified: team/group/appdocsxml/apps/app_senddtmf.c
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/apps/app_senddtmf.c?view=diff&rev=144299&r1=144298&r2=144299
==============================================================================
--- team/group/appdocsxml/apps/app_senddtmf.c (original)
+++ team/group/appdocsxml/apps/app_senddtmf.c Wed Sep 24 06:34:26 2008
@@ -41,15 +41,15 @@
 			Sends arbitrary DTMF digits
 		</synopsis>
 		<syntax>
-			<argument name="digits" required="true">
+			<parameter name="digits" required="true">
 				<para>List of digits 0-9,*#,abcd</para>
-			</argument>
-			<argument name="timeout_ms" required="false">
+			</parameter>
+			<parameter name="timeout_ms" required="false">
 				<para>Amount of time to wait in ms between tones. (defaults to .25s)</para>
-			</argument>
-			<argument name="duration_ms" required="false">
+			</parameter>
+			<parameter name="duration_ms" required="false">
 				<para>Duration of each digit</para>
-			</argument>
+			</parameter>
 		</syntax>
 		<description>
 			<para>DTMF digits sent to a channel with half second pause</para>

Modified: team/group/appdocsxml/doc/appdocsxml.dtd
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/doc/appdocsxml.dtd?view=diff&rev=144299&r1=144298&r2=144299
==============================================================================
--- team/group/appdocsxml/doc/appdocsxml.dtd (original)
+++ team/group/appdocsxml/doc/appdocsxml.dtd Wed Sep 24 06:34:26 2008
@@ -42,7 +42,7 @@
  
   <!ELEMENT variablelist (variable+)>
   <!ELEMENT variable (#PCDATA|value|para)*>
-  <!ATTLIST variable name CDATA #REQUIRED>
+  <!ATTLIST variable name CDATA "">
   
   <!ELEMENT value (#PCDATA)>
   <!ATTLIST value name CDATA #REQUIRED>