Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 12 insertions, 12 deletions

diff --git a/epan/dissectors/asn1/rnsap/RNSAP-PDU-Contents.asn b/epan/dissectors/asn1/rnsap/RNSAP-PDU-Contents.asn
index 1733f81a..d068ab1e 100644
--- a/epan/dissectors/asn1/rnsap/RNSAP-PDU-Contents.asn
+++ b/epan/dissectors/asn1/rnsap/RNSAP-PDU-Contents.asn
@@ -1213,7 +1213,7 @@ RL-InformationItem-RL-SetupRqstFDD ::= SEQUENCE {
 	primaryCPICH-EcNo				PrimaryCPICH-EcNo			OPTIONAL,
 	not-Used-sSDT-CellID			NULL			OPTIONAL,
 	transmitDiversityIndicator		TransmitDiversityIndicator		OPTIONAL,
-	-- This IE shall be present unless Diversity Mode IE in UL DPCH Information group is “none”
+	-- This IE shall be present unless Diversity Mode IE in UL DPCH Information group is “none”
 	iE-Extensions					ProtocolExtensionContainer { {RL-InformationItem-RL-SetupRqstFDD-ExtIEs} } OPTIONAL,
 	...
 }
@@ -1649,7 +1649,7 @@ RL-InformationResponse-RL-SetupRspTDD ::= SEQUENCE {
 	cellParameterID				CellParameterID		OPTIONAL,
 	syncCase					SyncCase			OPTIONAL,
 	sCH-TimeSlot				SCH-TimeSlot		OPTIONAL,
-	-- This IE shall be present if Sync Case IE is equal to “Case2”. --
+	-- This IE shall be present if Sync Case IE is equal to “Case2”. --
 	sCTD-Indicator				SCTD-Indicator	OPTIONAL,
 	pCCPCH-Power				PCCPCH-Power,
 	timingAdvanceApplied		TimingAdvanceApplied,
@@ -2013,7 +2013,7 @@ RL-InformationResponse-RL-SetupRspTDD768 ::= SEQUENCE {
 	cellParameterID				CellParameterID		OPTIONAL,
 	syncCase					SyncCase			OPTIONAL,
 	sCH-TimeSlot				SCH-TimeSlot		OPTIONAL,
-	-- This IE shall be present if Sync Case IE is equal to “Case2”. --
+	-- This IE shall be present if Sync Case IE is equal to “Case2”. --
 	sCTD-Indicator				SCTD-Indicator	OPTIONAL,
 	pCCPCH-Power				PCCPCH-Power,
 	timingAdvanceApplied		TimingAdvanceApplied,
@@ -2192,7 +2192,7 @@ UnsuccessfulRL-InformationResponse-RL-SetupFailureFDD ::= SEQUENCE {
 
 UnsuccessfulRL-InformationResponse-RL-SetupFailureFDD-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-Max-UE-DTX-Cycle		CRITICALITY ignore		EXTENSION Max-UE-DTX-Cycle				PRESENCE conditional },
-	-- This IE shall be present if the Cause IE is set to “Continuous Packet Connectivity UE DTX Cycle not Available”.
+	-- This IE shall be present if the Cause IE is set to “Continuous Packet Connectivity UE DTX Cycle not Available”.
 	...
 }
 
@@ -3618,7 +3618,7 @@ RL-Information-RL-ReconfPrepFDD ::= SEQUENCE {
 	not-Used-sSDT-Indication			NULL		OPTIONAL,
 	not-Used-sSDT-CellIdentity			NULL		OPTIONAL,
 	transmitDiversityIndicator		TransmitDiversityIndicator		OPTIONAL,
-	-- This IE shall be present if Diversity Mode IE is present in UL DPCH Information IE and is not equal to “none”
+	-- This IE shall be present if Diversity Mode IE is present in UL DPCH Information IE and is not equal to “none”
 	iE-Extensions					ProtocolExtensionContainer { {RL-Information-RL-ReconfPrepFDD-ExtIEs} } OPTIONAL,
 	...
 }
@@ -4742,7 +4742,7 @@ RL-ReconfigurationFailure-RL-ReconfFail ::= SEQUENCE {
 
 RL-ReconfigurationFailure-RL-ReconfFailure-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-Max-UE-DTX-Cycle		CRITICALITY ignore		EXTENSION Max-UE-DTX-Cycle				PRESENCE conditional },
-	-- This IE shall be present if the Cause IE is set to “Continuous Packet Connectivity UE DTX Cycle not Available”.
+	-- This IE shall be present if the Cause IE is set to “Continuous Packet Connectivity UE DTX Cycle not Available”.
 	...
 }
 
