Mercurial > hg > freeDiameter

changeset 1476:55b7c14ffb1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dict_dcca_3gpp: more comment improvements Expand comments for 29.140 and 29.210. Add blank rows to separate commented-out AVPs from next AVP. Fix quoting of a comment.
author Luke Mewburn <luke@mewburn.net>
date Wed, 25 Mar 2020 10:30:49 +1100
parents cdc52f83097e
children 81d8d83a38a0
files extensions/dict_dcca_3gpp/dict_dcca_3gpp.c extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv
diffstat 2 files changed, 72 insertions(+), 40 deletions(-) [+]
line wrap: on
line diff
--- a/extensions/dict_dcca_3gpp/dict_dcca_3gpp.c	Sun Mar 22 19:58:39 2020 +0100
+++ b/extensions/dict_dcca_3gpp/dict_dcca_3gpp.c	Wed Mar 25 10:30:49 2020 +1100
@@ -1223,7 +1223,7 @@
 		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
 	};
 
-	/* 3GPP TS 29.128 table 6.4.1-1 row Non-IP-Data                     */
+	/* Note: 3GPP TS 29.128 table 6.4.1-1 row Non-IP-Data               */
 	/* has type "Octetstring" instead of "OctetString".                 */
 	/* Non-IP-Data, OctetString, code 4315, section 6.4.19              */
 	{
@@ -1408,7 +1408,12 @@
 	};
 
 	/*==================================================================*/
-	/* 3GPP 29.140-700 (7.0.0 2007.07.05)                               */
+	/* 3GPP TS 29.140 V7.0.0 (2007-06)                                  */
+	/* From 3GPP 29140-700.doc                                          */
+	/*==================================================================*/
+
+	/*==================================================================*/
+	/* 3GPP TS 29.140 Table 6.3.1: Diameter MM10 Application AVPs       */
 	/*==================================================================*/
 
 	/* Served-User-Identity, Grouped, code 1100, section 6.3.1          */
@@ -1424,7 +1429,8 @@
 		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
 	};
 
