]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Revert "PJSIP_CONTACT: add missing argument documentation"
authorJoshua Colp <jcolp@digium.com>
Wed, 11 Dec 2019 13:01:01 +0000 (07:01 -0600)
committerJoshua Colp <jcolp@digium.com>
Wed, 11 Dec 2019 13:01:01 +0000 (07:01 -0600)
This reverts commit 3778e1abcd9ffb7fb92253b8333e048239d9f348.

Reason for revert: Regression in XML validation.

validity error : Content model of enumlist is not determinist:
(configOptionToEnum | (configOptionToEnum , enum+) | enum+)

As we are preparing to do releases and this is not critical
I am reverting this for now until resolved.

Change-Id: I07b539d0406e8af08934a91223e850444bde1b75

doc/appdocsxml.dtd
funcs/func_pjsip_contact.c

index 9f00ee51f84fa6e747b0fc050db589d53e0cbab6..21f1b9d528edf33fdef214d3730d3d76bf1b0ea7 100644 (file)
   <!ATTLIST option implies CDATA "">
   <!ATTLIST option hasparams CDATA "">
 
-  <!ELEMENT enumlist (configOptionToEnum|(configOptionToEnum,enum+)|enum+)>
+  <!ELEMENT enumlist (configOptionToEnum|enum+)>
   <!ELEMENT enum (para|note|warning|parameter|enumlist|info|xi:include)*>
   <!ATTLIST enum name CDATA "">
 
index cb6727745d6a6bb4c5f4e177971061678b298d1a..6904df0cc9059e429963b9eb1b9b22999f7c0a2d 100644 (file)
@@ -62,12 +62,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                        <configOptionToEnum>
                                                <xi:include xpointer="xpointer(/docs/configInfo[@name='res_pjsip']/configFile[@name='pjsip.conf']/configObject[@name='contact']/configOption)"/>
                                        </configOptionToEnum>
-                                       <enum name="rtt">
-                                               <para>The RTT of the last qualify</para>
-                                       </enum>
-                                       <enum name="status">
-                                               <para>Status of the contact</para>
-                                       </enum>
                                </enumlist>
                        </parameter>
                </syntax>