[PATCHv3 1/4] dtd: enhance APN with plan and usage elements

[Oleg Zhurakivskyy <oleg zhurakivskyy intel com>]

---
 serviceproviders.2.dtd |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/serviceproviders.2.dtd b/serviceproviders.2.dtd
index a0c5a31..c9ffb1f 100644
--- a/serviceproviders.2.dtd
+++ b/serviceproviders.2.dtd
@@ -12,13 +12,14 @@
 <!ATTLIST provider primary (true|false) #IMPLIED>
 
 <!ELEMENT gsm (network-id*, voicemail*, balance-check*, balance-top-up*, apn*)>
-<!ELEMENT apn (name*,
+<!ELEMENT apn (plan*,
+               usage*,
+               name*,
                gateway?,
                username?,
                password?,
                dns*)>
 <!ATTLIST apn value CDATA #REQUIRED>
-<!ATTLIST apn type (mms|prepaid|wap) #IMPLIED>
 
 <!ELEMENT voicemail (#PCDATA)>
 <!-- contains dial string used to access voicemail services for this provider -->
@@ -87,6 +88,12 @@
      PDP context negotiation and this value is not used.
 -->
 
+<!ELEMENT plan EMPTY>
+<!ATTLIST plan type (prepaid|postpaid) #REQUIRED>
+
+<!ELEMENT usage EMPTY>
+<!ATTLIST usage type (internet|mms|wap) #REQUIRED>
+
 <!ELEMENT cdma (name*,
                 username?,
                 password?,
-- 
1.7.1