From: Joshua Colp <jcolp@digium.com>
Date: Wed, 11 Dec 2019 13:01:01 +0000 (-0600)
Subject: Revert "PJSIP_CONTACT: add missing argument documentation"
X-Git-Tag: 13.30.0-rc1~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1cfca5ef101839e49d00e6ac17c12fb38e82850;p=thirdparty%2Fasterisk.git

Revert "PJSIP_CONTACT: add missing argument documentation"

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
---

diff --git a/doc/appdocsxml.dtd b/doc/appdocsxml.dtd
index 9f00ee51f8..21f1b9d528 100644
--- a/doc/appdocsxml.dtd
+++ b/doc/appdocsxml.dtd
@@ -110,7 +110,7 @@
   <!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 "">
 
diff --git a/funcs/func_pjsip_contact.c b/funcs/func_pjsip_contact.c
index cb6727745d..6904df0cc9 100644
--- a/funcs/func_pjsip_contact.c
+++ b/funcs/func_pjsip_contact.c
@@ -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>