-	/* reuses: MSISDN                                                   */
+	/* Note: Uses 3GPP TS 29.329 MSISDN.                                */
+
 	/* VASP-ID, UTF8String, code 1101, section 6.3.3                    */
 	{
 		struct dict_avp_data data = {
@@ -1467,7 +1473,8 @@
 		CHECK_dict_new(DICT_AVP, &data, type, NULL);
 	};
 
-	/* reuses: 3GPP-IMSI                                                */
+	/* Note: Uses 3GPP TS 29.061 3GPP-IMSI.                             */
+
 	/* Sender-Address, UTF8String, code 1104, section 6.3.7             */
 	{
 		struct dict_avp_data data = {
@@ -1507,7 +1514,7 @@
 		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
 	};
 
-	/* conflicts with one in (more common) 32.329                       */
+	/* Note: Name conflict with 3GPP TS 32.329 Sequence-Number (716).   */
 	/* Sequence-Number-29.140, Unsigned32, code 1107, section 6.3.10    */
 	{
 		struct dict_avp_data data = {
@@ -1521,7 +1528,7 @@
 		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
 	};
 
-	/* conflicts with one in (more common) 32.299                       */
+	/* Note: Name conflict with 3GPP TS 32.299 Recipient-Address (1201). */
 	/* Recipient-Address-29.140, UTF8String, code 1108, section 6.3.11  */
 	{
 		struct dict_avp_data data = {
@@ -1638,7 +1645,7 @@
 		CHECK_dict_new(DICT_AVP, &data, UTF8String_type, NULL);
 	};
 
-	/* conflicts with one in (more common) 32.299                       */
+	/* Note: Name conflict with 3GPP TS 32.299 Status (2702).           */
 	/* Status-29.140, Grouped, code 1116, section 6.3.19                */
 	{
 		struct dict_avp_data data = {
@@ -1866,6 +1873,11 @@
 	/* Replaced by 3GPP TS 29.212.                                      */
 	/*==================================================================*/
 
+	/*==================================================================*/
+	/* 3GPP TS 29.210 Table 5.2: Gx specific Diameter AVPs              */
+	/* AVPs not provided by 3GPP TS 29.212.                             */
+	/*==================================================================*/
+
 	/* PDP-Session-Operation, Enumerated, code 1015, section 5.2.21     */
 	{
 		struct dict_avp_data data = {
@@ -1891,7 +1903,7 @@
 	/* 3GPP TS 29.212 Table 5.3.0.1: Gx specific Diameter AVPs          */
 	/*==================================================================*/
 
-	/* 3GPP TS 29.212 V12.1.0 (2013-06) removed ADC-Revalidation-Time.  */
+	/* Note: 3GPP TS 29.212 V12.1.0 (2013-06) removed ADC-Revalidation-Time. */
 	/* ADC-Revalidation-Time, Time, code 2801, section 5.3.93           */
 	{
 		struct dict_avp_data data = {
@@ -2510,7 +2522,7 @@
 		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
 	};
 
-	/* 3GPP TS 29.212 V11.8.0 (2013-03) removed HeNB-BBF-FQDN.          */
+	/* Note: 3GPP TS 29.212 V11.8.0 (2013-03) removed HeNB-BBF-FQDN.    */
 	/* HeNB-BBF-FQDN, UTF8String, code 2803, section 5.3.94             */
 	{
 		struct dict_avp_data data = {
@@ -2846,6 +2858,8 @@
 		CHECK_dict_new(DICT_AVP, &data, type, NULL);
 	};
 
+	/* Note: 3GPP TS 29.212 table 5.3.0.1 row PDN-Connection-ID         */
+	/* missing M.                                                       */
 	/* PDN-Connection-ID, OctetString, code 1065, section 5.3.58        */
 	{
 		struct dict_avp_data data = {
@@ -3008,6 +3022,8 @@
 		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
 	};
 
+	/* Note: 3GPP TS 29.212 table 5.3.0.1 row PS-to-CS-Session-Continuity */
+	/* missing M.                                                       */
 	/* PS-to-CS-Session-Continuity, Enumerated, code 1099, section 5.3.84 */
 	{
 		struct dict_avp_data data = {
@@ -4363,7 +4379,7 @@
 		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
 	};
 
-	/* 3GPP TS 29.214 table 5.3.0.1 row IMS-Content-Identifier          */
+	/* Note: 3GPP TS 29.214 table 5.3.0.1 row IMS-Content-Identifier    */
 	/* missing M, assume MUST NOT.                                      */
 	/* IMS-Content-Identifier, OctetString, code 563, section 5.3.60    */
 	{
@@ -4378,7 +4394,7 @@
 		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
 	};
 
-	/* 3GPP TS 29.214 table 5.3.0.1 row IMS-Content                     */
+	/* Note: 3GPP TS 29.214 table 5.3.0.1 row IMS-Content               */
 	/* missing M, assume MUST NOT.                                      */
 	/* IMS-Content-Type, Enumerated, code 564, section 5.3.61           */
 	{
@@ -5575,7 +5591,7 @@
 	/*==================================================================*/
 
 	/*==================================================================*/
-	/* 3GPP TS 29.272 Table 7.3.1/1: S6a/S6d                            */
+	/* 3GPP TS 29.272 Table 7.3.1/1: S6a/S6d, S7a/S7d and S13/S13' specific DiameterAVPs */
 	/*==================================================================*/
 
 	/* Subscription-Data, Grouped, code 1400, section 7.3.2             */
@@ -6563,7 +6579,7 @@
 		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
 	};
 
-	/* 3GPP TS 29.272 V12.5.0 (2014-06) corrected table 7.3.1/1         */
+	/* Note: 3GPP TS 29.272 V12.5.0 (2014-06) corrected table 7.3.1/1   */
 	/* row SS-Status to be OctetString instead of Grouped.              */
 	/* Clause 7.3.88 already described SS-Status as OctetString.        */
 	/* SS-Status, OctetString, code 1477, section 7.3.88                */
@@ -6718,7 +6734,7 @@
 		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
 	};
 
-	/* 3GPP TS 29.272 V12.4.0 (2014-03) renamed                         */
+	/* Note: 3GPP TS 29.272 V12.4.0 (2014-03) renamed                   */
 	/* Call-Barring-Infor-List to Call-Barring-Info.                    */
 	/* Call-Barring-Info, Grouped, code 1488, section 7.3.101           */
 	{
@@ -6888,7 +6904,7 @@
 		CHECK_dict_new(DICT_AVP, &data, type, NULL);
 	};
 
-	/* 3GPP TS 29.272 table 7.3.1/1 incorrectly has a space             */
+	/* Note: 3GPP TS 29.272 table 7.3.1/1 incorrectly has a space       */
 	/* instead of hyphen in the row for MME-Location-Information.       */
 	/* Generated name renamed from MME-LocationInformation.             */
 	/* MME-Location-Information, Grouped, code 1600, section 7.3.115    */
@@ -7576,7 +7592,7 @@
 		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
 	};
 
-	/* 3GPP TS 29.272 V12.9.0 (2015-12) changed AVP code of             */
+	/* Note: 3GPP TS 29.272 V12.9.0 (2015-12) changed AVP code of       */
 	/* Measurement-Period-LTE from 1656 to 1655.                        */
 	/* Measurement-Period-LTE, Enumerated, code 1655, section 7.3.166   */
 	{
@@ -7594,7 +7610,7 @@
 		CHECK_dict_new(DICT_AVP, &data, type, NULL);
 	};
 
-	/* 3GPP TS 29.272 V12.9.0 (2015-12) changed AVP code of             */
+	/* Note: 3GPP TS 29.272 V12.9.0 (2015-12) changed AVP code of       */
 	/* Measurement-Period-UMTS from 1655 to 1656.                       */
 	/* Measurement-Period-UMTS, Enumerated, code 1656, section 7.3.167  */
 	{
@@ -7998,7 +8014,7 @@
 		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
 	};
 
-	/* 3GPP TS 29.272 table 7.3.1/1 row Preferred-Data-Mode             */
+	/* Note: 3GPP TS 29.272 table 7.3.1/1 row Preferred-Data-Mode       */
 	/* incorrectly has value type Grouped instead of Unsigned32,        */
 	/* conflicting with clause 7.3.209.                                 */
 	/* Preferred-Data-Mode, Unsigned32, code 1686, section 7.3.209      */
@@ -8310,7 +8326,7 @@
 		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
 	};
 
-	/* Name conflict with 29.229 User-Data (606), renamed               */
+	/* Note: Name conflict with 3GPP TS 29.229 User-Data (606).         */
 	/* User-Data-29.329, OctetString, code 702, section 6.3.3           */
 	{
 		struct dict_avp_data data = {
@@ -10065,7 +10081,7 @@
 		CHECK_dict_new(DICT_AVP, &data, type, NULL);
 	};
 
-	/* 3GPP TS 32.299 V11.8.0 (2013-07) corrected table 7.2             */
+	/* Note: 3GPP TS 32.299 V11.8.0 (2013-07) corrected table 7.2       */
 	/* to have a hyphen instead of space in the name.                   */
 	/* Generated name renamed from MBMSGW-Address.                      */
 	/* MBMS-GW-Address, Address, code 2307                              */
--- a/extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv	Sun Mar 22 19:58:39 2020 +0100
+++ b/extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv	Wed Mar 25 10:30:49 2020 +1100
@@ -103,7 +103,7 @@
 Number-Of-UE-Per-Location-Report,4307,6.4.12,Grouped,"M,V",,,,No
 UE-Count,4308,6.4.13,Unsigned32,"M,V",,,,No
 Connection-Action,4314,6.4.18,Unsigned32,"M,V",,,,No
-# 3GPP TS 29.128 table 6.4.1-1 row Non-IP-Data,,,,,,,,
+# Note: 3GPP TS 29.128 table 6.4.1-1 row Non-IP-Data,,,,,,,,
 "# has type ""Octetstring"" instead of ""OctetString"".",,,,,,,,
 Non-IP-Data,4315,6.4.19,OctetString,"M,V",,,,No
 Serving-PLMN-Rate-Control,4310,6.4.21,Grouped,"M,V",,,,No
@@ -122,21 +122,28 @@
 ,,,,,,,,
 @standard,3GPP TS 29.140,,,,,,,
 #=,,,,,,,,
-# 3GPP 29.140-700 (7.0.0 2007.07.05),,,,,,,,
+# 3GPP TS 29.140 V7.0.0 (2007-06),,,,,,,,
+# From 3GPP 29140-700.doc,,,,,,,,
+#=,,,,,,,,
+#,,,,,,,,
+#=,,,,,,,,
+# 3GPP TS 29.140 Table 6.3.1: Diameter MM10 Application AVPs,,,,,,,,
 #=,,,,,,,,
 #,,,,,,,,
 Served-User-Identity,1100,6.3.1,Grouped,"M,V",,,,N
-# reuses: MSISDN,701,6.3.2,OctetString,"M,V",,,,N
+# Note: Uses 3GPP TS 29.329 MSISDN.,701,6.3.2,OctetString,"M,V",,,,N
+#,,,,,,,,
 VASP-ID,1101,6.3.3,UTF8String,"M,V",,,,N
 VAS-ID,1102,6.3.4,UTF8String,"M,V",,,,N
 Trigger-Event,1103,6.3.5,Enumerated,"M,V",,,,N
-# reuses: 3GPP-IMSI,1,6.3.6,UTF8String,"M,V",,,,N
+# Note: Uses 3GPP TS 29.061 3GPP-IMSI.,1,6.3.6,UTF8String,"M,V",,,,N
+#,,,,,,,,
 Sender-Address,1104,6.3.7,UTF8String,"M,V",,,,N
 Initial-Recipient-Address,1105,6.3.8,Grouped,"M,V",,,,N
 Result-Recipient-Address,1106,6.3.9,Grouped,"M,V",,,,N
-# conflicts with one in (more common) 32.329,,,,,,,,
+# Note: Name conflict with 3GPP TS 32.329 Sequence-Number (716).,,,,,,,,
 Sequence-Number-29.140,1107,6.3.10,Unsigned32,"M,V",,,,N
-# conflicts with one in (more common) 32.299,,,,,,,,
+# Note: Name conflict with 3GPP TS 32.299 Recipient-Address (1201).,,,,,,,,
 Recipient-Address-29.140,1108,6.3.11,UTF8String,"M,V",,,,N
 Routeing-Address,1109,6.3.12,UTF8String,"M,V",,,,N
 Originating-Interface,1110,6.3.13,Enumerated,"M,V",,,,N
@@ -145,7 +152,7 @@
 Sender-Visibility,1113,6.3.16,Enumerated,"M,V",,,,N
 Service-Key,1114,6.3.17,UTF8String,"M,V",,,,N
 Billing-Information,1115,6.3.18,UTF8String,"M,V",,,,N
-# conflicts with one in (more common) 32.299,,,,,,,,
+# Note: Name conflict with 3GPP TS 32.299 Status (2702).,,,,,,,,
 Status-29.140,1116,6.3.19,Grouped,"M,V",,,,N
 Status-Code,1117,6.3.20,UTF8String,"M,V",,,,N
 Status-Text,1118,6.3.21,UTF8String,"M,V",,,,N
@@ -182,6 +189,11 @@
 # Replaced by 3GPP TS 29.212.,,,,,,,,
 #=,,,,,,,,
 #,,,,,,,,
+#=,,,,,,,,
+# 3GPP TS 29.210 Table 5.2: Gx specific Diameter AVPs,,,,,,,,
+# AVPs not provided by 3GPP TS 29.212.,,,,,,,,
+#=,,,,,,,,
+#,,,,,,,,
 PDP-Session-Operation,1015,5.2.21,Enumerated,"M,V",P,,,Y
 ,,,,,,,,
 @standard,3GPP TS 29.212,,,,,,,
@@ -194,7 +206,7 @@
 # 3GPP TS 29.212 Table 5.3.0.1: Gx specific Diameter AVPs,,,,,,,,
 #=,,,,,,,,
 #,,,,,,,,
-# 3GPP TS 29.212 V12.1.0 (2013-06) removed ADC-Revalidation-Time.,,,,,,,,
+# Note: 3GPP TS 29.212 V12.1.0 (2013-06) removed ADC-Revalidation-Time.,,,,,,,,
 ADC-Revalidation-Time,2801,5.3.93,Time,V,P,,M,Y
 3GPP-PS-Data-Off-Status,2847,5.3.133,Enumerated,V,P,,M,Y
 Access-Availability-Change-Reason,2833,5.3.121,Unsigned32,V,P,,M,Y
@@ -240,7 +252,7 @@
 Fixed-User-Location-Info,2825,5.3.112,Grouped,V,P,,M,Y
 Guaranteed-Bitrate-DL,1025,5.3.25,Unsigned32,"M,V",P,,,Y
 Guaranteed-Bitrate-UL,1026,5.3.26,Unsigned32,"M,V",P,,,Y
-# 3GPP TS 29.212 V11.8.0 (2013-03) removed HeNB-BBF-FQDN.,,,,,,,,
+# Note: 3GPP TS 29.212 V11.8.0 (2013-03) removed HeNB-BBF-FQDN.,,,,,,,,
 HeNB-BBF-FQDN,2803,5.3.94,UTF8String,V,P,,M,Y
 HeNB-Local-IP-Address,2804,5.3.95,Address,V,P,,M,Y
 IP-CAN-Session-Charging-Scope,2827,5.3.114,Enumerated,V,P,,M,Y
@@ -264,6 +276,8 @@
 Packet-Filter-Operation,1062,5.3.57,Enumerated,V,P,,M,Y
 Packet-Filter-Usage,1072,5.3.66,Enumerated,V,P,,M,Y
 PCC-Rule-Status,1019,5.3.19,Enumerated,"M,V",P,,,Y
+# Note: 3GPP TS 29.212 table 5.3.0.1 row PDN-Connection-ID,,,,,,,,
+"# missing M.",,,,,,,,
 PDN-Connection-ID,1065,5.3.58,OctetString,V,P,,,Y
 PRA-Install,2845,5.3.130,Grouped,V,P,,M,
 PRA-Remove,2846,5.3.131,Grouped,V,P,,M,
@@ -276,6 +290,8 @@
 Presence-Reporting-Area-Node,2855,5.3.141,Unsigned32,V,P,,M,Y
 Presence-Reporting-Area-Status,2823,5.3.110,Unsigned32,V,P,,M,Y
 Priority-Level,1046,5.3.45,Unsigned32,V,P,,M,Y
+# Note: 3GPP TS 29.212 table 5.3.0.1 row PS-to-CS-Session-Continuity,,,,,,,,
+"# missing M.",,,,,,,,
 PS-to-CS-Session-Continuity,1099,5.3.84,Enumerated,V,P,,,Y
 QoS-Class-Identifier,1028,5.3.17,Enumerated,"M,V",P,,,Y
 QoS-Information,1016,5.3.16,Grouped,"M,V",P,,,Y
@@ -400,10 +416,10 @@
 Flow-Status,511,5.3.11,Enumerated,"M,V",P,,,Y
 Flow-Usage,512,5.3.12,Enumerated,"M,V",P,,,Y
 GCS-Identifier,538,5.3.36,OctetString,V,P,,M,Y
-# 3GPP TS 29.214 table 5.3.0.1 row IMS-Content-Identifier,,,,,,,,
+# Note: 3GPP TS 29.214 table 5.3.0.1 row IMS-Content-Identifier,,,,,,,,
 "# missing M, assume MUST NOT.",,,,,,,,
 IMS-Content-Identifier,563,5.3.60,OctetString,V,P,,M,Y
-# 3GPP TS 29.214 table 5.3.0.1 row IMS-Content,,,,,,,,
+# Note: 3GPP TS 29.214 table 5.3.0.1 row IMS-Content,,,,,,,,
 "# missing M, assume MUST NOT.",,,,,,,,
 IMS-Content-Type,564,5.3.61,Enumerated,V,P,,M,Y
 IP-Domain-Id,537,5.3.35,OctetString,V,P,,M,Y
@@ -506,7 +522,7 @@
 #=,,,,,,,,
 #,,,,,,,,
 #=,,,,,,,,
-# 3GPP TS 29.272 Table 7.3.1/1: S6a/S6d, S7a/S7d and S13/S13' specific DiameterAVPs,,,,,,,,
+"# 3GPP TS 29.272 Table 7.3.1/1: S6a/S6d, S7a/S7d and S13/S13' specific DiameterAVPs",,,,,,,,
 #=,,,,,,,,
 #,,,,,,,,
 Subscription-Data,1400,7.3.2,Grouped,"M,V",,,,N
@@ -582,7 +598,7 @@
 GMLC-Number,1474,7.3.85,OctetString,"M,V",,,,N
 LCS-PrivacyException,1475,7.3.86,Grouped,"M,V",,,,N
 SS-Code,1476,7.3.87,OctetString,"M,V",,,,N
-# 3GPP TS 29.272 V12.5.0 (2014-06) corrected table 7.3.1/1,,,,,,,,
+# Note: 3GPP TS 29.272 V12.5.0 (2014-06) corrected table 7.3.1/1,,,,,,,,
 # row SS-Status to be OctetString instead of Grouped.,,,,,,,,
 # Clause 7.3.88 already described SS-Status as OctetString.,,,,,,,,
 SS-Status,1477,7.3.88,OctetString,"M,V",,,,N
@@ -596,7 +612,7 @@
 MO-LR,1485,7.3.96,Grouped,"M,V",,,,N
 Teleservice-List,1486,7.3.99,Grouped,"M,V",,,,N
 TS-Code,1487,7.3.100,OctetString,"M,V",,,,N
-# 3GPP TS 29.272 V12.4.0 (2014-03) renamed,,,,,,,,
+# Note: 3GPP TS 29.272 V12.4.0 (2014-03) renamed,,,,,,,,
 # Call-Barring-Infor-List to Call-Barring-Info.,,,,,,,,
 Call-Barring-Info,1488,7.3.101,Grouped,"M,V",,,,N
 SGSN-Number,1489,7.3.102,OctetString,"M,V",,,,N
@@ -610,7 +626,7 @@
 MME-User-State,1497,7.3.112,Grouped,V,,,M,N
 SGSN-User-State,1498,7.3.113,Grouped,V,,,M,N
 User-State,1499,7.3.114,Enumerated,V,,,M,N
-# 3GPP TS 29.272 table 7.3.1/1 incorrectly has a space,,,,,,,,
+# Note: 3GPP TS 29.272 table 7.3.1/1 incorrectly has a space,,,,,,,,
 # instead of hyphen in the row for MME-Location-Information.,,,,,,,,
 # Generated name renamed from MME-LocationInformation.,,,,,,,,
 MME-Location-Information,1600,7.3.115,Grouped,V,,,M,N
@@ -662,10 +678,10 @@
 Local-Time-Zone,1649,7.3.156,Grouped,V,,,M,N
 Daylight-Saving-Time,1650,7.3.164,Enumerated,V,,,M,N
 Subscription-Data-Flags,1654,7.3.165,Unsigned32,V,,,M,N
-# 3GPP TS 29.272 V12.9.0 (2015-12) changed AVP code of,,,,,,,,
+# Note: 3GPP TS 29.272 V12.9.0 (2015-12) changed AVP code of,,,,,,,,
 # Measurement-Period-LTE from 1656 to 1655.,,,,,,,,
 Measurement-Period-LTE,1655,7.3.166,Enumerated,V,,,M,N
-# 3GPP TS 29.272 V12.9.0 (2015-12) changed AVP code of,,,,,,,,
+# Note: 3GPP TS 29.272 V12.9.0 (2015-12) changed AVP code of,,,,,,,,
 # Measurement-Period-UMTS from 1655 to 1656.,,,,,,,,
 Measurement-Period-UMTS,1656,7.3.167,Enumerated,V,,,M,N
 Collection-Period-RRM-LTE,1657,7.3.168,Enumerated,V,,,M,N
@@ -697,7 +713,7 @@
 Additional-Context-ID,1683,7.3.206,Unsigned32,V,,,M,N
 SCEF-Realm,1684,7.3.207,DiameterIdentity,V,,,M,N
 Subscription-Data-Deletion,1685,7.3.208,Grouped,V,,,M,N
-# 3GPP TS 29.272 table 7.3.1/1 row Preferred-Data-Mode,,,,,,,,
+# Note: 3GPP TS 29.272 table 7.3.1/1 row Preferred-Data-Mode,,,,,,,,
 "# incorrectly has value type Grouped instead of Unsigned32,",,,,,,,,
 # conflicting with clause 7.3.209.,,,,,,,,
 Preferred-Data-Mode,1686,7.3.209,Unsigned32,V,,,M,N
@@ -729,7 +745,7 @@
 #,,,,,,,,
 User-Identity,700,6.3.1,Grouped,"M,V",,,,N
 MSISDN,701,6.3.2,OctetString,"M,V",,,,N
-"# Name conflict with 29.229 User-Data (606), renamed",,,,,,,,
+# Note: Name conflict with 3GPP TS 29.229 User-Data (606).,,,,,,,,
 User-Data-29.329,702,6.3.3,OctetString,"M,V",,,,N
 Data-Reference,703,6.3.4,Enumerated,"M,V",,,,N
 Service-Indication,704,6.3.5,OctetString,"M,V",,,,N
@@ -872,7 +888,7 @@
 Location-Type,1244,,Grouped,"M,V",P,,,N
 Low-Balance-Indication,2020,,Enumerated,"M,V",P,,,N
 Low-Priority-Indicator,2602,,Enumerated,"M,V",P,,,N
-# 3GPP TS 32.299 V11.8.0 (2013-07) corrected table 7.2,,,,,,,,
+# Note: 3GPP TS 32.299 V11.8.0 (2013-07) corrected table 7.2,,,,,,,,
 # to have a hyphen instead of space in the name.,,,,,,,,
 # Generated name renamed from MBMSGW-Address.,,,,,,,,
 MBMS-GW-Address,2307,,Address,"M,V",P,,,N
"Welcome to our mercurial repository"