diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml
index 4acc8943b..cb6eaf939 100644
--- a/examples/functions/deckPlans/DeckPlans-Example.xml
+++ b/examples/functions/deckPlans/DeckPlans-Example.xml
@@ -259,8 +259,8 @@
Double decker bus with staircase. Wheelchair and luggage spaces on lower deck.
false
true
- human
- diesel
+ human
+ diesel
bus
60
diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml
index ea2294532..8d830c9fd 100644
--- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml
+++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml
@@ -330,8 +330,8 @@ Lower deck
Double decker bus with staircase. Wheelchair and luggage spaces on lower deck.
false
true
- human
- diesel
+ human
+ diesel
bus
60
diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml
index 02018193b..ad104ae28 100644
--- a/examples/functions/deckPlans/DeckPlans-Example_train.xml
+++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml
@@ -652,7 +652,7 @@ The train reverse in the station and departs, oriented backwards to the right
4 carriage sleeper train with 2 Motorrail
[Vehicles2] [Velicles1] [Sleeper3] [Buffet1] [Sleeper1] [Sleeper1] [Engine]
true
- electric
+ electric
diff --git a/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml b/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml
index f1171e743..43597932a 100644
--- a/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml
+++ b/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml
@@ -230,7 +230,7 @@
4 carriage train
[Seating car 3] [Seating car 3] [Seating car 2] [Seating car 1] [Engine]
true
- electric
+ electric
diff --git a/examples/functions/fares/rail/Netex_era_distance_ro.xml b/examples/functions/fares/rail/Netex_era_distance_ro.xml
index d5048db21..6ae38d2a2 100644
--- a/examples/functions/fares/rail/Netex_era_distance_ro.xml
+++ b/examples/functions/fares/rail/Netex_era_distance_ro.xml
@@ -417,7 +417,7 @@ c
3 carriage train
[Wagon1] [Wagon2] [Wagon2] [Engine]
true
- electric
+ electric
204
diff --git a/examples/functions/newModes/IXSI Service 1 - Static Data.xml b/examples/functions/newModes/IXSI Service 1 - Static Data.xml
index 65b327c58..4e5b0db75 100644
--- a/examples/functions/newModes/IXSI Service 1 - Static Data.xml
+++ b/examples/functions/newModes/IXSI Service 1 - Static Data.xml
@@ -64,8 +64,8 @@
3
- combustion
- diesel
+ combustion
+ diesel
845
selfDrive
4
diff --git a/examples/functions/newModes/NewModes-CarClubExample.xml b/examples/functions/newModes/NewModes-CarClubExample.xml
index a4b33b2c4..387e94e18 100644
--- a/examples/functions/newModes/NewModes-CarClubExample.xml
+++ b/examples/functions/newModes/NewModes-CarClubExample.xml
@@ -188,8 +188,8 @@
Small car
false
true
- electric
- battery
+ electric
+ battery
selfDrive
4
diff --git a/examples/functions/newModes/NewModes-CarPoolingExample.xml b/examples/functions/newModes/NewModes-CarPoolingExample.xml
index 6c9b12a6d..600bd58d6 100644
--- a/examples/functions/newModes/NewModes-CarPoolingExample.xml
+++ b/examples/functions/newModes/NewModes-CarPoolingExample.xml
@@ -927,8 +927,8 @@ This Shows sample Purchases
true
- combustion
- petrolUnleaded
+ combustion
+ petrolUnleaded
400
full
mediumCar
diff --git a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml
index d5b9bc969..88faad935 100644
--- a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml
+++ b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml
@@ -220,8 +220,8 @@
Strech limo
true
true
- combustion electric
- petrol battery
+ combustion electric
+ petrol battery
selfDrive
7
diff --git a/examples/functions/newModes/NewModes-CycleSharingExample.xml b/examples/functions/newModes/NewModes-CycleSharingExample.xml
index ccd472e20..30f0123e1 100644
--- a/examples/functions/newModes/NewModes-CycleSharingExample.xml
+++ b/examples/functions/newModes/NewModes-CycleSharingExample.xml
@@ -211,8 +211,8 @@
Pedal cycle
false
false
- human
- none
+ human
+ none
selfDrive
1
@@ -228,8 +228,8 @@
Electric cycle
false
true
- electricAssist
- battery
+ electricAssist
+ battery
15
selfDrive
@@ -431,7 +431,7 @@
dock
- electricity
+ electricity
pedalCycle
@@ -449,7 +449,7 @@
dock
- electricity
+ electricity
pedalCycle
@@ -526,7 +526,7 @@
dock
- electricity
+ electricity
pedalCycle
@@ -540,7 +540,7 @@
dock
- electricity
+ electricity
pedalCycle
diff --git a/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml b/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml
index ccccc337c..81cbe3723 100644
--- a/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml
+++ b/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml
@@ -11419,7 +11419,7 @@ Q.4. Public holiday - Services do not run on a christams day -
London Paris
18 Coach Train
true
- electricity
+ electricity
diff --git a/examples/standards/gbfs/Netex_gbfs_exm1.xml b/examples/standards/gbfs/Netex_gbfs_exm1.xml
index ae150a92d..7ffe015a8 100644
--- a/examples/standards/gbfs/Netex_gbfs_exm1.xml
+++ b/examples/standards/gbfs/Netex_gbfs_exm1.xml
@@ -158,7 +158,7 @@ GBFS file: vehicle_types.json:
Example Basic Bike
- human
+ human
cycle
@@ -167,7 +167,7 @@ GBFS file: vehicle_types.json:
E-scooter
- electric
+ electric
12345
@@ -181,7 +181,7 @@ GBFS file: vehicle_types.json:
Cargo bike
- electric
+ electric
12345
@@ -195,7 +195,7 @@ GBFS file: vehicle_types.json:
Foor-door Sedan
- combustion
+ combustion
523992
diff --git a/examples/standards/vdv452/timetable/NeTEx VDV Example.xml b/examples/standards/vdv452/timetable/NeTEx VDV Example.xml
index 200ab4ce7..44dbb1b10 100644
--- a/examples/standards/vdv452/timetable/NeTEx VDV Example.xml
+++ b/examples/standards/vdv452/timetable/NeTEx VDV Example.xml
@@ -205,8 +205,8 @@
Strab GT 8 K
Überf1
- electric
- battery
+ electric
+ battery
91
112
@@ -218,9 +218,9 @@
Solaris Gelenk-Elektro
SoGeE
52
- electric
+ electric
- battery
+ battery
46
diff --git a/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd
index 6d4f39437..b27fe6300 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd
@@ -419,7 +419,7 @@ Rail transport, Roads and Road transport
Elements of a COMPLEX FEATURE PROJECTION.
-
+
COMPLEX FEATURE which is being projected.
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd
index 9176a649e..ec0f3d409 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd
@@ -379,9 +379,9 @@
Elements for a DECK SPACE.
-
+
- Whether DECK SPACE is covered. Default is true.
+ Whether DECK SPACE is indoors, outdoors, or covered. Default is indoors.
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd
index 0560549da..0ad39709d 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd
@@ -451,12 +451,12 @@ Rail transport, Roads and Road transport
- Value to be used, if covered is used as a "boolean". Equals covered. Depreciated.+v2.0
+ Value to be used, if covered is used as a "boolean". Equals covered. Deprecated. -v2.0
- Value to be used, if covered is used as a "boolean". Equals outdoors. Depreciated. +v2.0
+ Value to be used, if covered is used as a "boolean". Equals outdoors. Deprecated. -v2.0
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd
index 94c051fc3..616e06ee1 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd
@@ -205,9 +205,14 @@ points cannot exceed this value.
Elements for REFUELLING EQUIPMENT.
+
+
+ The list of types of fuel used by a vehicle of the type.
+
+
- The type of fuel used by a vehicle of the type.
+ The type of fuel used by a vehicle of the type. DEPRECATED -v2.0
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd
index a3f30bea9..e5ef77c9c 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd
@@ -198,7 +198,7 @@
- Name of SPOT COLUMN.
+ Label of SPOT COLUMN.
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
index 661017027..4a6200c4d 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
@@ -203,20 +203,30 @@ Rail transport, Roads and Road transport
Whether vehicles of the type are self-propelled.
-
+
- List of types of power used +v1.2.2
+ List of types of power used +v2.0
+
+
+
+
+ Type of power used. DEPRECATED -v2.0
+
+
+
+
+ The list of types of fuel used by a vehicle of the type. +v2.0
-
+
- The list of types of fuel used by a vehicle of the type. +1.2.2
+ The type of fuel used by a vehicle of the type. DEPRECATED -v2.0
- The type of fuel used by a vehicle of the type. DEPRECATED NAME 1.2.2. Use FuelType.
+ The type of fuel used by a vehicle of the type. DEPRECATED NAME 1.2.2. Use FuelType. -v2.0
@@ -830,9 +840,9 @@ Rail transport, Roads and Road transport
Elements for a PASSENGER VEHICLE CAPACITY.
-
+
- VEHicle categories for which capacity is specifyed. Default is allPAssengerVehicles i.e. capacity is for all VEHICLE CATEGORIES
+ Vehicle categories for which capacity is specified. Default is allPassengerVehicles i.e. capacity is for all VEHICLE CATEGORIES
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd
index 26cc433d0..1e0710ed6 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd
@@ -1084,7 +1084,7 @@ Rail transport, Roads and Road transport
Height of PARKING BAY.
-
+
Maximum Weight allowed in PARKING BAY. +v1.1
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd
index 7beb386d1..583cb4f7a 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd
@@ -281,14 +281,6 @@ Rail transport, Roads and Road transport
-
-
- Elements of a PARKING POINT.
-
-
-
-
-
@@ -344,14 +336,6 @@ Rail transport, Roads and Road transport
-
-
- Elements of a GARAGE POINT.
-
-
-
-
-