@@ -5540,16 +5540,16 @@ DL-PowerControlRequest ::= SEQUENCE {
 DL-PowerControlRequest-IEs RNSAP-PROTOCOL-IES ::= {
 	{ ID id-PowerAdjustmentType	CRITICALITY ignore	TYPE PowerAdjustmentType	PRESENCE mandatory} |
 	{ ID id-DLReferencePower	CRITICALITY ignore	TYPE DL-Power	PRESENCE conditional} |
-	-- This IE shall be present if Power Adjustment Type IE equals to ‘Common’
+	-- This IE shall be present if Power Adjustment Type IE equals to ‘Common’
 	{ ID id-InnerLoopDLPCStatus	CRITICALITY ignore	TYPE InnerLoopDLPCStatus	PRESENCE optional } |
 	{ ID id-DLReferencePowerList-DL-PC-Rqst	CRITICALITY ignore	TYPE DL-ReferencePowerInformationList-DL-PC-Rqst	PRESENCE conditional} |
-	-- This IE shall be present if Power Adjustment Type IE equals to ‘Individual’
+	-- This IE shall be present if Power Adjustment Type IE equals to ‘Individual’
 	{ ID id-MaxAdjustmentStep	CRITICALITY ignore	TYPE MaxAdjustmentStep	PRESENCE conditional } |
-	-- This IE shall be present if Power Adjustment Type IE equals to ‘Common’ or ‘Individual’
+	-- This IE shall be present if Power Adjustment Type IE equals to ‘Common’ or ‘Individual’
 	{ ID id-AdjustmentPeriod	CRITICALITY ignore	TYPE AdjustmentPeriod	PRESENCE conditional }|
-	-- This IE shall be present if Power Adjustment Type IE equals to ‘Common’ or ‘Individual’
+	-- This IE shall be present if Power Adjustment Type IE equals to ‘Common’ or ‘Individual’
 	{ ID id-AdjustmentRatio	CRITICALITY ignore	TYPE ScaledAdjustmentRatio	PRESENCE conditional },
-	-- This IE shall be present if Power Adjustment Type IE equals to ‘Common’ or ‘Individual’
+	-- This IE shall be present if Power Adjustment Type IE equals to ‘Common’ or ‘Individual’
 	...
 }
 
@@ -8410,7 +8410,7 @@ EnhancedRelocationRequest-IEs RNSAP-PROTOCOL-IES ::= {
 	{ ID id-Cause										CRITICALITY reject	TYPE Cause								PRESENCE mandatory}|
 	{ ID id-Permanent-NAS-UE-Identity					CRITICALITY reject	TYPE Permanent-NAS-UE-Identity			PRESENCE mandatory}|
 	{ ID id-SRNC-ID										CRITICALITY reject	TYPE RNC-ID								PRESENCE optional}|
-	-- This IE shall be present if the Relocation type IE is set to “UE involved in relocation of SRNS” --
+	-- This IE shall be present if the Relocation type IE is set to “UE involved in relocation of SRNS” --
 	{ ID id-Extended-SRNC-ID							CRITICALITY reject	TYPE Extended-RNC-ID					PRESENCE optional}|
 	{ ID id-S-RNTI										CRITICALITY reject	TYPE S-RNTI								PRESENCE mandatory}|
 	{ ID id-RANAP-EnhancedRelocationInformationRequest	CRITICALITY reject	TYPE RANAP-EnhancedRelocationInformationRequest	PRESENCE mandatory},