From 6d8fc3b2249f5656af847689885c5a3965a54ceb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibaut=20Barr=C3=A8re?= <thibaut.barrere@gmail.com>
Date: Sun, 17 May 2026 16:50:11 +0200
Subject: [PATCH 1/7] Try to avoid out-of-sync/stale HTML pages (wrt XSD)

---
 .github/workflows/ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index db0dc3c9..d4b66a4f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,11 +1,10 @@
 name: CI
 
 on:
-  # Triggers the workflow on push or pull request events but only for the "master" branch
   push:
-    branches: [ "master", "main", "integration" ]
+    branches: [ "v[0-9]*" ]
   pull_request:
-    branches: [ "master", "main", "integration" ]
+    branches: [ "v[0-9]*" ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

From a2cb1e9d1a97398768a0734e28947f25061d3bcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibaut=20Barr=C3=A8re?= <thibaut.barrere@gmail.com>
Date: Sun, 17 May 2026 22:14:56 +0200
Subject: [PATCH 2/7] Attempt to fix "Cannot convert to xs:double: PT0S" (#217)

---
 docs/xco-stype-description.xqm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/xco-stype-description.xqm b/docs/xco-stype-description.xqm
index addf83a3..768a8bb3 100644
--- a/docs/xco-stype-description.xqm
+++ b/docs/xco-stype-description.xqm
@@ -201,9 +201,10 @@ declare function sd:isTypeDescriptionEnumDesc($tdesc as xs:string?)
  :)
 declare function sd:castToComparable($s as xs:string?)
       as item()? {
-    if ($s castable as xs:date) then xs:date($s) 
-    else if ($s castable as xs:dateTime) then xs:dateTime($s) 
-    else if ($s castable as xs:time) then xs:time($s)      
+    if ($s castable as xs:date) then xs:date($s)
+    else if ($s castable as xs:dateTime) then xs:dateTime($s)
+    else if ($s castable as xs:time) then xs:time($s)
+    else if ($s castable as xs:duration) then xs:duration($s)
     else if ($s castable as xs:double) then number($s)
     else if ($s castable as xs:decimal) then number($s)
     else if ($s castable as xs:boolean) then xs:boolean($s) ! number(.)

From 4b6f280b61e211d4c7d46391a36c3d9f3cfde0e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibaut=20Barr=C3=A8re?= <thibaut.barrere@gmail.com>
Date: Sun, 17 May 2026 22:50:08 +0200
Subject: [PATCH 3/7] Fix xcore doc generation crash on BaseX 10.6: handle
 xs:duration restrictions

The addition of `<xsd:minInclusive value="PT0S"/>` on PositiveDurationType (PR #188) introduced a duration value in XSD restrictions that xcore's castToComparable function did not handle. This caused max()/min() to fail with [FORG0006] on BaseX 10.6 (used in CI), as xs:duration is not an ordered type per the XQuery spec (I think). BaseX 12.1+ silently accepts it though (my local runs passed).

Cast to xs:dayTimeDuration / xs:yearMonthDuration instead, which are the ordered subtypes that support comparison on all BaseX versions.

See https://github.com/SIRI-CEN/SIRI/issues/218
---
 docs/xco-stype-description.xqm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/xco-stype-description.xqm b/docs/xco-stype-description.xqm
index 768a8bb3..1c0ba419 100644
--- a/docs/xco-stype-description.xqm
+++ b/docs/xco-stype-description.xqm
@@ -204,7 +204,10 @@ declare function sd:castToComparable($s as xs:string?)
     if ($s castable as xs:date) then xs:date($s)
     else if ($s castable as xs:dateTime) then xs:dateTime($s)
     else if ($s castable as xs:time) then xs:time($s)
-    else if ($s castable as xs:duration) then xs:duration($s)
+    (: Workaround for BaseX <12.1 which cannot compare xs:duration values.
+       Use ordered subtypes instead. See https://github.com/SIRI-CEN/SIRI/issues/218 :)
+    else if ($s castable as xs:dayTimeDuration) then xs:dayTimeDuration($s)
+    else if ($s castable as xs:yearMonthDuration) then xs:yearMonthDuration($s)
     else if ($s castable as xs:double) then number($s)
     else if ($s castable as xs:decimal) then number($s)
     else if ($s castable as xs:boolean) then xs:boolean($s) ! number(.)

From 79b28c8b0d914c60509eeaa811534b80203d03ea Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 17 May 2026 20:51:17 +0000
Subject: [PATCH 4/7] Lint and update documentation tables

---
 docs/generated/contab/acsb.html               |  108 +-
 docs/generated/contab/datex2.html             |   84 +-
 docs/generated/contab/ifopt.html              |  198 +-
 docs/generated/contab/siri.html               | 9095 ++++-------------
 .../siri_estimatedVehicleJourney.xsd          |    2 +-
 xsd/siri_model/siri_journey.xsd               |    2 +-
 xsd/siri_model/siri_journey_support.xsd       |    6 +-
 7 files changed, 2175 insertions(+), 7320 deletions(-)

diff --git a/docs/generated/contab/acsb.html b/docs/generated/contab/acsb.html
index 4ca18ca2..1bdb1fc2 100644
--- a/docs/generated/contab/acsb.html
+++ b/docs/generated/contab/acsb.html
@@ -248,11 +248,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-25.1" title="local-type: typedef-25.1">local-type: typedef-25.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-47.1" title="local-type: typedef-47.1">local-type: typedef-47.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -276,11 +272,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-25.2" title="local-type: typedef-25.2">local-type: typedef-25.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-47.2" title="local-type: typedef-47.2">local-type: typedef-47.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-5.2" title="local-type: typedef-5.2">local-type: typedef-5.2</a>
                       </em>
                     </p>
                   </td>
@@ -305,11 +297,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-8.1" title="local-type: typedef-8.1">local-type: typedef-8.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-13.1" title="local-type: typedef-13.1">local-type: typedef-13.1</a>
                       </em>
                     </p>
                   </td>
@@ -556,11 +544,7 @@ <h3>1.4. The complex type <code>acsb:AccessibilityLimitationStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-8.1" title="local-type: typedef-8.1">local-type: typedef-8.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-13.1" title="local-type: typedef-13.1">local-type: typedef-13.1</a>
                       </em>
                     </p>
                   </td>
@@ -605,13 +589,8 @@ <h3>1.5. The complex type <code>acsb:LimitationRefStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-25.1">
-          <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-25.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-47.1">
-          <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-47.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -631,11 +610,7 @@ <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
                       <br/>
                       <code>  /Limitations #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-25.1)</code>
-=======
-                      <code>  (typedef-47.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -677,13 +652,8 @@ <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-25.2">
-          <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-25.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-47.2">
-          <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-47.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-5.2">
+          <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-5.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -703,11 +673,7 @@ <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
                       <br/>
                       <code>  /Suitabilities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-25.2)</code>
-=======
-                      <code>  (typedef-47.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-5.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -749,13 +715,8 @@ <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-8.1">
-          <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-8.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-39.1">
-          <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-39.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-13.1">
+          <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-13.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -775,11 +736,7 @@ <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-3
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-8.1)</code>
-=======
-                      <code>  (typedef-39.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-13.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -795,13 +752,8 @@ <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-3
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-8.1">
-          <h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-8.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-39.1">
-          <h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-39.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-13.1">
+          <h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-13.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -821,11 +773,7 @@ <h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-3
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-8.1)</code>
-=======
-                      <code>  (typedef-39.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-13.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -1724,20 +1672,12 @@ <h3>3.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p id="local-type.typedef-27.1" class="tableblock">
-=======
-                    <p id="local-type.typedef-48.1" class="tableblock">
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                    <p id="local-type.typedef-2.1" class="tableblock">
                       <code>group[acsb:UserNeedGroup]</code>
                       <br/>
                       <code>  /MedicalNeed #simpleType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-27.1)</code>
-=======
-                      <code>  (typedef-48.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-2.1)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -1904,11 +1844,7 @@ <h3>3.7. The group <code>acsb:UserNeedGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-<<<<<<< HEAD
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
-=======
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-48.1" title="local-type: typedef-48.1">local-type: typedef-48.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
                       </em>
                     </p>
                   </td>
@@ -2237,11 +2173,7 @@ <h3>3.10. The complex type <code>acsb:UserNeedStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-<<<<<<< HEAD
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
-=======
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-48.1" title="local-type: typedef-48.1">local-type: typedef-48.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
                       </em>
                     </p>
                   </td>
diff --git a/docs/generated/contab/datex2.html b/docs/generated/contab/datex2.html
index eb150cba..aa6704c6 100644
--- a/docs/generated/contab/datex2.html
+++ b/docs/generated/contab/datex2.html
@@ -107112,11 +107112,7 @@ <h3>2.204. The complex type <code>orc:Itinerary</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-49.1" title="local-type: typedef-49.1">local-type: typedef-49.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-1.1" title="local-type: typedef-1.1">local-type: typedef-1.1</a>
                       </em>
                     </p>
                   </td>
@@ -111024,11 +111020,7 @@ <h3>2.219. The complex type <code>orc:MeasurementSiteRecord</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-23.2" title="local-type: typedef-23.2">local-type: typedef-23.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-49.2" title="local-type: typedef-49.2">local-type: typedef-49.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-1.2" title="local-type: typedef-1.2">local-type: typedef-1.2</a>
                       </em>
                     </p>
                   </td>
@@ -111873,11 +111865,7 @@ <h3>2.224. The complex type <code>orc:MultilingualString</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-23.3" title="local-type: typedef-23.3">local-type: typedef-23.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-49.3" title="local-type: typedef-49.3">local-type: typedef-49.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-1.3" title="local-type: typedef-1.3">local-type: typedef-1.3</a>
                       </em>
                     </p>
                   </td>
@@ -127585,11 +127573,7 @@ <h3>2.266. The complex type <code>orc:SiteMeasurements</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-23.4" title="local-type: typedef-23.4">local-type: typedef-23.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-49.4" title="local-type: typedef-49.4">local-type: typedef-49.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-1.4" title="local-type: typedef-1.4">local-type: typedef-1.4</a>
                       </em>
                     </p>
                   </td>
@@ -145458,13 +145442,8 @@ <h3>2.326. The complex type <code>orc:WinterDrivingManagement</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-23.1">
-          <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItinerary#complexType (typedef-23.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-49.1">
-          <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItinerary#complexType (typedef-49.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-1.1">
+          <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItinerary#complexType (typedef-1.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -145484,11 +145463,7 @@ <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItin
                       <br/>
                       <code>  /locationContainedInItinerary #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-23.1)</code>
-=======
-                      <code>  (typedef-49.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-1.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -145613,13 +145588,8 @@ <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItin
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-23.2">
-          <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurementSpecificCharacteristics#complexType (typedef-23.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-49.2">
-          <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurementSpecificCharacteristics#complexType (typedef-49.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-1.2">
+          <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurementSpecificCharacteristics#complexType (typedef-1.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -145639,11 +145609,7 @@ <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurement
                       <br/>
                       <code>  /measurementSpecificCharacteristics #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-23.2)</code>
-=======
-                      <code>  (typedef-49.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-1.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -145873,13 +145839,8 @@ <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurement
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-23.3">
-          <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complexType (typedef-23.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-49.3">
-          <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complexType (typedef-49.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-1.3">
+          <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complexType (typedef-1.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -145899,11 +145860,7 @@ <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complex
                       <br/>
                       <code>  /values #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-23.3)</code>
-=======
-                      <code>  (typedef-49.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-1.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -145945,13 +145902,8 @@ <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complex
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-23.4">
-          <h3>2.330. The complex type <code>complexType[SiteMeasurements]/measuredValue#complexType (typedef-23.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-49.4">
-          <h3>2.330. The complex type <code>complexType[SiteMeasurements]/measuredValue#complexType (typedef-49.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-1.4">
+          <h3>2.330. The complex type <code>complexType[SiteMeasurements]/measuredValue#complexType (typedef-1.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -145971,11 +145923,7 @@ <h3>2.330. The complex type <code>complexType[SiteMeasurements]/measuredValue#co
                       <br/>
                       <code>  /measuredValue #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-23.4)</code>
-=======
-                      <code>  (typedef-49.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-1.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
diff --git a/docs/generated/contab/ifopt.html b/docs/generated/contab/ifopt.html
index eddf63aa..08b1d230 100644
--- a/docs/generated/contab/ifopt.html
+++ b/docs/generated/contab/ifopt.html
@@ -7206,11 +7206,7 @@ <h3>4.8. The group <code>ifopt:LocalServiceGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-9.1" title="local-type: typedef-9.1">local-type: typedef-9.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-38.1" title="local-type: typedef-38.1">local-type: typedef-38.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-18.1" title="local-type: typedef-18.1">local-type: typedef-18.1</a>
                       </em>
                     </p>
                   </td>
@@ -8216,11 +8212,7 @@ <h3>4.13. The complex type <code>ifopt:LocalServiceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-9.1" title="local-type: typedef-9.1">local-type: typedef-9.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-38.1" title="local-type: typedef-38.1">local-type: typedef-38.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-18.1" title="local-type: typedef-18.1">local-type: typedef-18.1</a>
                       </em>
                     </p>
                   </td>
@@ -8245,11 +8237,7 @@ <h3>4.13. The complex type <code>ifopt:LocalServiceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-8.1" title="local-type: typedef-8.1">local-type: typedef-8.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-13.1" title="local-type: typedef-13.1">local-type: typedef-13.1</a>
                       </em>
                     </p>
                   </td>
@@ -8574,11 +8562,7 @@ <h3>4.14. The complex type <code>ifopt:PlaceEquipmentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-8.1" title="local-type: typedef-8.1">local-type: typedef-8.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-13.1" title="local-type: typedef-13.1">local-type: typedef-13.1</a>
                       </em>
                     </p>
                   </td>
@@ -8590,13 +8574,8 @@ <h3>4.14. The complex type <code>ifopt:PlaceEquipmentStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-9.1">
-          <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-9.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-38.1">
-          <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-38.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-18.1">
+          <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-18.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -8616,11 +8595,7 @@ <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
                       <br/>
                       <code>  /FeatureRefs #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-9.1)</code>
-=======
-                      <code>  (typedef-38.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-18.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -8658,13 +8633,8 @@ <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-9.1">
-          <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-9.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-38.1">
-          <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-38.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-18.1">
+          <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-18.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -8684,11 +8654,7 @@ <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
                       <br/>
                       <code>  /FeatureRefs #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-9.1)</code>
-=======
-                      <code>  (typedef-38.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-18.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -8726,13 +8692,8 @@ <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-8.1">
-          <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-8.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-39.1">
-          <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-39.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-13.1">
+          <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-13.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -8752,11 +8713,7 @@ <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-8.1)</code>
-=======
-                      <code>  (typedef-39.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-13.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -8772,13 +8729,8 @@ <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-8.1">
-          <h3>4.18. The complex type <code>element[ifopt:Extensions]#complexType (typedef-8.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-39.1">
-          <h3>4.18. The complex type <code>element[ifopt:Extensions]#complexType (typedef-39.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-13.1">
+          <h3>4.18. The complex type <code>element[ifopt:Extensions]#complexType (typedef-13.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -8798,11 +8750,7 @@ <h3>4.18. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-8.1)</code>
-=======
-                      <code>  (typedef-39.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-13.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -9443,11 +9391,7 @@ <h3>5.11. The complex type <code>ifopt:AbstractProjection</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-14.1" title="local-type: typedef-14.1">local-type: typedef-14.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-42.1" title="local-type: typedef-42.1">local-type: typedef-42.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -9624,11 +9568,7 @@ <h3>5.14. The complex type <code>ifopt:LinkProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-14.1" title="local-type: typedef-14.1">local-type: typedef-14.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-42.1" title="local-type: typedef-42.1">local-type: typedef-42.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -9657,11 +9597,7 @@ <h3>5.14. The complex type <code>ifopt:LinkProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-14.2" title="local-type: typedef-14.2">local-type: typedef-14.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-42.2" title="local-type: typedef-42.2">local-type: typedef-42.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -9723,11 +9659,7 @@ <h3>5.15. The complex type <code>ifopt:PointProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-14.1" title="local-type: typedef-14.1">local-type: typedef-14.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-42.1" title="local-type: typedef-42.1">local-type: typedef-42.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -9976,11 +9908,7 @@ <h3>5.16. The complex type <code>ifopt:ZoneProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-14.1" title="local-type: typedef-14.1">local-type: typedef-14.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-42.1" title="local-type: typedef-42.1">local-type: typedef-42.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -10013,11 +9941,7 @@ <h3>5.16. The complex type <code>ifopt:ZoneProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-14.3" title="local-type: typedef-14.3">local-type: typedef-14.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-42.3" title="local-type: typedef-42.3">local-type: typedef-42.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -10029,13 +9953,8 @@ <h3>5.16. The complex type <code>ifopt:ZoneProjectionStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-14.1">
           <h3>5.17. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-14.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-42.1">
-          <h3>5.17. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-42.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10055,11 +9974,7 @@ <h3>5.17. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-14.1)</code>
-=======
-                      <code>  (typedef-42.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10101,13 +10016,8 @@ <h3>5.17. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-14.1">
           <h3>5.18. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-14.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-42.1">
-          <h3>5.18. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-42.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10127,11 +10037,7 @@ <h3>5.18. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-14.1)</code>
-=======
-                      <code>  (typedef-42.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10173,13 +10079,8 @@ <h3>5.18. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-14.2">
           <h3>5.19. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line#complexType (typedef-14.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-42.2">
-          <h3>5.19. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line#complexType (typedef-42.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10199,11 +10100,7 @@ <h3>5.19. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line
                       <br/>
                       <code>  /Line #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-14.2)</code>
-=======
-                      <code>  (typedef-42.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10246,13 +10143,8 @@ <h3>5.19. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-14.1">
           <h3>5.20. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-14.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-42.1">
-          <h3>5.20. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-42.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10272,11 +10164,7 @@ <h3>5.20. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-14.1)</code>
-=======
-                      <code>  (typedef-42.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10318,13 +10206,8 @@ <h3>5.20. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-14.1">
           <h3>5.21. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-14.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-42.1">
-          <h3>5.21. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-42.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10344,11 +10227,7 @@ <h3>5.21. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-14.1)</code>
-=======
-                      <code>  (typedef-42.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10390,13 +10269,8 @@ <h3>5.21. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-14.3">
           <h3>5.22. The complex type <code>complexType[ifopt:ZoneProjectionStructure]/Boundary#complexType (typedef-14.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-42.3">
-          <h3>5.22. The complex type <code>complexType[ifopt:ZoneProjectionStructure]/Boundary#complexType (typedef-42.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10416,11 +10290,7 @@ <h3>5.22. The complex type <code>complexType[ifopt:ZoneProjectionStructure]/Boun
                       <br/>
                       <code>  /Boundary #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-14.3)</code>
-=======
-                      <code>  (typedef-42.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -13279,11 +13149,7 @@ <h3>10.4. The complex type <code>ifopt:ValidityConditionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-17.1" title="local-type: typedef-17.1">local-type: typedef-17.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-41.1" title="local-type: typedef-41.1">local-type: typedef-41.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-20.1" title="local-type: typedef-20.1">local-type: typedef-20.1</a>
                       </em>
                     </p>
                   </td>
@@ -13295,13 +13161,8 @@ <h3>10.4. The complex type <code>ifopt:ValidityConditionStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-17.1">
-          <h3>10.5. The complex type <code>complexType[ifopt:ValidityConditionStructure]/Timebands#complexType (typedef-17.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-41.1">
-          <h3>10.5. The complex type <code>complexType[ifopt:ValidityConditionStructure]/Timebands#complexType (typedef-41.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-20.1">
+          <h3>10.5. The complex type <code>complexType[ifopt:ValidityConditionStructure]/Timebands#complexType (typedef-20.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -13321,11 +13182,7 @@ <h3>10.5. The complex type <code>complexType[ifopt:ValidityConditionStructure]/T
                       <br/>
                       <code>  /Timebands #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-17.1)</code>
-=======
-                      <code>  (typedef-41.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-20.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -13559,13 +13416,8 @@ <h3>11.6. The complex type <code>ifopt:InfoLinkStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-8.1">
-          <h3>11.7. The complex type <code>element[ifopt:Extensions]#complexType (typedef-8.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-39.1">
-          <h3>11.7. The complex type <code>element[ifopt:Extensions]#complexType (typedef-39.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-13.1">
+          <h3>11.7. The complex type <code>element[ifopt:Extensions]#complexType (typedef-13.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -13585,11 +13437,7 @@ <h3>11.7. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-8.1)</code>
-=======
-                      <code>  (typedef-39.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-13.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
diff --git a/docs/generated/contab/siri.html b/docs/generated/contab/siri.html
index 12f62b77..30816710 100644
--- a/docs/generated/contab/siri.html
+++ b/docs/generated/contab/siri.html
@@ -2898,43 +2898,51 @@ <h1>OJP - Open API for distributed Journey Planning (SIRI)</h1>
                 </a>
               </li>
               <li>
-                <a shape="rect" href="#type.siri:SimpleContactStructure">20.113 The complexType <code>siri:SimpleContactStructure</code>
+                <a shape="rect" href="#type.siri:ServiceLinkViewsStructure">20.113 The complexType <code>siri:ServiceLinkViewsStructure</code>
                 </a>
               </li>
               <li>
-                <a shape="rect" href="#type.siri:StopAssignmentStructure">20.114 The complexType <code>siri:StopAssignmentStructure</code>
+                <a shape="rect" href="#type.siri:ServiceLinkViewStructure">20.114 The complexType <code>siri:ServiceLinkViewStructure</code>
                 </a>
               </li>
               <li>
-                <a shape="rect" href="#type.siri:TrainComponentStructure">20.115 The complexType <code>siri:TrainComponentStructure</code>
+                <a shape="rect" href="#type.siri:SimpleContactStructure">20.115 The complexType <code>siri:SimpleContactStructure</code>
                 </a>
               </li>
               <li>
-                <a shape="rect" href="#type.siri:TrainElementStructure">20.116 The complexType <code>siri:TrainElementStructure</code>
+                <a shape="rect" href="#type.siri:StopAssignmentStructure">20.116 The complexType <code>siri:StopAssignmentStructure</code>
                 </a>
               </li>
               <li>
-                <a shape="rect" href="#type.siri:TrainInCompoundTrainStructure">20.117 The complexType <code>siri:TrainInCompoundTrainStructure</code>
+                <a shape="rect" href="#type.siri:TrainComponentStructure">20.117 The complexType <code>siri:TrainComponentStructure</code>
                 </a>
               </li>
               <li>
-                <a shape="rect" href="#type.siri:TrainStructure">20.118 The complexType <code>siri:TrainStructure</code>
+                <a shape="rect" href="#type.siri:TrainElementStructure">20.118 The complexType <code>siri:TrainElementStructure</code>
                 </a>
               </li>
               <li>
-                <a shape="rect" href="#type.siri:VehicleInFormationStatusStructure">20.119 The complexType <code>siri:VehicleInFormationStatusStructure</code>
+                <a shape="rect" href="#type.siri:TrainInCompoundTrainStructure">20.119 The complexType <code>siri:TrainInCompoundTrainStructure</code>
                 </a>
               </li>
               <li>
-                <a shape="rect" href="#type.siri:VehicleOccupancyStructure">20.120 The complexType <code>siri:VehicleOccupancyStructure</code>
+                <a shape="rect" href="#type.siri:TrainStructure">20.120 The complexType <code>siri:TrainStructure</code>
                 </a>
               </li>
               <li>
-                <a shape="rect" href="#type.siri:VehicleOrientationRelativeToQuay">20.121 The complexType <code>siri:VehicleOrientationRelativeToQuay</code>
+                <a shape="rect" href="#type.siri:VehicleInFormationStatusStructure">20.121 The complexType <code>siri:VehicleInFormationStatusStructure</code>
                 </a>
               </li>
               <li>
-                <a shape="rect" href="#type.siri:ViaNameStructure">20.122 The complexType <code>siri:ViaNameStructure</code>
+                <a shape="rect" href="#type.siri:VehicleOccupancyStructure">20.122 The complexType <code>siri:VehicleOccupancyStructure</code>
+                </a>
+              </li>
+              <li>
+                <a shape="rect" href="#type.siri:VehicleOrientationRelativeToQuay">20.123 The complexType <code>siri:VehicleOrientationRelativeToQuay</code>
+                </a>
+              </li>
+              <li>
+                <a shape="rect" href="#type.siri:ViaNameStructure">20.124 The complexType <code>siri:ViaNameStructure</code>
                 </a>
               </li>
             </ul>
@@ -3984,85 +3992,6 @@ <h1>OJP - Open API for distributed Journey Planning (SIRI)</h1>
                 </a>
               </li>
               <li>
-<<<<<<< HEAD
-                <a shape="rect" href="#type.siri:AffectedModesStructure">28.13 The complexType <code>siri:AffectedModesStructure</code>
-                </a>
-              </li>
-              <li>
-                <a shape="rect" href="#type.siri:AffectedNetworkStructure">28.14 The complexType <code>siri:AffectedNetworkStructure</code>
-                </a>
-              </li>
-              <li>
-                <a shape="rect" href="#type.siri:AffectedOperatorStructure">28.15 The complexType <code>siri:AffectedOperatorStructure</code>
-                </a>
-              </li>
-              <li>
-                <a shape="rect" href="#type.siri:AffectedPathLinkStructure">28.16 The complexType <code>siri:AffectedPathLinkStructure</code>
-                </a>
-              </li>
-              <li>
-                <a shape="rect" href="#type.siri:AffectedPlaceStructure">28.17 The complexType <code>siri:AffectedPlaceStructure</code>
-                </a>
-              </li>
-              <li>
-                <a shape="rect" href="#type.siri:AffectedRouteStructure">28.18 The complexType <code>siri:AffectedRouteStructure</code>
-                </a>
-              </li>
-              <li>
-                <a shape="rect" href="#type.siri:AffectedSectionStructure">28.19 The complexType <code>siri:AffectedSectionStructure</code>
-                </a>
-              </li>
-              <li>
-                <a shape="rect" href="#type.siri:AffectedStopPlaceComponentStructure">28.20 The complexType <code>siri:AffectedStopPlaceComponentStructure</code>
-                </a>
-              </li>
-              <li>
-                <a shape="rect" href="#type.siri:AffectedStopPlaceElementStructure">28.21 The complexType <code>siri:AffectedStopPlaceElementStructure</code>
-                </a>
-              </li>
-              <li>
-                <a shape="rect" href="#type.siri:AffectedStopPlaceStructure">28.22 The complexType <code>siri:AffectedStopPlaceStructure</code>
-                </a>
-              </li>
-              <li>
-                <a shape="rect" href="#type.siri:AffectedStopPointStructure">28.23 The complexType <code>siri:AffectedStopPointStructure</code>
-                </a>
-              </li>
-              <li>
-                <a shape="rect" href="#type.siri:AffectedVehicleJourneyStructure">28.24 The complexType <code>siri:AffectedVehicleJourneyStructure</code>
-                </a>
-              </li>
-              <li>
-                <a shape="rect" href="#type.siri:AffectedVehicleStructure">28.25 The complexType <code>siri:AffectedVehicleStructure</code>
-                </a>
-              </li>
-              <li>
-                <a shape="rect" href="#type.siri:CasualtiesStructure">28.26 The complexType <code>siri:CasualtiesStructure</code>
-                </a>
-              </li>
-              <li>
-                <a shape="rect" href="#type.siri:NetworkRefStructure">28.27 The complexType <code>siri:NetworkRefStructure</code>
-                </a>
-              </li>
-              <li>
-                <a shape="rect" href="#type.siri:NetworkStructure">28.28 The complexType <code>siri:NetworkStructure</code>
-                </a>
-              </li>
-              <li>
-                <a shape="rect" href="#type.siri:OffsetStructure">28.29 The complexType <code>siri:OffsetStructure</code>
-                </a>
-              </li>
-              <li>
-                <a shape="rect" href="#type.siri:OperationalUnitRefStructure">28.30 The complexType <code>siri:OperationalUnitRefStructure</code>
-                </a>
-              </li>
-              <li>
-                <a shape="rect" href="#type.siri:SectionRefStructure">28.31 The complexType <code>siri:SectionRefStructure</code>
-                </a>
-              </li>
-              <li>
-                <a shape="rect" href="#type.siri:ZoneRefStructure">28.32 The complexType <code>siri:ZoneRefStructure</code>
-=======
                 <a shape="rect" href="#type.siri:AffectedLineWithoutStopStructure">29.13 The complexType <code>siri:AffectedLineWithoutStopStructure</code>
                 </a>
               </li>
@@ -4152,7 +4081,6 @@ <h1>OJP - Open API for distributed Journey Planning (SIRI)</h1>
               </li>
               <li>
                 <a shape="rect" href="#type.siri:ZoneRefStructure">29.35 The complexType <code>siri:ZoneRefStructure</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                 </a>
               </li>
             </ul>
@@ -5607,11 +5535,7 @@ <h3>1.3. The toplevel element <code>siri:ServiceDelivery</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
                       </em>
                     </p>
                   </td>
@@ -6020,11 +5944,7 @@ <h3>1.5. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
                       </em>
                     </p>
                   </td>
@@ -6055,11 +5975,7 @@ <h3>1.5. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-33.2" title="local-type: typedef-33.2">local-type: typedef-33.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-58.2" title="local-type: typedef-58.2">local-type: typedef-58.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-40.2" title="local-type: typedef-40.2">local-type: typedef-40.2</a>
                       </em>
                     </p>
                   </td>
@@ -6445,11 +6361,7 @@ <h3>1.5. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-77.4" title="local-type: typedef-77.4">local-type: typedef-77.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-85.4" title="local-type: typedef-85.4">local-type: typedef-85.4</a>
                       </em>
                     </p>
                   </td>
@@ -7045,11 +6957,7 @@ <h3>1.7. The group <code>siri:DeliveryResponseGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-77.4" title="local-type: typedef-77.4">local-type: typedef-77.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-85.4" title="local-type: typedef-85.4">local-type: typedef-85.4</a>
                       </em>
                     </p>
                   </td>
@@ -7155,11 +7063,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
                       </em>
                     </p>
                   </td>
@@ -7190,11 +7094,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-77.3" title="local-type: typedef-77.3">local-type: typedef-77.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-86.3" title="local-type: typedef-86.3">local-type: typedef-86.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-85.3" title="local-type: typedef-85.3">local-type: typedef-85.3</a>
                       </em>
                     </p>
                   </td>
@@ -7443,11 +7343,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-76.1" title="local-type: typedef-76.1">local-type: typedef-76.1</a>
                       </em>
                     </p>
                   </td>
@@ -7509,11 +7405,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-76.2" title="local-type: typedef-76.2">local-type: typedef-76.2</a>
                       </em>
                     </p>
                   </td>
@@ -7844,11 +7736,7 @@ <h3>1.9. The group <code>siri:ResponseGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-77.4" title="local-type: typedef-77.4">local-type: typedef-77.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-85.4" title="local-type: typedef-85.4">local-type: typedef-85.4</a>
                       </em>
                     </p>
                   </td>
@@ -8288,11 +8176,7 @@ <h3>1.10. The group <code>siri:ServiceDeliveryBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
                       </em>
                     </p>
                   </td>
@@ -8301,17 +8185,11 @@ <h3>1.10. The group <code>siri:ServiceDeliveryBodyGroup</code>
                   </td>
                 </tr>
                 <tr>
-<<<<<<< HEAD
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-=======
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     <a shape="rect" href="#group.siri:ServiceDeliveryBodyGroup" title="siri:ServiceDeliveryBodyGroup">siri:ServiceDeliveryBodyGroup</a>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-=======
                       <code>siri:ContainsAllDataForNewInitialState</code>
                     </p>
                   </td>
@@ -8332,7 +8210,6 @@ <h3>1.10. The group <code>siri:ServiceDeliveryBodyGroup</code>
                 <tr>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       <code>siri:MoreData</code>
                     </p>
                   </td>
@@ -8793,11 +8670,7 @@ <h3>1.11. The group <code>siri:ServiceRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
                       </em>
                     </p>
                   </td>
@@ -8828,11 +8701,7 @@ <h3>1.11. The group <code>siri:ServiceRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-77.3" title="local-type: typedef-77.3">local-type: typedef-77.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-86.3" title="local-type: typedef-86.3">local-type: typedef-86.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-85.3" title="local-type: typedef-85.3">local-type: typedef-85.3</a>
                       </em>
                     </p>
                   </td>
@@ -9104,11 +8973,7 @@ <h3>1.13. The group <code>siri:SiriDiscoveryRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-76.1" title="local-type: typedef-76.1">local-type: typedef-76.1</a>
                       </em>
                     </p>
                   </td>
@@ -9170,11 +9035,7 @@ <h3>1.13. The group <code>siri:SiriDiscoveryRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-76.2" title="local-type: typedef-76.2">local-type: typedef-76.2</a>
                       </em>
                     </p>
                   </td>
@@ -9711,11 +9572,7 @@ <h3>1.15. The group <code>siri:SiriServiceCapabilitiesRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-79.3" title="local-type: typedef-79.3">local-type: typedef-79.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-72.3" title="local-type: typedef-72.3">local-type: typedef-72.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-74.3" title="local-type: typedef-74.3">local-type: typedef-74.3</a>
                       </em>
                     </p>
                   </td>
@@ -11029,11 +10886,7 @@ <h3>1.19. The group <code>siri:SiriSubscriptionRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-79.2" title="local-type: typedef-79.2">local-type: typedef-79.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
                       </em>
                     </p>
                   </td>
@@ -11580,11 +11433,7 @@ <h3>1.20. The complex type <code>siri:CapabilitiesRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-79.3" title="local-type: typedef-79.3">local-type: typedef-79.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-72.3" title="local-type: typedef-72.3">local-type: typedef-72.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-74.3" title="local-type: typedef-74.3">local-type: typedef-74.3</a>
                       </em>
                     </p>
                   </td>
@@ -12343,11 +12192,7 @@ <h3>1.22. The complex type <code>siri:ServiceDeliveryBodyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
                       </em>
                     </p>
                   </td>
@@ -12356,17 +12201,11 @@ <h3>1.22. The complex type <code>siri:ServiceDeliveryBodyStructure</code>
                   </td>
                 </tr>
                 <tr>
-<<<<<<< HEAD
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-=======
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     <a shape="rect" href="#group.siri:ServiceDeliveryBodyGroup" title="siri:ServiceDeliveryBodyGroup">siri:ServiceDeliveryBodyGroup</a>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-=======
                       <code>siri:ContainsAllDataForNewInitialState</code>
                     </p>
                   </td>
@@ -12387,7 +12226,6 @@ <h3>1.22. The complex type <code>siri:ServiceDeliveryBodyStructure</code>
                 <tr>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       <code>siri:MoreData</code>
                     </p>
                   </td>
@@ -13056,11 +12894,7 @@ <h3>1.23. The complex type <code>siri:ServiceDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
                       </em>
                     </p>
                   </td>
@@ -13069,17 +12903,11 @@ <h3>1.23. The complex type <code>siri:ServiceDeliveryStructure</code>
                   </td>
                 </tr>
                 <tr>
-<<<<<<< HEAD
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-=======
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     <a shape="rect" href="#group.siri:ServiceDeliveryBodyGroup" title="siri:ServiceDeliveryBodyGroup">siri:ServiceDeliveryBodyGroup</a>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-=======
                       <code>siri:ContainsAllDataForNewInitialState</code>
                     </p>
                   </td>
@@ -13100,7 +12928,6 @@ <h3>1.23. The complex type <code>siri:ServiceDeliveryStructure</code>
                 <tr>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       <code>siri:MoreData</code>
                     </p>
                   </td>
@@ -14583,11 +14410,7 @@ <h3>1.26. The complex type <code>siri:SiriSubscriptionRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-79.2" title="local-type: typedef-79.2">local-type: typedef-79.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
                       </em>
                     </p>
                   </td>
@@ -15206,11 +15029,7 @@ <h3>1.27. The complex type <code>siri:SubscriptionRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-79.2" title="local-type: typedef-79.2">local-type: typedef-79.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
                       </em>
                     </p>
                   </td>
@@ -15501,13 +15320,8 @@ <h3>1.27. The complex type <code>siri:SubscriptionRequestStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-77.4">
-          <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-77.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-86.4">
-          <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-85.4">
+          <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-85.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -15527,11 +15341,7 @@ <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-77.4)</code>
-=======
-                      <code>  (typedef-86.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-85.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -15775,11 +15585,7 @@ <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
                       </em>
                     </p>
                   </td>
@@ -15840,13 +15646,8 @@ <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-34.1">
-          <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-44.1">
+          <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -15866,11 +15667,7 @@ <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-34.1)</code>
-=======
-                      <code>  (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-44.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -15981,13 +15778,8 @@ <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-77.2">
-          <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-77.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-85.2">
+          <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-85.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -16007,11 +15799,7 @@ <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-77.2)</code>
-=======
-                      <code>  (typedef-86.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-85.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -16245,13 +16033,8 @@ <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-77.1">
-          <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-77.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-86.1">
-          <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-86.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-85.1">
+          <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-85.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -16271,11 +16054,7 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-86.1)</
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-77.1)</code>
-=======
-                      <code>  (typedef-86.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-85.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -16355,11 +16134,7 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-86.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
                       </em>
                     </p>
                   </td>
@@ -16390,11 +16165,7 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-86.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-33.2" title="local-type: typedef-33.2">local-type: typedef-33.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-58.2" title="local-type: typedef-58.2">local-type: typedef-58.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-40.2" title="local-type: typedef-40.2">local-type: typedef-40.2</a>
                       </em>
                     </p>
                   </td>
@@ -16780,11 +16551,7 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-86.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-77.4" title="local-type: typedef-77.4">local-type: typedef-77.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-85.4" title="local-type: typedef-85.4">local-type: typedef-85.4</a>
                       </em>
                     </p>
                   </td>
@@ -16966,13 +16733,8 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-86.1)</
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-77.2">
-          <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-77.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-85.2">
+          <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-85.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -16992,11 +16754,7 @@ <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-77.2)</code>
-=======
-                      <code>  (typedef-86.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-85.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -17230,13 +16988,8 @@ <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-33.2">
-          <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-33.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-58.2">
-          <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-58.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-40.2">
+          <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-40.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -17256,11 +17009,7 @@ <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-33.2)</code>
-=======
-                      <code>  (typedef-58.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-40.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -17568,13 +17317,8 @@ <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-77.4">
-          <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-77.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-86.4">
-          <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-85.4">
+          <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-85.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -17594,11 +17338,7 @@ <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-77.4)</code>
-=======
-                      <code>  (typedef-86.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-85.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -17842,11 +17582,7 @@ <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
                       </em>
                     </p>
                   </td>
@@ -17907,13 +17643,8 @@ <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-34.1">
-          <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-44.1">
+          <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -17933,11 +17664,7 @@ <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-34.1)</code>
-=======
-                      <code>  (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-44.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -18048,13 +17775,8 @@ <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-77.3">
-          <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-77.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-86.3">
-          <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-86.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-85.3">
+          <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-85.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -18074,11 +17796,7 @@ <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-77.3)</code>
-=======
-                      <code>  (typedef-86.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-85.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -18386,13 +18104,8 @@ <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-77.4">
-          <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-77.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-86.4">
-          <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-85.4">
+          <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-85.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -18412,11 +18125,7 @@ <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-77.4)</code>
-=======
-                      <code>  (typedef-86.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-85.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -18660,11 +18369,7 @@ <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
                       </em>
                     </p>
                   </td>
@@ -18725,13 +18430,8 @@ <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-34.1">
-          <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-44.1">
+          <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -18751,11 +18451,7 @@ <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-34.1)</code>
-=======
-                      <code>  (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-44.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -18866,13 +18562,8 @@ <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-77.2">
-          <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-77.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-85.2">
+          <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-85.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -18892,11 +18583,7 @@ <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-77.2)</code>
-=======
-                      <code>  (typedef-86.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-85.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -19130,13 +18817,8 @@ <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-77.3">
-          <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-77.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-86.3">
-          <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-86.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-85.3">
+          <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-85.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -19156,11 +18838,7 @@ <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-77.3)</code>
-=======
-                      <code>  (typedef-86.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-85.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -19468,13 +19146,8 @@ <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-72.1">
-          <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-72.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-74.1">
-          <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-74.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-76.1">
+          <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-76.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -19494,11 +19167,7 @@ <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-72.1)</code>
-=======
-                      <code>  (typedef-74.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-76.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -19888,13 +19557,8 @@ <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-72.2">
-          <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-72.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-74.2">
-          <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-74.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-76.2">
+          <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-76.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -19914,11 +19578,7 @@ <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-72.2)</code>
-=======
-                      <code>  (typedef-74.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-76.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20136,13 +19796,8 @@ <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-77.4">
-          <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-77.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-86.4">
-          <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-85.4">
+          <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-85.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20162,11 +19817,7 @@ <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-77.4)</code>
-=======
-                      <code>  (typedef-86.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-85.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20410,11 +20061,7 @@ <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
                       </em>
                     </p>
                   </td>
@@ -20475,13 +20122,8 @@ <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-34.1">
-          <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-44.1">
+          <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20501,11 +20143,7 @@ <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-34.1)</code>
-=======
-                      <code>  (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-44.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20616,13 +20254,8 @@ <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-34.1">
-          <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-44.1">
+          <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20642,11 +20275,7 @@ <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-34.1)</code>
-=======
-                      <code>  (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-44.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20757,13 +20386,8 @@ <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-77.2">
-          <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-77.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-85.2">
+          <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-85.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20783,11 +20407,7 @@ <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-77.2)</code>
-=======
-                      <code>  (typedef-86.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-85.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -21021,13 +20641,8 @@ <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-77.3">
-          <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-77.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-86.3">
-          <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-86.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-85.3">
+          <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-85.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -21047,11 +20662,7 @@ <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-77.3)</code>
-=======
-                      <code>  (typedef-86.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-85.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -21359,13 +20970,8 @@ <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-72.1">
-          <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-72.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-74.1">
-          <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-74.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-76.1">
+          <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-76.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -21385,11 +20991,7 @@ <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-72.1)</code>
-=======
-                      <code>  (typedef-74.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-76.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -21779,13 +21381,8 @@ <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-72.2">
-          <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-72.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-74.2">
-          <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-74.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-76.2">
+          <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-76.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -21805,11 +21402,7 @@ <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-72.2)</code>
-=======
-                      <code>  (typedef-74.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-76.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22027,13 +21620,8 @@ <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-79.3">
-          <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-79.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-72.3">
-          <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-72.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-74.3">
+          <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-74.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22053,11 +21641,7 @@ <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-79.3)</code>
-=======
-                      <code>  (typedef-72.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-74.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22207,13 +21791,8 @@ <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-79.2">
-          <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-79.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-72.2">
-          <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-72.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-74.2">
+          <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-74.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22233,11 +21812,7 @@ <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-79.2)</code>
-=======
-                      <code>  (typedef-72.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-74.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22434,13 +22009,8 @@ <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-79.3">
-          <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-79.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-72.3">
-          <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-72.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-74.3">
+          <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-74.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22460,11 +22030,7 @@ <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-79.3)</code>
-=======
-                      <code>  (typedef-72.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-74.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22614,13 +22180,8 @@ <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-34.1">
-          <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-44.1">
+          <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22640,11 +22201,7 @@ <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-34.1)</code>
-=======
-                      <code>  (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-44.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22755,13 +22312,8 @@ <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-34.1">
-          <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-44.1">
+          <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22781,11 +22333,7 @@ <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-34.1)</code>
-=======
-                      <code>  (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-44.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22896,13 +22444,8 @@ <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-79.2">
-          <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-79.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-72.2">
-          <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-72.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-74.2">
+          <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-74.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22922,11 +22465,7 @@ <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-79.2)</code>
-=======
-                      <code>  (typedef-72.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-74.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -23123,13 +22662,8 @@ <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-79.2">
-          <h3>1.56. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-79.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-72.2">
-          <h3>1.56. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-72.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-74.2">
+          <h3>1.56. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-74.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -23149,11 +22683,7 @@ <h3>1.56. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-79.2)</code>
-=======
-                      <code>  (typedef-72.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-74.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -23682,11 +23212,7 @@ <h3>2.3. The toplevel element <code>siri:ServiceDelivery</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
                       </em>
                     </p>
                   </td>
@@ -24446,11 +23972,7 @@ <h3>2.6. The group <code>siri:DeliveryResponseGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-77.4" title="local-type: typedef-77.4">local-type: typedef-77.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-85.4" title="local-type: typedef-85.4">local-type: typedef-85.4</a>
                       </em>
                     </p>
                   </td>
@@ -24758,11 +24280,7 @@ <h3>2.9. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
                       </em>
                     </p>
                   </td>
@@ -24793,11 +24311,7 @@ <h3>2.9. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-77.3" title="local-type: typedef-77.3">local-type: typedef-77.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-86.3" title="local-type: typedef-86.3">local-type: typedef-86.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-85.3" title="local-type: typedef-85.3">local-type: typedef-85.3</a>
                       </em>
                     </p>
                   </td>
@@ -25214,11 +24728,7 @@ <h3>2.10. The group <code>siri:ResponseGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-77.4" title="local-type: typedef-77.4">local-type: typedef-77.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-85.4" title="local-type: typedef-85.4">local-type: typedef-85.4</a>
                       </em>
                     </p>
                   </td>
@@ -25433,11 +24943,7 @@ <h3>2.11. The group <code>siri:ServiceDeliveryBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
                       </em>
                     </p>
                   </td>
@@ -25556,11 +25062,7 @@ <h3>2.12. The group <code>siri:ServiceRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
                       </em>
                     </p>
                   </td>
@@ -25591,11 +25093,7 @@ <h3>2.12. The group <code>siri:ServiceRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-77.3" title="local-type: typedef-77.3">local-type: typedef-77.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-86.3" title="local-type: typedef-86.3">local-type: typedef-86.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-85.3" title="local-type: typedef-85.3">local-type: typedef-85.3</a>
                       </em>
                     </p>
                   </td>
@@ -26355,11 +25853,7 @@ <h3>2.16. The complex type <code>siri:ServiceDeliveryBodyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
                       </em>
                     </p>
                   </td>
@@ -26368,17 +25862,11 @@ <h3>2.16. The complex type <code>siri:ServiceDeliveryBodyStructure</code>
                   </td>
                 </tr>
                 <tr>
-<<<<<<< HEAD
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-=======
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     <a shape="rect" href="#group.siri:ServiceDeliveryBodyGroup" title="siri:ServiceDeliveryBodyGroup">siri:ServiceDeliveryBodyGroup</a>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-=======
                       <code>siri:ContainsAllDataForNewInitialState</code>
                     </p>
                   </td>
@@ -26399,7 +25887,6 @@ <h3>2.16. The complex type <code>siri:ServiceDeliveryBodyStructure</code>
                 <tr>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       <code>siri:MoreData</code>
                     </p>
                   </td>
@@ -27068,11 +26555,7 @@ <h3>2.17. The complex type <code>siri:ServiceDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
                       </em>
                     </p>
                   </td>
@@ -27081,17 +26564,11 @@ <h3>2.17. The complex type <code>siri:ServiceDeliveryStructure</code>
                   </td>
                 </tr>
                 <tr>
-<<<<<<< HEAD
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-=======
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     <a shape="rect" href="#group.siri:ServiceDeliveryBodyGroup" title="siri:ServiceDeliveryBodyGroup">siri:ServiceDeliveryBodyGroup</a>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-=======
                       <code>siri:ContainsAllDataForNewInitialState</code>
                     </p>
                   </td>
@@ -27112,7 +26589,6 @@ <h3>2.17. The complex type <code>siri:ServiceDeliveryStructure</code>
                 <tr>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       <code>siri:MoreData</code>
                     </p>
                   </td>
@@ -27861,11 +27337,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
                       </em>
                     </p>
                   </td>
@@ -27896,11 +27368,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-77.3" title="local-type: typedef-77.3">local-type: typedef-77.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-86.3" title="local-type: typedef-86.3">local-type: typedef-86.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-85.3" title="local-type: typedef-85.3">local-type: typedef-85.3</a>
                       </em>
                     </p>
                   </td>
@@ -28149,11 +27617,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-76.1" title="local-type: typedef-76.1">local-type: typedef-76.1</a>
                       </em>
                     </p>
                   </td>
@@ -28215,11 +27679,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-76.2" title="local-type: typedef-76.2">local-type: typedef-76.2</a>
                       </em>
                     </p>
                   </td>
@@ -28519,11 +27979,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-77.4" title="local-type: typedef-77.4">local-type: typedef-77.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-85.4" title="local-type: typedef-85.4">local-type: typedef-85.4</a>
                       </em>
                     </p>
                   </td>
@@ -29260,13 +28716,8 @@ <h3>2.20. The complex type <code>siri:SubscriptionRequestStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-33.3">
-          <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-33.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-58.3">
-          <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-58.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-40.3">
+          <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-40.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -29286,11 +28737,7 @@ <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-33.3)</code>
-=======
-                      <code>  (typedef-58.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-40.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -29534,11 +28981,7 @@ <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
                       </em>
                     </p>
                   </td>
@@ -29599,13 +29042,8 @@ <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-34.1">
-          <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-44.1">
+          <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -29625,11 +29063,7 @@ <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-34.1)</code>
-=======
-                      <code>  (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-44.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -29740,13 +29174,8 @@ <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-33.1">
-          <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-33.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-58.1">
-          <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-58.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-40.1">
+          <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-40.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -29766,11 +29195,7 @@ <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-33.1)</code>
-=======
-                      <code>  (typedef-58.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-40.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -30038,13 +29463,8 @@ <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-33.2">
-          <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-33.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-58.2">
-          <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-58.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-40.2">
+          <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-40.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -30064,11 +29484,7 @@ <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-33.2)</code>
-=======
-                      <code>  (typedef-58.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-40.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -30376,13 +29792,8 @@ <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-77.4">
-          <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-77.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-86.4">
-          <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-85.4">
+          <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-85.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -30402,11 +29813,7 @@ <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-77.4)</code>
-=======
-                      <code>  (typedef-86.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-85.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -30650,11 +30057,7 @@ <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
                       </em>
                     </p>
                   </td>
@@ -30715,13 +30118,8 @@ <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-34.1">
-          <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-44.1">
+          <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -30741,11 +30139,7 @@ <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-34.1)</code>
-=======
-                      <code>  (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-44.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -30856,13 +30250,8 @@ <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-77.2">
-          <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-77.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-85.2">
+          <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-85.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -30882,11 +30271,7 @@ <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-77.2)</code>
-=======
-                      <code>  (typedef-86.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-85.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -31120,13 +30505,8 @@ <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-77.3">
-          <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-77.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-86.3">
-          <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-86.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-85.3">
+          <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-85.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -31146,11 +30526,7 @@ <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-77.3)</code>
-=======
-                      <code>  (typedef-86.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-85.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -31458,13 +30834,8 @@ <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-77.4">
-          <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-77.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-86.4">
-          <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-85.4">
+          <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-85.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -31484,11 +30855,7 @@ <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-77.4)</code>
-=======
-                      <code>  (typedef-86.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-85.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -31732,11 +31099,7 @@ <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
                       </em>
                     </p>
                   </td>
@@ -31797,13 +31160,8 @@ <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-34.1">
-          <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-44.1">
+          <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -31823,11 +31181,7 @@ <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-34.1)</code>
-=======
-                      <code>  (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-44.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -31938,13 +31292,8 @@ <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-34.1">
-          <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-44.1">
+          <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -31964,11 +31313,7 @@ <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-34.1)</code>
-=======
-                      <code>  (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-44.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32079,13 +31424,8 @@ <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-77.2">
-          <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-77.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-85.2">
+          <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-85.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32105,11 +31445,7 @@ <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-77.2)</code>
-=======
-                      <code>  (typedef-86.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-85.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32343,13 +31679,8 @@ <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-77.3">
-          <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-77.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-86.3">
-          <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-86.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-85.3">
+          <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-85.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32369,11 +31700,7 @@ <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-77.3)</code>
-=======
-                      <code>  (typedef-86.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-85.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32681,13 +32008,8 @@ <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-34.1">
-          <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-44.1">
+          <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32707,11 +32029,7 @@ <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-34.1)</code>
-=======
-                      <code>  (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-44.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32822,13 +32140,8 @@ <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-34.1">
-          <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-44.1">
+          <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32848,11 +32161,7 @@ <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-34.1)</code>
-=======
-                      <code>  (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-44.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32963,13 +32272,8 @@ <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-77.2">
-          <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-77.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-85.2">
+          <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-85.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32989,11 +32293,7 @@ <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-77.2)</code>
-=======
-                      <code>  (typedef-86.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-85.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -33227,13 +32527,8 @@ <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-77.3">
-          <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-77.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-86.3">
-          <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-86.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-85.3">
+          <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-85.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -33253,11 +32548,7 @@ <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-77.3)</code>
-=======
-                      <code>  (typedef-86.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-85.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -33565,13 +32856,8 @@ <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-72.1">
-          <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-72.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-74.1">
-          <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-74.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-76.1">
+          <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-76.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -33591,11 +32877,7 @@ <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-72.1)</code>
-=======
-                      <code>  (typedef-74.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-76.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -33985,13 +33267,8 @@ <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-72.2">
-          <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-72.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-74.2">
-          <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-74.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-76.2">
+          <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-76.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -34011,11 +33288,7 @@ <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-72.2)</code>
-=======
-                      <code>  (typedef-74.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-76.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -34233,13 +33506,8 @@ <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-77.4">
-          <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-77.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-86.4">
-          <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-85.4">
+          <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-85.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -34259,11 +33527,7 @@ <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-77.4)</code>
-=======
-                      <code>  (typedef-86.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-85.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -34507,11 +33771,7 @@ <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
                       </em>
                     </p>
                   </td>
@@ -34572,13 +33832,8 @@ <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-34.1">
-          <h3>2.41. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>2.41. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-44.1">
+          <h3>2.41. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -34598,11 +33853,7 @@ <h3>2.41. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-34.1)</code>
-=======
-                      <code>  (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-44.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -35291,11 +34542,7 @@ <h3>3.16. The group <code>siri:CheckStatusPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-29.4" title="local-type: typedef-29.4">local-type: typedef-29.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-56.4" title="local-type: typedef-56.4">local-type: typedef-56.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-45.4" title="local-type: typedef-45.4">local-type: typedef-45.4</a>
                       </em>
                     </p>
                   </td>
@@ -35561,11 +34808,7 @@ <h3>3.18. The group <code>siri:DataReceivedPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-29.3" title="local-type: typedef-29.3">local-type: typedef-29.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-56.3" title="local-type: typedef-56.3">local-type: typedef-56.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-45.3" title="local-type: typedef-45.3">local-type: typedef-45.3</a>
                       </em>
                     </p>
                   </td>
@@ -37805,11 +37048,7 @@ <h3>3.37. The complex type <code>siri:CheckStatusResponseBodyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-29.4" title="local-type: typedef-29.4">local-type: typedef-29.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-56.4" title="local-type: typedef-56.4">local-type: typedef-56.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-45.4" title="local-type: typedef-45.4">local-type: typedef-45.4</a>
                       </em>
                     </p>
                   </td>
@@ -38147,11 +37386,7 @@ <h3>3.38. The complex type <code>siri:CheckStatusResponseStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-29.4" title="local-type: typedef-29.4">local-type: typedef-29.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-56.4" title="local-type: typedef-56.4">local-type: typedef-56.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-45.4" title="local-type: typedef-45.4">local-type: typedef-45.4</a>
                       </em>
                     </p>
                   </td>
@@ -39066,11 +38301,7 @@ <h3>3.42. The complex type <code>siri:DataReadyResponseStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-29.2" title="local-type: typedef-29.2">local-type: typedef-29.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-56.2" title="local-type: typedef-56.2">local-type: typedef-56.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-45.2" title="local-type: typedef-45.2">local-type: typedef-45.2</a>
                       </em>
                     </p>
                   </td>
@@ -39277,11 +38508,7 @@ <h3>3.43. The complex type <code>siri:DataReceivedResponseStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-29.3" title="local-type: typedef-29.3">local-type: typedef-29.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-56.3" title="local-type: typedef-56.3">local-type: typedef-56.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-45.3" title="local-type: typedef-45.3">local-type: typedef-45.3</a>
                       </em>
                     </p>
                   </td>
@@ -39919,11 +39146,7 @@ <h3>3.46. The complex type <code>siri:HeartbeatNotificationStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-29.4" title="local-type: typedef-29.4">local-type: typedef-29.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-56.4" title="local-type: typedef-56.4">local-type: typedef-56.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-45.4" title="local-type: typedef-45.4">local-type: typedef-45.4</a>
                       </em>
                     </p>
                   </td>
@@ -42400,11 +41623,7 @@ <h3>3.55. The complex type <code>siri:TerminationResponseStatusStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-29.1" title="local-type: typedef-29.1">local-type: typedef-29.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-56.1" title="local-type: typedef-56.1">local-type: typedef-56.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-45.1" title="local-type: typedef-45.1">local-type: typedef-45.1</a>
                       </em>
                     </p>
                   </td>
@@ -42416,13 +41635,8 @@ <h3>3.55. The complex type <code>siri:TerminationResponseStatusStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-29.4">
-          <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-29.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-56.4">
-          <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-56.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-45.4">
+          <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-45.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42442,11 +41656,7 @@ <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-29.4)</code>
-=======
-                      <code>  (typedef-56.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-45.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42557,13 +41767,8 @@ <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-29.3">
-          <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-29.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-56.3">
-          <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-56.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-45.3">
+          <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-45.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42583,11 +41788,7 @@ <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-29.3)</code>
-=======
-                      <code>  (typedef-56.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-45.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42698,13 +41899,8 @@ <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-29.4">
-          <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-29.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-56.4">
-          <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-56.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-45.4">
+          <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-45.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42724,11 +41920,7 @@ <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-29.4)</code>
-=======
-                      <code>  (typedef-56.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-45.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42839,13 +42031,8 @@ <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-29.4">
-          <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-29.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-56.4">
-          <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-56.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-45.4">
+          <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-45.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42865,11 +42052,7 @@ <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-29.4)</code>
-=======
-                      <code>  (typedef-56.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-45.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42980,13 +42163,8 @@ <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-29.2">
-          <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/ErrorCondition#complexType (typedef-29.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-56.2">
-          <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/ErrorCondition#complexType (typedef-56.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-45.2">
+          <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/ErrorCondition#complexType (typedef-45.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -43006,11 +42184,7 @@ <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/Er
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-29.2)</code>
-=======
-                      <code>  (typedef-56.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-45.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -43121,13 +42295,8 @@ <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/Er
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-29.3">
-          <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-29.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-56.3">
-          <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-56.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-45.3">
+          <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-45.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -43147,11 +42316,7 @@ <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-29.3)</code>
-=======
-                      <code>  (typedef-56.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-45.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -43262,13 +42427,8 @@ <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-29.4">
-          <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-29.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-56.4">
-          <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-56.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-45.4">
+          <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-45.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -43288,11 +42448,7 @@ <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-29.4)</code>
-=======
-                      <code>  (typedef-56.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-45.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -43403,13 +42559,8 @@ <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-29.1">
-          <h3>3.63. The complex type <code>complexType[siri:TerminationResponseStatusStructure]/ErrorCondition#complexType (typedef-29.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-56.1">
-          <h3>3.63. The complex type <code>complexType[siri:TerminationResponseStatusStructure]/ErrorCondition#complexType (typedef-56.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-45.1">
+          <h3>3.63. The complex type <code>complexType[siri:TerminationResponseStatusStructure]/ErrorCondition#complexType (typedef-45.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -43429,11 +42580,7 @@ <h3>3.63. The complex type <code>complexType[siri:TerminationResponseStatusStruc
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-29.1)</code>
-=======
-                      <code>  (typedef-56.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-45.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -43773,11 +42920,7 @@ <h3>4.5. The toplevel element <code>siri:EndpointDeniedAccessError</code>
                       </em>(<em>↔ siri:ErrorCode</em>)</p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock">Error:Endpoint to which a message is to be distributed did not allow access by the cloient. (since SIRI 2.0)</p>
-=======
                     <p class="tableblock">Error:Endpoint to which a message is to be distributed did not allow access by the client. (since SIRI 2.0)</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
@@ -43844,11 +42987,7 @@ <h3>4.7. The toplevel element <code>siri:ErrorCode</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock">Subsititutable type for a SIRI Error code.</p>
-=======
                     <p class="tableblock">Substitutable type for a SIRI Error code.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
@@ -43916,11 +43055,7 @@ <h3>4.9. The toplevel element <code>siri:ErrorConditionElement</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock">Element fror an erroc condition (for use in WSDL.)</p>
-=======
                     <p class="tableblock">Element fror an error condition (for use in WSDL.)</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
@@ -44086,11 +43221,7 @@ <h3>4.14. The toplevel element <code>siri:ServiceDeliveryErrorConditionElement</
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock">Element fror an erroc condition for use in WSDL.</p>
-=======
                     <p class="tableblock">Element from an error condition for use in WSDL.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
@@ -44222,11 +43353,7 @@ <h3>4.18. The toplevel element <code>siri:UnknownExtensionsError</code>
                       </em>(<em>↔ siri:ErrorCode</em>)</p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock">Error: Request contained extensions that were not supported by the producer. A response has been provided but some or all extensions have been ignored.. (since SIRI 2.0).</p>
-=======
                     <p class="tableblock">Error: Request contained extensions that were not supported by the producer. A response has been provided but some or all extensions have been ignored. (since SIRI 2.0).</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
@@ -44612,11 +43739,7 @@ <h3>4.22. The group <code>siri:ApplicationErrorGroup</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Error: Request contained extensions that were not supported by the producer. A response has been provided but some or all extensions have been ignored.. (since SIRI 2.0).</p>
-=======
                     <p class="tableblock darkbrown">Error: Request contained extensions that were not supported by the producer. A response has been provided but some or all extensions have been ignored. (since SIRI 2.0).</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -44841,11 +43964,7 @@ <h3>4.23. The group <code>siri:DistributionErrorGroup</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Error:Endpoint to which a message is to be distributed did not allow access by the cloient. (since SIRI 2.0)</p>
-=======
                     <p class="tableblock darkbrown">Error:Endpoint to which a message is to be distributed did not allow access by the client. (since SIRI 2.0)</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -45044,11 +44163,7 @@ <h3>4.24. The group <code>siri:ServiceRequestErrorGroup</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Error:Endpoint to which a message is to be distributed did not allow access by the cloient. (since SIRI 2.0)</p>
-=======
                     <p class="tableblock darkbrown">Error:Endpoint to which a message is to be distributed did not allow access by the client. (since SIRI 2.0)</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -45335,11 +44450,7 @@ <h3>4.24. The group <code>siri:ServiceRequestErrorGroup</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Error: Request contained extensions that were not supported by the producer. A response has been provided but some or all extensions have been ignored.. (since SIRI 2.0).</p>
-=======
                     <p class="tableblock darkbrown">Error: Request contained extensions that were not supported by the producer. A response has been provided but some or all extensions have been ignored. (since SIRI 2.0).</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -45565,11 +44676,7 @@ <h3>4.26. The complex type <code>siri:AccessNotAllowedErrorStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Addtional Description of error. This allows a descripotion to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
-=======
                     <p class="tableblock darkbrown">Additional description of error. This allows a description to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
@@ -45657,11 +44764,7 @@ <h3>4.27. The complex type <code>siri:AllowedResourceUsageExceededErrorStructure
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Addtional Description of error. This allows a descripotion to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
-=======
                     <p class="tableblock darkbrown">Additional description of error. This allows a description to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
@@ -45749,11 +44852,7 @@ <h3>4.28. The complex type <code>siri:BeyondDataHorizonErrorStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Addtional Description of error. This allows a descripotion to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
-=======
                     <p class="tableblock darkbrown">Additional description of error. This allows a description to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
@@ -45841,11 +44940,7 @@ <h3>4.29. The complex type <code>siri:CapabilityNotSupportedErrorStructure</code
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Addtional Description of error. This allows a descripotion to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
-=======
                     <p class="tableblock darkbrown">Additional description of error. This allows a description to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -45875,11 +44970,7 @@ <h3>4.29. The complex type <code>siri:CapabilityNotSupportedErrorStructure</code
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Id of capabiliuty that is noit supported.</p>
-=======
                     <p class="tableblock darkbrown">Id of capability that is not supported.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
@@ -45967,11 +45058,7 @@ <h3>4.30. The complex type <code>siri:EndpointDeniedAccessStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Addtional Description of error. This allows a descripotion to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
-=======
                     <p class="tableblock darkbrown">Additional description of error. This allows a description to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -46001,11 +45088,7 @@ <h3>4.30. The complex type <code>siri:EndpointDeniedAccessStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Endpoint that was denied access + SIRI v2.0</p>
-=======
                     <p class="tableblock darkbrown">Endpoint that was denied access (since SIRI v2.0)</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
@@ -46093,11 +45176,7 @@ <h3>4.31. The complex type <code>siri:EndpointNotAvailableAccessStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Addtional Description of error. This allows a descripotion to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
-=======
                     <p class="tableblock darkbrown">Additional description of error. This allows a description to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -46127,11 +45206,7 @@ <h3>4.31. The complex type <code>siri:EndpointNotAvailableAccessStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Endpoint that is noit available. + SIRI v2.0</p>
-=======
                     <p class="tableblock darkbrown">Endpoint that is not available. (since SIRI v2.0)</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
@@ -46212,11 +45287,7 @@ <h3>4.32. The complex type <code>siri:ErrorCodeStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Addtional Description of error. This allows a descripotion to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
-=======
                     <p class="tableblock darkbrown">Additional description of error. This allows a description to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
@@ -46389,11 +45460,7 @@ <h3>4.33. The complex type <code>siri:ErrorConditionElementStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Error:Endpoint to which a message is to be distributed did not allow access by the cloient. (since SIRI 2.0)</p>
-=======
                     <p class="tableblock darkbrown">Error:Endpoint to which a message is to be distributed did not allow access by the client. (since SIRI 2.0)</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -46680,11 +45747,7 @@ <h3>4.33. The complex type <code>siri:ErrorConditionElementStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Error: Request contained extensions that were not supported by the producer. A response has been provided but some or all extensions have been ignored.. (since SIRI 2.0).</p>
-=======
                     <p class="tableblock darkbrown">Error: Request contained extensions that were not supported by the producer. A response has been provided but some or all extensions have been ignored. (since SIRI 2.0).</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -47096,11 +46159,7 @@ <h3>4.34. The complex type <code>siri:ErrorConditionStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Error: Request contained extensions that were not supported by the producer. A response has been provided but some or all extensions have been ignored.. (since SIRI 2.0).</p>
-=======
                     <p class="tableblock darkbrown">Error: Request contained extensions that were not supported by the producer. A response has been provided but some or all extensions have been ignored. (since SIRI 2.0).</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -47307,11 +46366,7 @@ <h3>4.36. The complex type <code>siri:InvalidDataReferencesErrorStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Addtional Description of error. This allows a descripotion to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
-=======
                     <p class="tableblock darkbrown">Additional description of error. This allows a description to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -47427,11 +46482,7 @@ <h3>4.37. The complex type <code>siri:NoInfoForTopicErrorStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Addtional Description of error. This allows a descripotion to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
-=======
                     <p class="tableblock darkbrown">Additional description of error. This allows a description to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
@@ -47519,11 +46570,7 @@ <h3>4.38. The complex type <code>siri:OtherErrorStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Addtional Description of error. This allows a descripotion to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
-=======
                     <p class="tableblock darkbrown">Additional description of error. This allows a description to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
@@ -47611,11 +46658,7 @@ <h3>4.39. The complex type <code>siri:ParametersIgnoredErrorStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Addtional Description of error. This allows a descripotion to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
-=======
                     <p class="tableblock darkbrown">Additional description of error. This allows a description to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -47816,11 +46859,7 @@ <h3>4.40. The complex type <code>siri:ServiceDeliveryErrorConditionStructure</co
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Error:Endpoint to which a message is to be distributed did not allow access by the cloient. (since SIRI 2.0)</p>
-=======
                     <p class="tableblock darkbrown">Error:Endpoint to which a message is to be distributed did not allow access by the client. (since SIRI 2.0)</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -48107,11 +47146,7 @@ <h3>4.40. The complex type <code>siri:ServiceDeliveryErrorConditionStructure</co
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Error: Request contained extensions that were not supported by the producer. A response has been provided but some or all extensions have been ignored.. (since SIRI 2.0).</p>
-=======
                     <p class="tableblock darkbrown">Error: Request contained extensions that were not supported by the producer. A response has been provided but some or all extensions have been ignored. (since SIRI 2.0).</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -48285,11 +47320,7 @@ <h3>4.41. The complex type <code>siri:ServiceNotAvailableErrorStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Addtional Description of error. This allows a descripotion to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
-=======
                     <p class="tableblock darkbrown">Additional description of error. This allows a description to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -48317,11 +47348,7 @@ <h3>4.41. The complex type <code>siri:ServiceNotAvailableErrorStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Expected time fro reavailability of servcie. (since SIRI 2.0)</p>
-=======
                     <p class="tableblock darkbrown">Expected time fro reavailability of service. (since SIRI 2.0)</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
@@ -48409,11 +47436,7 @@ <h3>4.42. The complex type <code>siri:UnapprovedKeyAccessStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Addtional Description of error. This allows a descripotion to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
-=======
                     <p class="tableblock darkbrown">Additional description of error. This allows a description to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -48529,11 +47552,7 @@ <h3>4.43. The complex type <code>siri:UnknownEndpointErrorStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Addtional Description of error. This allows a descripotion to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
-=======
                     <p class="tableblock darkbrown">Additional description of error. This allows a description to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -48563,11 +47582,7 @@ <h3>4.43. The complex type <code>siri:UnknownEndpointErrorStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Endpoint that is noit known. + SIRI v2.0</p>
-=======
                     <p class="tableblock darkbrown">Endpoint that is not known. (since SIRI v2.0)</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
@@ -48655,11 +47670,7 @@ <h3>4.44. The complex type <code>siri:UnknownExtensionsErrorStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Addtional Description of error. This allows a descripotion to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
-=======
                     <p class="tableblock darkbrown">Additional description of error. This allows a description to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -48775,11 +47786,7 @@ <h3>4.45. The complex type <code>siri:UnknownParticipantErrorStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Addtional Description of error. This allows a descripotion to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
-=======
                     <p class="tableblock darkbrown">Additional description of error. This allows a description to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -48808,11 +47815,7 @@ <h3>4.45. The complex type <code>siri:UnknownParticipantErrorStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Reference to Participant who is unknown. + SIRI v2.0</p>
-=======
                     <p class="tableblock darkbrown">Reference to Participant who is unknown. (since SIRI v2.0)</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
@@ -48900,11 +47903,7 @@ <h3>4.46. The complex type <code>siri:UnknownSubscriberErrorStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Addtional Description of error. This allows a descripotion to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
-=======
                     <p class="tableblock darkbrown">Additional description of error. This allows a description to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -48933,11 +47932,7 @@ <h3>4.46. The complex type <code>siri:UnknownSubscriberErrorStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Id of capabiliuty that is noit supported. + SIRI v2.0</p>
-=======
                     <p class="tableblock darkbrown">Id of capabiliuty that is noit supported. (since SIRI v2.0)</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
@@ -49025,11 +48020,7 @@ <h3>4.47. The complex type <code>siri:UnknownSubscriptionErrorStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Addtional Description of error. This allows a descripotion to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
-=======
                     <p class="tableblock darkbrown">Additional description of error. This allows a description to be supplied when the Error code is used in a specific WSDL fault, rather than within a general error condition.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -49058,11 +48049,7 @@ <h3>4.47. The complex type <code>siri:UnknownSubscriptionErrorStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Ubscription code that could not be found. + SIRI v2.0</p>
-=======
                     <p class="tableblock darkbrown">Subscription code that could not be found. (since SIRI v2.0)</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
@@ -51460,11 +50447,7 @@ <h3>6.29. The group <code>siri:ServiceDeliveryRequestStatusGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
                       </em>
                     </p>
                   </td>
@@ -54196,11 +53179,7 @@ <h3>6.50. The complex type <code>siri:CapabilityGeneralInteractionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-59.2" title="local-type: typedef-59.2">local-type: typedef-59.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-44.2" title="local-type: typedef-44.2">local-type: typedef-44.2</a>
                       </em>
                     </p>
                   </td>
@@ -54228,11 +53207,7 @@ <h3>6.50. The complex type <code>siri:CapabilityGeneralInteractionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-59.3" title="local-type: typedef-59.3">local-type: typedef-59.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-44.3" title="local-type: typedef-44.3">local-type: typedef-44.3</a>
                       </em>
                     </p>
                   </td>
@@ -56378,13 +55353,8 @@ <h3>6.63. The complex type <code>siri:TransportDescriptionStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-34.1">
-          <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-44.1">
+          <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -56404,11 +55374,7 @@ <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-34.1)</code>
-=======
-                      <code>  (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-44.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -56519,13 +55485,8 @@ <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-34.2">
-          <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Interaction#complexType (typedef-34.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-59.2">
-          <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Interaction#complexType (typedef-59.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-44.2">
+          <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Interaction#complexType (typedef-44.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -56545,11 +55506,7 @@ <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionSt
                       <br/>
                       <code>  /Interaction #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-34.2)</code>
-=======
-                      <code>  (typedef-59.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-44.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -56617,13 +55574,8 @@ <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionSt
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-34.3">
-          <h3>6.66. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Delivery#complexType (typedef-34.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-59.3">
-          <h3>6.66. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Delivery#complexType (typedef-59.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-44.3">
+          <h3>6.66. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Delivery#complexType (typedef-44.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -56643,11 +55595,7 @@ <h3>6.66. The complex type <code>complexType[siri:CapabilityGeneralInteractionSt
                       <br/>
                       <code>  /Delivery #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-34.3)</code>
-=======
-                      <code>  (typedef-59.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-44.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -59004,11 +57952,7 @@ <h3>7.24. The complex type <code>siri:ConnectionMonitoringCapabilitiesResponseSt
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-74.3" title="local-type: typedef-74.3">local-type: typedef-74.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-86.3" title="local-type: typedef-86.3">local-type: typedef-86.3</a>
                       </em>
                     </p>
                   </td>
@@ -60690,11 +59634,7 @@ <h3>7.30. The complex type <code>siri:ConnectionMonitoringServiceCapabilitiesStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-82.1" title="local-type: typedef-82.1">local-type: typedef-82.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
                       </em>
                     </p>
                   </td>
@@ -60718,11 +59658,7 @@ <h3>7.30. The complex type <code>siri:ConnectionMonitoringServiceCapabilitiesStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -62655,11 +61591,7 @@ <h3>7.35. The complex type <code>siri:StoppingPositionChangedDepartureStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -63002,13 +61934,8 @@ <h3>7.36. The complex type <code>siri:WaitProlongedDepartureStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-74.3">
-          <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-74.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-82.3">
-          <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-82.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-86.3">
+          <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-86.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -63028,11 +61955,7 @@ <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-74.3)</code>
-=======
-                      <code>  (typedef-82.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-86.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -63070,13 +61993,8 @@ <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-74.3">
-          <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-74.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-82.3">
-          <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-82.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-86.3">
+          <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-86.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -63096,11 +62014,7 @@ <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-74.3)</code>
-=======
-                      <code>  (typedef-82.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-86.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -63138,13 +62052,8 @@ <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-74.1">
-          <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-74.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-82.1">
-          <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-82.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-86.1">
+          <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-86.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -63164,11 +62073,7 @@ <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCap
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-74.1)</code>
-=======
-                      <code>  (typedef-82.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-86.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -63277,13 +62182,8 @@ <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCap
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-74.2">
-          <h3>7.40. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-74.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-82.2">
-          <h3>7.40. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-82.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>7.40. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -63303,11 +62203,7 @@ <h3>7.40. The complex type <code>complexType[siri:ConnectionMonitoringServiceCap
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-74.2)</code>
-=======
-                      <code>  (typedef-82.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -64933,11 +63829,7 @@ <h3>8.17. The complex type <code>siri:ConnectionTimetableCapabilitiesResponseStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-85.1" title="local-type: typedef-85.1">local-type: typedef-85.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-78.1" title="local-type: typedef-78.1">local-type: typedef-78.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-83.1" title="local-type: typedef-83.1">local-type: typedef-83.1</a>
                       </em>
                     </p>
                   </td>
@@ -66060,11 +64952,7 @@ <h3>8.22. The complex type <code>siri:ConnectionTimetableServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-83.2" title="local-type: typedef-83.2">local-type: typedef-83.2</a>
                       </em>
                     </p>
                   </td>
@@ -66088,11 +64976,7 @@ <h3>8.22. The complex type <code>siri:ConnectionTimetableServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-85.3" title="local-type: typedef-85.3">local-type: typedef-85.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-83.3" title="local-type: typedef-83.3">local-type: typedef-83.3</a>
                       </em>
                     </p>
                   </td>
@@ -67308,13 +66192,8 @@ <h3>8.25. The complex type <code>siri:TimetabledFeederArrivalStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-85.1">
-          <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitiesResponseStructure]/ConnectionTimetablePermissions#complexType (typedef-85.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-78.1">
-          <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitiesResponseStructure]/ConnectionTimetablePermissions#complexType (typedef-78.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-83.1">
+          <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitiesResponseStructure]/ConnectionTimetablePermissions#complexType (typedef-83.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -67334,11 +66213,7 @@ <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitie
                       <br/>
                       <code>  /ConnectionTimetablePermissions #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-85.1)</code>
-=======
-                      <code>  (typedef-78.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-83.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -67412,13 +66287,8 @@ <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitie
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-85.2">
-          <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-85.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-78.2">
-          <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-78.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-83.2">
+          <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-83.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -67438,11 +66308,7 @@ <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapa
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-85.2)</code>
-=======
-                      <code>  (typedef-78.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-83.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -67512,13 +66378,8 @@ <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapa
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-85.3">
-          <h3>8.28. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-85.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-78.3">
-          <h3>8.28. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-78.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-83.3">
+          <h3>8.28. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-83.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -67538,11 +66399,7 @@ <h3>8.28. The complex type <code>complexType[siri:ConnectionTimetableServiceCapa
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-85.3)</code>
-=======
-                      <code>  (typedef-78.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-83.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -68989,11 +67846,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -69014,11 +67867,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.3" title="local-type: typedef-85.3">local-type: typedef-85.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -69039,11 +67888,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.7" title="local-type: typedef-78.7">local-type: typedef-78.7</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.7" title="local-type: typedef-85.7">local-type: typedef-85.7</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -69064,11 +67909,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.9" title="local-type: typedef-78.9">local-type: typedef-78.9</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.9" title="local-type: typedef-85.9">local-type: typedef-85.9</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -69089,11 +67930,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.10" title="local-type: typedef-78.10">local-type: typedef-78.10</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.10" title="local-type: typedef-85.10">local-type: typedef-85.10</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -69459,11 +68296,7 @@ <h3>9.25. The group <code>siri:ControlActionTopicGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.1" title="local-type: typedef-78.1">local-type: typedef-78.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.1" title="local-type: typedef-85.1">local-type: typedef-85.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -70939,11 +69772,7 @@ <h3>9.35. The group <code>siri:PartialJourneyScope</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.18" title="local-type: typedef-78.18">local-type: typedef-78.18</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.18" title="local-type: typedef-85.18">local-type: typedef-85.18</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -70973,11 +69802,7 @@ <h3>9.35. The group <code>siri:PartialJourneyScope</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.19" title="local-type: typedef-78.19">local-type: typedef-78.19</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.19" title="local-type: typedef-85.19">local-type: typedef-85.19</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -71106,11 +69931,7 @@ <h3>9.36. The group <code>siri:PartOfJourneyPatternScope</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.18" title="local-type: typedef-78.18">local-type: typedef-78.18</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.18" title="local-type: typedef-85.18">local-type: typedef-85.18</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -71140,11 +69961,7 @@ <h3>9.36. The group <code>siri:PartOfJourneyPatternScope</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.19" title="local-type: typedef-78.19">local-type: typedef-78.19</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.19" title="local-type: typedef-85.19">local-type: typedef-85.19</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -72975,11 +71792,7 @@ <h3>9.44. The complex type <code>siri:CallCancellationActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.18" title="local-type: typedef-78.18">local-type: typedef-78.18</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.18" title="local-type: typedef-85.18">local-type: typedef-85.18</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -73009,11 +71822,7 @@ <h3>9.44. The complex type <code>siri:CallCancellationActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.19" title="local-type: typedef-78.19">local-type: typedef-78.19</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.19" title="local-type: typedef-85.19">local-type: typedef-85.19</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -73745,11 +72554,7 @@ <h3>9.49. The complex type <code>siri:ControlActionCapabilitiesResponseStructure
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.14" title="local-type: typedef-78.14">local-type: typedef-78.14</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.14" title="local-type: typedef-85.14">local-type: typedef-85.14</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -74448,11 +73253,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -74473,11 +73274,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.3" title="local-type: typedef-85.3">local-type: typedef-85.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -74498,11 +73295,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.7" title="local-type: typedef-78.7">local-type: typedef-78.7</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.7" title="local-type: typedef-85.7">local-type: typedef-85.7</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -74523,11 +73316,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.9" title="local-type: typedef-78.9">local-type: typedef-78.9</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.9" title="local-type: typedef-85.9">local-type: typedef-85.9</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -74548,11 +73337,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.10" title="local-type: typedef-78.10">local-type: typedef-78.10</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.10" title="local-type: typedef-85.10">local-type: typedef-85.10</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -74798,11 +73583,7 @@ <h3>9.53. The complex type <code>siri:ControlActionFilterStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.1" title="local-type: typedef-78.1">local-type: typedef-78.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.1" title="local-type: typedef-85.1">local-type: typedef-85.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -75477,11 +74258,7 @@ <h3>9.56. The complex type <code>siri:ControlActionRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.1" title="local-type: typedef-78.1">local-type: typedef-78.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.1" title="local-type: typedef-85.1">local-type: typedef-85.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -75745,11 +74522,7 @@ <h3>9.57. The complex type <code>siri:ControlActionServiceCapabilitiesStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.11" title="local-type: typedef-78.11">local-type: typedef-78.11</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.11" title="local-type: typedef-85.11">local-type: typedef-85.11</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -75773,11 +74546,7 @@ <h3>9.57. The complex type <code>siri:ControlActionServiceCapabilitiesStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.12" title="local-type: typedef-78.12">local-type: typedef-78.12</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.12" title="local-type: typedef-85.12">local-type: typedef-85.12</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -75849,11 +74618,7 @@ <h3>9.57. The complex type <code>siri:ControlActionServiceCapabilitiesStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.13" title="local-type: typedef-78.13">local-type: typedef-78.13</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.13" title="local-type: typedef-85.13">local-type: typedef-85.13</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -75987,11 +74752,7 @@ <h3>9.58. The complex type <code>siri:ControlActionServicePermissionStructure</c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-36.1" title="local-type: typedef-36.1">local-type: typedef-36.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-50.1" title="local-type: typedef-50.1">local-type: typedef-50.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
                       </em>
                     </p>
                   </td>
@@ -76025,11 +74786,7 @@ <h3>9.58. The complex type <code>siri:ControlActionServicePermissionStructure</c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-56.2" title="local-type: typedef-56.2">local-type: typedef-56.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-8.2" title="local-type: typedef-8.2">local-type: typedef-8.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-68.2" title="local-type: typedef-68.2">local-type: typedef-68.2</a>
                       </em>
                     </p>
                   </td>
@@ -76058,11 +74815,7 @@ <h3>9.58. The complex type <code>siri:ControlActionServicePermissionStructure</c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-56.1" title="local-type: typedef-56.1">local-type: typedef-56.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-8.1" title="local-type: typedef-8.1">local-type: typedef-8.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -76810,11 +75563,7 @@ <h3>9.59. The complex type <code>siri:ControlActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.15" title="local-type: typedef-78.15">local-type: typedef-78.15</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.15" title="local-type: typedef-85.15">local-type: typedef-85.15</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -77657,11 +76406,7 @@ <h3>9.63. The complex type <code>siri:DriverMessageStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.16" title="local-type: typedef-78.16">local-type: typedef-78.16</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.16" title="local-type: typedef-85.16">local-type: typedef-85.16</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -77790,11 +76535,7 @@ <h3>9.63. The complex type <code>siri:DriverMessageStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.17" title="local-type: typedef-78.17">local-type: typedef-78.17</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.17" title="local-type: typedef-85.17">local-type: typedef-85.17</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -78972,11 +77713,21 @@ <h3>9.69. The complex type <code>siri:JourneyPatternModification</code>
                     <p class="tableblock darkbrown">Identification of the DATED VEHICLE JOURNEY to cancel</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">The element contains <em>one</em> of the following elements (a-b)</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
                   </td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>a</em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <code>
                         <strong>siri:ChangedPoints</strong>
@@ -78986,7 +77737,7 @@ <h3>9.69. The complex type <code>siri:JourneyPatternModification</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <code>
-                        <strong title="mandatory, single">1:1</strong>
+                        <strong title="mandatory, single, part of a choice">-1:1</strong>
                       </code>
                     </p>
                   </td>
@@ -79000,6 +77751,39 @@ <h3>9.69. The complex type <code>siri:JourneyPatternModification</code>
                     <p class="tableblock darkbrown">List of modified points</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>b</em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>
+                        <strong>siri:UpdatedServiceLinks</strong>
+                      </code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>
+                        <strong title="mandatory, single, part of a choice">-1:1</strong>
+                      </code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>+<a shape="rect" href="#type.siri:ServiceLinkViewsStructure" title="siri:ServiceLinkViewsStructure">siri:ServiceLinkViewsStructure</a>
+                      </em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">List of SERVICE LINKs having updated shapes in that journey. This is only to provide updated the shapes of the journey (as gml:linestring), not to provide additional SERVICE LINK (provided through the sequence of CALLS)</p>
+                  </td>
+                </tr>
               </tbody>
             </table>
           </div>
@@ -81133,13 +79917,8 @@ <h3>9.82. The complex type <code>siri:VehicleWorkAssignment</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.14">
           <h3>9.83. The complex type <code>element[siri:ControlActionPermissions]#complexType (typedef-78.14)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.14">
-          <h3>9.83. The complex type <code>element[siri:ControlActionPermissions]#complexType (typedef-85.14)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81159,11 +79938,7 @@ <h3>9.83. The complex type <code>element[siri:ControlActionPermissions]#complexT
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.14)</code>
-=======
-                      <code>  (typedef-85.14)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81237,13 +80012,8 @@ <h3>9.83. The complex type <code>element[siri:ControlActionPermissions]#complexT
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.2">
           <h3>9.84. The complex type <code>group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-78.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.2">
-          <h3>9.84. The complex type <code>group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-85.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81263,11 +80033,7 @@ <h3>9.84. The complex type <code>group[siri:ControlActionPayloadGroup]/controlAc
                       <br/>
                       <code>  /controlActions #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.2)</code>
-=======
-                      <code>  (typedef-85.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81309,13 +80075,8 @@ <h3>9.84. The complex type <code>group[siri:ControlActionPayloadGroup]/controlAc
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.3">
           <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-78.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.3">
-          <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-85.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81335,11 +80096,7 @@ <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                       <br/>
                       <code>  /groupsOfControlActions #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.3)</code>
-=======
-                      <code>  (typedef-85.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81369,11 +80126,7 @@ <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.4" title="local-type: typedef-85.4">local-type: typedef-85.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -81385,13 +80138,8 @@ <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.4">
           <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-78.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.4">
-          <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-85.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81411,11 +80159,7 @@ <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.4)</code>
-=======
-                      <code>  (typedef-85.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81585,11 +80329,7 @@ <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.5" title="local-type: typedef-78.5">local-type: typedef-78.5</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.5" title="local-type: typedef-85.5">local-type: typedef-85.5</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -81613,11 +80353,7 @@ <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.6" title="local-type: typedef-78.6">local-type: typedef-78.6</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.6" title="local-type: typedef-85.6">local-type: typedef-85.6</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -81629,13 +80365,8 @@ <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.5">
           <h3>9.87. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-78.5)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.5">
-          <h3>9.87. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-85.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81655,11 +80386,7 @@ <h3>9.87. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions/AddedControlActions #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.5)</code>
-=======
-                      <code>  (typedef-85.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81701,13 +80428,8 @@ <h3>9.87. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.6">
           <h3>9.88. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-78.6)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.6">
-          <h3>9.88. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-85.6)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81727,11 +80449,7 @@ <h3>9.88. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions/RemovedControlActions #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.6)</code>
-=======
-                      <code>  (typedef-85.6)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81773,13 +80491,8 @@ <h3>9.88. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.7">
           <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-78.7)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.7">
-          <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-85.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81799,11 +80512,7 @@ <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
                       <br/>
                       <code>  /revokedControlActions #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.7)</code>
-=======
-                      <code>  (typedef-85.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81833,11 +80542,7 @@ <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.8" title="local-type: typedef-78.8">local-type: typedef-78.8</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.8" title="local-type: typedef-85.8">local-type: typedef-85.8</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -81849,13 +80554,8 @@ <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.8">
           <h3>9.90. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-78.8)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.8">
-          <h3>9.90. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-85.8)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81875,11 +80575,7 @@ <h3>9.90. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
                       <br/>
                       <code>  /revokedControlActions/RevokedControlAction #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.8)</code>
-=======
-                      <code>  (typedef-85.8)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82012,13 +80708,8 @@ <h3>9.90. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.9">
           <h3>9.91. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-78.9)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.9">
-          <h3>9.91. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-85.9)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82038,11 +80729,7 @@ <h3>9.91. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMes
                       <br/>
                       <code>  /driverMessages #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.9)</code>
-=======
-                      <code>  (typedef-85.9)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82084,13 +80771,8 @@ <h3>9.91. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMes
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.10">
           <h3>9.92. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-78.10)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.10">
-          <h3>9.92. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-85.10)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82110,11 +80792,7 @@ <h3>9.92. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDe
                       <br/>
                       <code>  /vehicleDetectings #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.10)</code>
-=======
-                      <code>  (typedef-85.10)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82156,13 +80834,8 @@ <h3>9.92. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDe
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.1">
           <h3>9.93. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-78.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.1">
-          <h3>9.93. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-85.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82182,11 +80855,7 @@ <h3>9.93. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#compl
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.1)</code>
-=======
-                      <code>  (typedef-85.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82228,13 +80897,8 @@ <h3>9.93. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#compl
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.18">
           <h3>9.94. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-78.18)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.18">
-          <h3>9.94. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-85.18)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82254,11 +80918,7 @@ <h3>9.94. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
                       <br/>
                       <code>  /SelectedCalls #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.18)</code>
-=======
-                      <code>  (typedef-85.18)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82300,13 +80960,8 @@ <h3>9.94. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.19">
           <h3>9.95. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-78.19)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.19">
-          <h3>9.95. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-85.19)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82326,11 +80981,7 @@ <h3>9.95. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
                       <br/>
                       <code>  /CallsBetweenPoints #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.19)</code>
-=======
-                      <code>  (typedef-85.19)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82400,13 +81051,8 @@ <h3>9.95. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.18">
           <h3>9.96. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-78.18)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.18">
-          <h3>9.96. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-85.18)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82426,11 +81072,7 @@ <h3>9.96. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
                       <br/>
                       <code>  /SelectedCalls #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.18)</code>
-=======
-                      <code>  (typedef-85.18)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82472,13 +81114,8 @@ <h3>9.96. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.19">
           <h3>9.97. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-78.19)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.19">
-          <h3>9.97. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-85.19)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82498,11 +81135,7 @@ <h3>9.97. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
                       <br/>
                       <code>  /CallsBetweenPoints #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.19)</code>
-=======
-                      <code>  (typedef-85.19)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82572,13 +81205,8 @@ <h3>9.97. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.18">
           <h3>9.98. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-78.18)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.18">
-          <h3>9.98. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-85.18)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82598,11 +81226,7 @@ <h3>9.98. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
                       <br/>
                       <code>  /SelectedCalls #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.18)</code>
-=======
-                      <code>  (typedef-85.18)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82644,13 +81268,8 @@ <h3>9.98. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.19">
           <h3>9.99. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-78.19)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.19">
-          <h3>9.99. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-85.19)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82670,11 +81289,7 @@ <h3>9.99. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
                       <br/>
                       <code>  /CallsBetweenPoints #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.19)</code>
-=======
-                      <code>  (typedef-85.19)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82744,13 +81359,8 @@ <h3>9.99. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.14">
           <h3>9.100. The complex type <code>element[siri:ControlActionPermissions]#complexType (typedef-78.14)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.14">
-          <h3>9.100. The complex type <code>element[siri:ControlActionPermissions]#complexType (typedef-85.14)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82770,11 +81380,7 @@ <h3>9.100. The complex type <code>element[siri:ControlActionPermissions]#complex
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.14)</code>
-=======
-                      <code>  (typedef-85.14)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82848,13 +81454,8 @@ <h3>9.100. The complex type <code>element[siri:ControlActionPermissions]#complex
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.2">
           <h3>9.101. The complex type <code>group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-78.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.2">
-          <h3>9.101. The complex type <code>group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-85.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82874,11 +81475,7 @@ <h3>9.101. The complex type <code>group[siri:ControlActionPayloadGroup]/controlA
                       <br/>
                       <code>  /controlActions #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.2)</code>
-=======
-                      <code>  (typedef-85.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82920,13 +81517,8 @@ <h3>9.101. The complex type <code>group[siri:ControlActionPayloadGroup]/controlA
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.3">
           <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-78.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.3">
-          <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-85.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82946,11 +81538,7 @@ <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                       <br/>
                       <code>  /groupsOfControlActions #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.3)</code>
-=======
-                      <code>  (typedef-85.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82980,11 +81568,7 @@ <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.4" title="local-type: typedef-85.4">local-type: typedef-85.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -82996,13 +81580,8 @@ <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.4">
           <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-78.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.4">
-          <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-85.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83022,11 +81601,7 @@ <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.4)</code>
-=======
-                      <code>  (typedef-85.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83196,11 +81771,7 @@ <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.5" title="local-type: typedef-78.5">local-type: typedef-78.5</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.5" title="local-type: typedef-85.5">local-type: typedef-85.5</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -83224,11 +81795,7 @@ <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.6" title="local-type: typedef-78.6">local-type: typedef-78.6</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.6" title="local-type: typedef-85.6">local-type: typedef-85.6</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -83240,13 +81807,8 @@ <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.5">
           <h3>9.104. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-78.5)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.5">
-          <h3>9.104. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-85.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83266,11 +81828,7 @@ <h3>9.104. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions/AddedControlActions #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.5)</code>
-=======
-                      <code>  (typedef-85.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83312,13 +81870,8 @@ <h3>9.104. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.6">
           <h3>9.105. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-78.6)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.6">
-          <h3>9.105. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-85.6)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83338,11 +81891,7 @@ <h3>9.105. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions/RemovedControlActions #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.6)</code>
-=======
-                      <code>  (typedef-85.6)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83384,13 +81933,8 @@ <h3>9.105. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.7">
           <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-78.7)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.7">
-          <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-85.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83410,11 +81954,7 @@ <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
                       <br/>
                       <code>  /revokedControlActions #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.7)</code>
-=======
-                      <code>  (typedef-85.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83444,11 +81984,7 @@ <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
                       <em>+<a shape="rect" href="#local-type.typedef-78.8" title="local-type: typedef-78.8">local-type: typedef-78.8</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-85.8" title="local-type: typedef-85.8">local-type: typedef-85.8</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -83460,13 +81996,8 @@ <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.8">
           <h3>9.107. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-78.8)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.8">
-          <h3>9.107. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-85.8)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83486,11 +82017,7 @@ <h3>9.107. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
                       <br/>
                       <code>  /revokedControlActions/RevokedControlAction #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.8)</code>
-=======
-                      <code>  (typedef-85.8)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83623,13 +82150,8 @@ <h3>9.107. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.9">
           <h3>9.108. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-78.9)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.9">
-          <h3>9.108. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-85.9)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83649,11 +82171,7 @@ <h3>9.108. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMe
                       <br/>
                       <code>  /driverMessages #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.9)</code>
-=======
-                      <code>  (typedef-85.9)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83695,13 +82213,8 @@ <h3>9.108. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMe
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.10">
           <h3>9.109. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-78.10)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.10">
-          <h3>9.109. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-85.10)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83721,11 +82234,7 @@ <h3>9.109. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleD
                       <br/>
                       <code>  /vehicleDetectings #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.10)</code>
-=======
-                      <code>  (typedef-85.10)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83767,13 +82276,8 @@ <h3>9.109. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleD
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.1">
           <h3>9.110. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-78.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.1">
-          <h3>9.110. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-85.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83793,11 +82297,7 @@ <h3>9.110. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#comp
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.1)</code>
-=======
-                      <code>  (typedef-85.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83839,13 +82339,8 @@ <h3>9.110. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#comp
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.1">
           <h3>9.111. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-78.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.1">
-          <h3>9.111. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-85.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83865,11 +82360,7 @@ <h3>9.111. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#comp
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.1)</code>
-=======
-                      <code>  (typedef-85.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83911,13 +82402,8 @@ <h3>9.111. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#comp
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.11">
           <h3>9.112. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-78.11)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.11">
-          <h3>9.112. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-85.11)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83937,11 +82423,7 @@ <h3>9.112. The complex type <code>complexType[siri:ControlActionServiceCapabilit
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.11)</code>
-=======
-                      <code>  (typedef-85.11)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -84073,13 +82555,8 @@ <h3>9.112. The complex type <code>complexType[siri:ControlActionServiceCapabilit
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.12">
           <h3>9.113. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-78.12)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.12">
-          <h3>9.113. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-85.12)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -84099,11 +82576,7 @@ <h3>9.113. The complex type <code>complexType[siri:ControlActionServiceCapabilit
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.12)</code>
-=======
-                      <code>  (typedef-85.12)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -84321,13 +82794,8 @@ <h3>9.113. The complex type <code>complexType[siri:ControlActionServiceCapabilit
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.13">
           <h3>9.114. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-78.13)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.13">
-          <h3>9.114. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-85.13)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -84347,11 +82815,7 @@ <h3>9.114. The complex type <code>complexType[siri:ControlActionServiceCapabilit
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.13)</code>
-=======
-                      <code>  (typedef-85.13)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -84388,13 +82852,8 @@ <h3>9.114. The complex type <code>complexType[siri:ControlActionServiceCapabilit
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-36.1">
-          <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-36.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-50.1">
-          <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-50.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-39.1">
+          <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-39.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -84414,11 +82873,7 @@ <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-36.1)</code>
-=======
-                      <code>  (typedef-50.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-39.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -84486,13 +82941,8 @@ <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-56.2">
-          <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-56.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-8.2">
-          <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-8.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-68.2">
+          <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-68.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -84512,11 +82962,7 @@ <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-56.2)</code>
-=======
-                      <code>  (typedef-8.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-68.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -84601,13 +83047,8 @@ <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-56.1">
-          <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typedef-56.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-8.1">
-          <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typedef-8.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-68.1">
+          <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typedef-68.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -84627,11 +83068,7 @@ <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-56.1)</code>
-=======
-                      <code>  (typedef-8.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-68.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -84716,13 +83153,8 @@ <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.15">
           <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/SituationDescription#complexType (typedef-78.15)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.15">
-          <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/SituationDescription#complexType (typedef-85.15)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -84742,11 +83174,7 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
                       <br/>
                       <code>  /SituationDescription #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.15)</code>
-=======
-                      <code>  (typedef-85.15)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -84797,11 +83225,7 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Summary of SITUATION. If absent should be generated from structure elements / and or by condensing Description. (Unbounded since SIRI 2.0)</p>
-=======
                     <p class="tableblock darkbrown">Summary of SITUATION. If absent should be generated from structure elements, and/or by condensing Description. (Unbounded since SIRI 2.0)</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -84901,11 +83325,7 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.14" title="local-type: typedef-60.14">local-type: typedef-60.14</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.14" title="local-type: typedef-16.14">local-type: typedef-16.14</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.14" title="local-type: typedef-47.14">local-type: typedef-47.14</a>
                       </em>
                     </p>
                   </td>
@@ -84926,11 +83346,7 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.16" title="local-type: typedef-60.16">local-type: typedef-60.16</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.16" title="local-type: typedef-16.16">local-type: typedef-16.16</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.16" title="local-type: typedef-47.16">local-type: typedef-47.16</a>
                       </em>
                     </p>
                   </td>
@@ -84942,13 +83358,8 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.14">
-          <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-60.14)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.14">
-          <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-16.14)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.14">
+          <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-47.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -84968,11 +83379,7 @@ <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.14)</code>
-=======
-                      <code>  (typedef-16.14)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -85002,11 +83409,7 @@ <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.15" title="local-type: typedef-60.15">local-type: typedef-60.15</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.15" title="local-type: typedef-16.15">local-type: typedef-16.15</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.15" title="local-type: typedef-47.15">local-type: typedef-47.15</a>
                       </em>
                     </p>
                   </td>
@@ -85018,13 +83421,8 @@ <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.15">
-          <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-60.15)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.15">
-          <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-16.15)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.15">
+          <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-47.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -85044,11 +83442,7 @@ <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.15)</code>
-=======
-                      <code>  (typedef-16.15)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -85163,13 +83557,8 @@ <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.16">
-          <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-60.16)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.16">
-          <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-16.16)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.16">
+          <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-47.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -85189,11 +83578,7 @@ <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.16)</code>
-=======
-                      <code>  (typedef-16.16)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -85235,13 +83620,8 @@ <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.16">
           <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/MessageContents#complexType (typedef-78.16)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.16">
-          <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/MessageContents#complexType (typedef-85.16)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -85261,11 +83641,7 @@ <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/Messa
                       <br/>
                       <code>  /MessageContents #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.16)</code>
-=======
-                      <code>  (typedef-85.16)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -85307,13 +83683,8 @@ <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/Messa
             </table>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="sect2" id="local-type.typedef-78.17">
           <h3>9.123. The complex type <code>complexType[siri:DriverMessageStructure]/DiverScope#complexType (typedef-78.17)</code>
-=======
-        <div class="sect2" id="local-type.typedef-85.17">
-          <h3>9.123. The complex type <code>complexType[siri:DriverMessageStructure]/DiverScope#complexType (typedef-85.17)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -85333,11 +83704,7 @@ <h3>9.123. The complex type <code>complexType[siri:DriverMessageStructure]/Diver
                       <br/>
                       <code>  /DiverScope #complexType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-78.17)</code>
-=======
-                      <code>  (typedef-85.17)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -87830,11 +86197,7 @@ <h3>10.29. The group <code>siri:SiriDiscoveryIndexGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-76.1" title="local-type: typedef-76.1">local-type: typedef-76.1</a>
                       </em>
                     </p>
                   </td>
@@ -87896,11 +86259,7 @@ <h3>10.29. The group <code>siri:SiriDiscoveryIndexGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-76.2" title="local-type: typedef-76.2">local-type: typedef-76.2</a>
                       </em>
                     </p>
                   </td>
@@ -88668,11 +87027,7 @@ <h3>10.31. The group <code>siri:SiriReferenceDiscoveryRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-76.1" title="local-type: typedef-76.1">local-type: typedef-76.1</a>
                       </em>
                     </p>
                   </td>
@@ -88734,11 +87089,7 @@ <h3>10.31. The group <code>siri:SiriReferenceDiscoveryRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-76.2" title="local-type: typedef-76.2">local-type: typedef-76.2</a>
                       </em>
                     </p>
                   </td>
@@ -93758,13 +92109,8 @@ <h3>10.50. The complex type <code>siri:VehicleFeaturesRequestStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-72.2">
-          <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-72.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-74.2">
-          <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-74.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-76.2">
+          <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-76.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -93784,11 +92130,7 @@ <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-72.2)</code>
-=======
-                      <code>  (typedef-74.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-76.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -94006,13 +92348,8 @@ <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-72.1">
-          <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-72.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-74.1">
-          <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-74.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-76.1">
+          <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-76.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -94032,11 +92369,7 @@ <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (t
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-72.1)</code>
-=======
-                      <code>  (typedef-74.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-76.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -94426,13 +92759,8 @@ <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (t
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-72.1">
-          <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-72.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-74.1">
-          <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-74.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-76.1">
+          <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-76.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -94452,11 +92780,7 @@ <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (t
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-72.1)</code>
-=======
-                      <code>  (typedef-74.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-76.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -94846,13 +93170,8 @@ <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (t
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-72.2">
-          <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-72.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-74.2">
-          <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-74.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-76.2">
+          <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-76.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -94872,11 +93191,7 @@ <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-72.2)</code>
-=======
-                      <code>  (typedef-74.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-76.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -95094,13 +93409,8 @@ <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-72.1">
-          <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-72.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-74.1">
-          <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-74.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-76.1">
+          <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-76.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -95120,11 +93430,7 @@ <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (t
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-72.1)</code>
-=======
-                      <code>  (typedef-74.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-76.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -95514,13 +93820,8 @@ <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (t
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-72.2">
-          <h3>10.56. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-72.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-74.2">
-          <h3>10.56. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-74.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-76.2">
+          <h3>10.56. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-76.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -95540,11 +93841,7 @@ <h3>10.56. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-72.2)</code>
-=======
-                      <code>  (typedef-74.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-76.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -96597,11 +94894,7 @@ <h3>11.13. The group <code>siri:EstimatedTimetableTopicGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
-=======
                       <em>+<a shape="rect" href="#local-type.typedef-79.1" title="local-type: typedef-79.1">local-type: typedef-79.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -97094,11 +95387,7 @@ <h3>11.15. The complex type <code>siri:EstimatedTimetableCapabilitiesResponseStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
-=======
                       <em>+<a shape="rect" href="#local-type.typedef-79.4" title="local-type: typedef-79.4">local-type: typedef-79.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -98012,11 +96301,7 @@ <h3>11.19. The complex type <code>siri:EstimatedTimetableRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
-=======
                       <em>+<a shape="rect" href="#local-type.typedef-79.1" title="local-type: typedef-79.1">local-type: typedef-79.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -98349,11 +96634,7 @@ <h3>11.20. The complex type <code>siri:EstimatedTimetableServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
-=======
                       <em>+<a shape="rect" href="#local-type.typedef-79.2" title="local-type: typedef-79.2">local-type: typedef-79.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -98377,11 +96658,7 @@ <h3>11.20. The complex type <code>siri:EstimatedTimetableServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-86.3" title="local-type: typedef-86.3">local-type: typedef-86.3</a>
-=======
                       <em>+<a shape="rect" href="#local-type.typedef-79.3" title="local-type: typedef-79.3">local-type: typedef-79.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -98897,13 +97174,8 @@ <h3>11.22. The complex type <code>siri:EstimatedVersionFrameStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-86.4">
-          <h3>11.23. The complex type <code>element[siri:EstimatedTimetablePermissions]#complexType (typedef-86.4)</code>
-=======
         <div class="sect2" id="local-type.typedef-79.4">
           <h3>11.23. The complex type <code>element[siri:EstimatedTimetablePermissions]#complexType (typedef-79.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -98923,11 +97195,7 @@ <h3>11.23. The complex type <code>element[siri:EstimatedTimetablePermissions]#co
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-86.4)</code>
-=======
                       <code>  (typedef-79.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -99001,13 +97269,8 @@ <h3>11.23. The complex type <code>element[siri:EstimatedTimetablePermissions]#co
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-86.1">
-          <h3>11.24. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines#complexType (typedef-86.1)</code>
-=======
         <div class="sect2" id="local-type.typedef-79.1">
           <h3>11.24. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines#complexType (typedef-79.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -99027,11 +97290,7 @@ <h3>11.24. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-86.1)</code>
-=======
                       <code>  (typedef-79.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -99073,13 +97332,8 @@ <h3>11.24. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-86.4">
-          <h3>11.25. The complex type <code>element[siri:EstimatedTimetablePermissions]#complexType (typedef-86.4)</code>
-=======
         <div class="sect2" id="local-type.typedef-79.4">
           <h3>11.25. The complex type <code>element[siri:EstimatedTimetablePermissions]#complexType (typedef-79.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -99099,11 +97353,7 @@ <h3>11.25. The complex type <code>element[siri:EstimatedTimetablePermissions]#co
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-86.4)</code>
-=======
                       <code>  (typedef-79.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -99177,13 +97427,8 @@ <h3>11.25. The complex type <code>element[siri:EstimatedTimetablePermissions]#co
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-86.1">
-          <h3>11.26. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines#complexType (typedef-86.1)</code>
-=======
         <div class="sect2" id="local-type.typedef-79.1">
           <h3>11.26. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines#complexType (typedef-79.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -99203,11 +97448,7 @@ <h3>11.26. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-86.1)</code>
-=======
                       <code>  (typedef-79.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -99249,13 +97490,8 @@ <h3>11.26. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>11.27. The complex type <code>complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-86.2)</code>
-=======
         <div class="sect2" id="local-type.typedef-79.2">
           <h3>11.27. The complex type <code>complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-79.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -99275,11 +97511,7 @@ <h3>11.27. The complex type <code>complexType[siri:EstimatedTimetableServiceCapa
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-86.2)</code>
-=======
                       <code>  (typedef-79.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -99469,13 +97701,8 @@ <h3>11.27. The complex type <code>complexType[siri:EstimatedTimetableServiceCapa
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-86.3">
-          <h3>11.28. The complex type <code>complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-86.3)</code>
-=======
         <div class="sect2" id="local-type.typedef-79.3">
           <h3>11.28. The complex type <code>complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-79.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -99495,11 +97722,7 @@ <h3>11.28. The complex type <code>complexType[siri:EstimatedTimetableServiceCapa
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-86.3)</code>
-=======
                       <code>  (typedef-79.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -101410,11 +99633,7 @@ <h3>12.17. The complex type <code>siri:FacilityMonitoringCapabilitiesResponseStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-75.5" title="local-type: typedef-75.5">local-type: typedef-75.5</a>
-=======
                       <em>+<a shape="rect" href="#local-type.typedef-73.5" title="local-type: typedef-73.5">local-type: typedef-73.5</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -102611,11 +100830,7 @@ <h3>12.21. The complex type <code>siri:FacilityMonitoringServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-75.1" title="local-type: typedef-75.1">local-type: typedef-75.1</a>
-=======
                       <em>+<a shape="rect" href="#local-type.typedef-73.1" title="local-type: typedef-73.1">local-type: typedef-73.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -102639,11 +100854,7 @@ <h3>12.21. The complex type <code>siri:FacilityMonitoringServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-75.2" title="local-type: typedef-75.2">local-type: typedef-75.2</a>
-=======
                       <em>+<a shape="rect" href="#local-type.typedef-73.2" title="local-type: typedef-73.2">local-type: typedef-73.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -102691,11 +100902,7 @@ <h3>12.21. The complex type <code>siri:FacilityMonitoringServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-75.3" title="local-type: typedef-75.3">local-type: typedef-75.3</a>
-=======
                       <em>+<a shape="rect" href="#local-type.typedef-73.3" title="local-type: typedef-73.3">local-type: typedef-73.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -102719,11 +100926,7 @@ <h3>12.21. The complex type <code>siri:FacilityMonitoringServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-75.4" title="local-type: typedef-75.4">local-type: typedef-75.4</a>
-=======
                       <em>+<a shape="rect" href="#local-type.typedef-73.4" title="local-type: typedef-73.4">local-type: typedef-73.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -102882,11 +101085,7 @@ <h3>12.22. The complex type <code>siri:FacilityMonitoringServicePermissionStruct
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-36.1" title="local-type: typedef-36.1">local-type: typedef-36.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-50.1" title="local-type: typedef-50.1">local-type: typedef-50.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
                       </em>
                     </p>
                   </td>
@@ -102920,11 +101119,7 @@ <h3>12.22. The complex type <code>siri:FacilityMonitoringServicePermissionStruct
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-56.2" title="local-type: typedef-56.2">local-type: typedef-56.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-8.2" title="local-type: typedef-8.2">local-type: typedef-8.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-68.2" title="local-type: typedef-68.2">local-type: typedef-68.2</a>
                       </em>
                     </p>
                   </td>
@@ -102953,11 +101148,7 @@ <h3>12.22. The complex type <code>siri:FacilityMonitoringServicePermissionStruct
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-56.1" title="local-type: typedef-56.1">local-type: typedef-56.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-8.1" title="local-type: typedef-8.1">local-type: typedef-8.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -103213,13 +101404,8 @@ <h3>12.23. The complex type <code>siri:FacilityMonitoringSubscriptionStructure</
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-75.5">
-          <h3>12.24. The complex type <code>element[siri:FacilityMonitoringPermissions]#complexType (typedef-75.5)</code>
-=======
         <div class="sect2" id="local-type.typedef-73.5">
           <h3>12.24. The complex type <code>element[siri:FacilityMonitoringPermissions]#complexType (typedef-73.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -103239,11 +101425,7 @@ <h3>12.24. The complex type <code>element[siri:FacilityMonitoringPermissions]#co
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-75.5)</code>
-=======
                       <code>  (typedef-73.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -103317,13 +101499,8 @@ <h3>12.24. The complex type <code>element[siri:FacilityMonitoringPermissions]#co
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-75.5">
-          <h3>12.25. The complex type <code>element[siri:FacilityMonitoringPermissions]#complexType (typedef-75.5)</code>
-=======
         <div class="sect2" id="local-type.typedef-73.5">
           <h3>12.25. The complex type <code>element[siri:FacilityMonitoringPermissions]#complexType (typedef-73.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -103343,11 +101520,7 @@ <h3>12.25. The complex type <code>element[siri:FacilityMonitoringPermissions]#co
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-75.5)</code>
-=======
                       <code>  (typedef-73.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -103421,13 +101594,8 @@ <h3>12.25. The complex type <code>element[siri:FacilityMonitoringPermissions]#co
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-75.1">
-          <h3>12.26. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-75.1)</code>
-=======
         <div class="sect2" id="local-type.typedef-73.1">
           <h3>12.26. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-73.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -103447,11 +101615,7 @@ <h3>12.26. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-75.1)</code>
-=======
                       <code>  (typedef-73.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -103716,13 +101880,8 @@ <h3>12.26. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-75.2">
-          <h3>12.27. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-75.2)</code>
-=======
         <div class="sect2" id="local-type.typedef-73.2">
           <h3>12.27. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-73.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -103742,11 +101901,7 @@ <h3>12.27. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-75.2)</code>
-=======
                       <code>  (typedef-73.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -103918,13 +102073,8 @@ <h3>12.27. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-75.3">
-          <h3>12.28. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-75.3)</code>
-=======
         <div class="sect2" id="local-type.typedef-73.3">
           <h3>12.28. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-73.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -103944,11 +102094,7 @@ <h3>12.28. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
                       <br/>
                       <code>  /AccessControl #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-75.3)</code>
-=======
                       <code>  (typedef-73.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -104049,13 +102195,8 @@ <h3>12.28. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-75.4">
-          <h3>12.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-75.4)</code>
-=======
         <div class="sect2" id="local-type.typedef-73.4">
           <h3>12.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-73.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -104075,11 +102216,7 @@ <h3>12.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-75.4)</code>
-=======
                       <code>  (typedef-73.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -104139,13 +102276,8 @@ <h3>12.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-36.1">
-          <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-36.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-50.1">
-          <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-50.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-39.1">
+          <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-39.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -104165,11 +102297,7 @@ <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-36.1)</code>
-=======
-                      <code>  (typedef-50.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-39.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -104237,13 +102365,8 @@ <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-56.2">
-          <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-56.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-8.2">
-          <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-8.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-68.2">
+          <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-68.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -104263,11 +102386,7 @@ <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-56.2)</code>
-=======
-                      <code>  (typedef-8.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-68.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -104352,13 +102471,8 @@ <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-56.1">
-          <h3>12.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-56.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-8.1">
-          <h3>12.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-8.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-68.1">
+          <h3>12.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-68.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -104378,11 +102492,7 @@ <h3>12.32. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-56.1)</code>
-=======
-                      <code>  (typedef-8.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-68.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -105561,11 +103671,7 @@ <h3>13.17. The complex type <code>siri:GeneralMessageCapabilitiesResponseStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-73.2" title="local-type: typedef-73.2">local-type: typedef-73.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-83.2" title="local-type: typedef-83.2">local-type: typedef-83.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-75.2" title="local-type: typedef-75.2">local-type: typedef-75.2</a>
                       </em>
                     </p>
                   </td>
@@ -106508,11 +104614,7 @@ <h3>13.22. The complex type <code>siri:GeneralMessageServiceCapabilitiesStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-73.1" title="local-type: typedef-73.1">local-type: typedef-73.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-83.1" title="local-type: typedef-83.1">local-type: typedef-83.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-75.1" title="local-type: typedef-75.1">local-type: typedef-75.1</a>
                       </em>
                     </p>
                   </td>
@@ -106694,11 +104796,7 @@ <h3>13.23. The complex type <code>siri:GeneralMessageServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-36.1" title="local-type: typedef-36.1">local-type: typedef-36.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-50.1" title="local-type: typedef-50.1">local-type: typedef-50.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
                       </em>
                     </p>
                   </td>
@@ -106731,11 +104829,7 @@ <h3>13.23. The complex type <code>siri:GeneralMessageServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-73.3" title="local-type: typedef-73.3">local-type: typedef-73.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-83.3" title="local-type: typedef-83.3">local-type: typedef-83.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-75.3" title="local-type: typedef-75.3">local-type: typedef-75.3</a>
                       </em>
                     </p>
                   </td>
@@ -107561,13 +105655,8 @@ <h3>13.28. The complex type <code>siri:InfoMessageStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-73.2">
-          <h3>12.29. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-73.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-83.2">
-          <h3>13.29. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-83.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-75.2">
+          <h3>13.29. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-75.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -107587,11 +105676,7 @@ <h3>13.29. The complex type <code>element[siri:GeneralMessagePermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-73.2)</code>
-=======
-                      <code>  (typedef-83.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-75.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -107665,13 +105750,8 @@ <h3>13.29. The complex type <code>element[siri:GeneralMessagePermissions]#comple
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-73.2">
-          <h3>12.30. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-73.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-83.2">
-          <h3>13.30. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-83.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-75.2">
+          <h3>13.30. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-75.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -107691,11 +105771,7 @@ <h3>13.30. The complex type <code>element[siri:GeneralMessagePermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-73.2)</code>
-=======
-                      <code>  (typedef-83.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-75.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -107769,13 +105845,8 @@ <h3>13.30. The complex type <code>element[siri:GeneralMessagePermissions]#comple
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-73.1">
-          <h3>12.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-73.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-83.1">
-          <h3>13.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-83.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-75.1">
+          <h3>13.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-75.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -107795,11 +105866,7 @@ <h3>13.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabili
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-73.1)</code>
-=======
-                      <code>  (typedef-83.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-75.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -107865,13 +105932,8 @@ <h3>13.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabili
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-36.1">
-          <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-36.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-50.1">
-          <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-50.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-39.1">
+          <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-39.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -107891,11 +105953,7 @@ <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-36.1)</code>
-=======
-                      <code>  (typedef-50.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-39.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -107963,13 +106021,8 @@ <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-73.3">
-          <h3>12.33. The complex type <code>complexType[siri:GeneralMessageServicePermissionStructure]/InfoChannelPermissions#complexType (typedef-73.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-83.3">
-          <h3>13.33. The complex type <code>complexType[siri:GeneralMessageServicePermissionStructure]/InfoChannelPermissions#complexType (typedef-83.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-75.3">
+          <h3>13.33. The complex type <code>complexType[siri:GeneralMessageServicePermissionStructure]/InfoChannelPermissions#complexType (typedef-75.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -107989,11 +106042,7 @@ <h3>13.33. The complex type <code>complexType[siri:GeneralMessageServicePermissi
                       <br/>
                       <code>  /InfoChannelPermissions #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-73.3)</code>
-=======
-                      <code>  (typedef-83.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-75.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -108878,11 +106927,7 @@ <h3>14.20. The group <code>siri:DatedServiceInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -111627,11 +109672,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -111652,11 +109693,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -111677,11 +109714,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -111766,11 +109799,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -111791,11 +109820,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -112040,11 +110065,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -112227,11 +110248,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-57.6" title="local-type: typedef-57.6">local-type: typedef-57.6</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-14.6" title="local-type: typedef-14.6">local-type: typedef-14.6</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-53.6" title="local-type: typedef-53.6">local-type: typedef-53.6</a>
                       </em>
                     </p>
                   </td>
@@ -112252,11 +110269,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-57.7" title="local-type: typedef-57.7">local-type: typedef-57.7</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-14.7" title="local-type: typedef-14.7">local-type: typedef-14.7</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-53.7" title="local-type: typedef-53.7">local-type: typedef-53.7</a>
                       </em>
                     </p>
                   </td>
@@ -112280,11 +110293,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.2" title="local-type: typedef-50.2">local-type: typedef-50.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.2" title="local-type: typedef-54.2">local-type: typedef-54.2</a>
                       </em>
                     </p>
                   </td>
@@ -112305,11 +110314,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.3" title="local-type: typedef-50.3">local-type: typedef-50.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.3" title="local-type: typedef-54.3">local-type: typedef-54.3</a>
                       </em>
                     </p>
                   </td>
@@ -112330,11 +110335,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.4" title="local-type: typedef-50.4">local-type: typedef-50.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.4" title="local-type: typedef-54.4">local-type: typedef-54.4</a>
                       </em>
                     </p>
                   </td>
@@ -112362,11 +110363,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-61.1" title="local-type: typedef-61.1">local-type: typedef-61.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-63.1" title="local-type: typedef-63.1">local-type: typedef-63.1</a>
                       </em>
                     </p>
                   </td>
@@ -113081,11 +111078,7 @@ <h3>14.32. The complex type <code>siri:RemovedDatedVehicleJourneyStructure</code
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-61.2" title="local-type: typedef-61.2">local-type: typedef-61.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-10.2" title="local-type: typedef-10.2">local-type: typedef-10.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-63.2" title="local-type: typedef-63.2">local-type: typedef-63.2</a>
                       </em>
                     </p>
                   </td>
@@ -115120,13 +113113,8 @@ <h3>14.36. The complex type <code>siri:ToServiceJourneyInterchangeStructure</cod
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-57.6">
-          <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-57.6)</code>
-=======
-        <div class="sect2" id="local-type.typedef-14.6">
-          <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-14.6)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-53.6">
+          <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-53.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -115146,11 +113134,7 @@ <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-57.6)</code>
-=======
-                      <code>  (typedef-14.6)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-53.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -115192,13 +113176,8 @@ <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-57.7">
-          <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-57.7)</code>
-=======
-        <div class="sect2" id="local-type.typedef-14.7">
-          <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-14.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-53.7">
+          <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-53.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -115218,11 +113197,7 @@ <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-57.7)</code>
-=======
-                      <code>  (typedef-14.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-53.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -115264,13 +113239,8 @@ <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.2">
-          <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-50.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.2">
-          <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.2">
+          <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-54.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -115290,11 +113260,7 @@ <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.2)</code>
-=======
-                      <code>  (typedef-18.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -115381,13 +113347,8 @@ <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.3">
-          <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-50.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.3">
-          <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.3">
+          <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-54.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -115407,11 +113368,7 @@ <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.3)</code>
-=======
-                      <code>  (typedef-18.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -115498,13 +113455,8 @@ <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.4">
-          <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-50.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.4">
-          <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.4">
+          <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-54.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -115524,11 +113476,7 @@ <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.4)</code>
-=======
-                      <code>  (typedef-18.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -115615,13 +113563,8 @@ <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-61.1">
-          <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]/DatedCalls#complexType (typedef-61.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-10.1">
-          <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]/DatedCalls#complexType (typedef-10.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-63.1">
+          <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]/DatedCalls#complexType (typedef-63.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -115641,11 +113584,7 @@ <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]
                       <br/>
                       <code>  /DatedCalls #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-61.1)</code>
-=======
-                      <code>  (typedef-10.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-63.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -115688,13 +113627,8 @@ <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-61.2">
-          <h3>14.43. The complex type <code>complexType[siri:RemovedDatedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-61.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-10.2">
-          <h3>14.43. The complex type <code>complexType[siri:RemovedDatedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-10.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-63.2">
+          <h3>14.43. The complex type <code>complexType[siri:RemovedDatedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-63.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -115714,11 +113648,7 @@ <h3>14.43. The complex type <code>complexType[siri:RemovedDatedVehicleJourneyStr
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-61.2)</code>
-=======
-                      <code>  (typedef-10.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-63.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -116159,7 +114089,7 @@ <h3>15.9. The group <code>siri:EstimatedTimetableAlterationGroup</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Reference to a dated VEHICLE JOURNEY. This will be 'framed' i.e. be with the data context of the ESTIMATED Timetable. DEPRECATED from SIRI 2.0</p>
+                    <p class="tableblock darkbrown">Reference to a dated VEHICLE JOURNEY. This will be 'framed' i.e. be with the data context of the ESTIMATED Timetable.</p>
                   </td>
                 </tr>
                 <tr>
@@ -116216,7 +114146,7 @@ <h3>15.9. The group <code>siri:EstimatedTimetableAlterationGroup</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">If this is the first message for an unplanned 'extra' VEHICLE JOURNEY, a new and unique code must be given for it. ExtraJourney should be set to 'true'. DEPRECATED from SIRI 2.0</p>
+                    <p class="tableblock darkbrown">If this is the first message for an unplanned 'extra' VEHICLE JOURNEY, a new and unique code must be given for it. ExtraJourney should be set to 'true'.</p>
                   </td>
                 </tr>
                 <tr>
@@ -119678,7 +117608,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Reference to a dated VEHICLE JOURNEY. This will be 'framed' i.e. be with the data context of the ESTIMATED Timetable. DEPRECATED from SIRI 2.0</p>
+                    <p class="tableblock darkbrown">Reference to a dated VEHICLE JOURNEY. This will be 'framed' i.e. be with the data context of the ESTIMATED Timetable.</p>
                   </td>
                 </tr>
                 <tr>
@@ -119735,7 +117665,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">If this is the first message for an unplanned 'extra' VEHICLE JOURNEY, a new and unique code must be given for it. ExtraJourney should be set to 'true'. DEPRECATED from SIRI 2.0</p>
+                    <p class="tableblock darkbrown">If this is the first message for an unplanned 'extra' VEHICLE JOURNEY, a new and unique code must be given for it. ExtraJourney should be set to 'true'.</p>
                   </td>
                 </tr>
                 <tr>
@@ -120061,11 +117991,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -120086,11 +118012,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -120111,11 +118033,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -120200,11 +118118,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -120225,11 +118139,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -120893,11 +118803,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Velocity of VEHICLE. EIther actual speed or average speed may be used. (since SIRI 2.0)</p>
-=======
                     <p class="tableblock darkbrown">Velocity of VEHICLE. Either actual speed or average speed may be used. (since SIRI 2.0)</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -121201,11 +119107,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-57.4" title="local-type: typedef-57.4">local-type: typedef-57.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-14.4" title="local-type: typedef-14.4">local-type: typedef-14.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-53.4" title="local-type: typedef-53.4">local-type: typedef-53.4</a>
                       </em>
                     </p>
                   </td>
@@ -121226,11 +119128,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-57.5" title="local-type: typedef-57.5">local-type: typedef-57.5</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-14.5" title="local-type: typedef-14.5">local-type: typedef-14.5</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-53.5" title="local-type: typedef-53.5">local-type: typedef-53.5</a>
                       </em>
                     </p>
                   </td>
@@ -121254,11 +119152,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.2" title="local-type: typedef-50.2">local-type: typedef-50.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.2" title="local-type: typedef-54.2">local-type: typedef-54.2</a>
                       </em>
                     </p>
                   </td>
@@ -121279,11 +119173,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.3" title="local-type: typedef-50.3">local-type: typedef-50.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.3" title="local-type: typedef-54.3">local-type: typedef-54.3</a>
                       </em>
                     </p>
                   </td>
@@ -121304,11 +119194,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.4" title="local-type: typedef-50.4">local-type: typedef-50.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.4" title="local-type: typedef-54.4">local-type: typedef-54.4</a>
                       </em>
                     </p>
                   </td>
@@ -121332,11 +119218,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-66.1" title="local-type: typedef-66.1">local-type: typedef-66.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-30.1" title="local-type: typedef-30.1">local-type: typedef-30.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-69.1" title="local-type: typedef-69.1">local-type: typedef-69.1</a>
                       </em>
                     </p>
                   </td>
@@ -121360,11 +119242,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-66.2" title="local-type: typedef-66.2">local-type: typedef-66.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-30.2" title="local-type: typedef-30.2">local-type: typedef-30.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-69.2" title="local-type: typedef-69.2">local-type: typedef-69.2</a>
                       </em>
                     </p>
                   </td>
@@ -122746,13 +120624,8 @@ <h3>15.15. The complex type <code>siri:WillWaitStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-57.4">
-          <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-57.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-14.4">
-          <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-14.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-53.4">
+          <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-53.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -122772,11 +120645,7 @@ <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-57.4)</code>
-=======
-                      <code>  (typedef-14.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-53.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -122818,13 +120687,8 @@ <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-57.5">
-          <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-57.5)</code>
-=======
-        <div class="sect2" id="local-type.typedef-14.5">
-          <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-14.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-53.5">
+          <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-53.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -122844,11 +120708,7 @@ <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-57.5)</code>
-=======
-                      <code>  (typedef-14.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-53.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -122890,13 +120750,8 @@ <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.2">
-          <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-50.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.2">
-          <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.2">
+          <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-54.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -122916,11 +120771,7 @@ <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.2)</code>
-=======
-                      <code>  (typedef-18.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -123007,13 +120858,8 @@ <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.3">
-          <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-50.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.3">
-          <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.3">
+          <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-54.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -123033,11 +120879,7 @@ <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.3)</code>
-=======
-                      <code>  (typedef-18.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -123124,13 +120966,8 @@ <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.4">
-          <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-50.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.4">
-          <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.4">
+          <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-54.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -123150,11 +120987,7 @@ <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.4)</code>
-=======
-                      <code>  (typedef-18.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -123241,13 +121074,8 @@ <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-66.1">
-          <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/RecordedCalls#complexType (typedef-66.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-30.1">
-          <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/RecordedCalls#complexType (typedef-30.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-69.1">
+          <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/RecordedCalls#complexType (typedef-69.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -123267,11 +121095,7 @@ <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStruct
                       <br/>
                       <code>  /RecordedCalls #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-66.1)</code>
-=======
-                      <code>  (typedef-30.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-69.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -123314,13 +121138,8 @@ <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStruct
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-66.2">
-          <h3>15.22. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/EstimatedCalls#complexType (typedef-66.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-30.2">
-          <h3>15.22. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/EstimatedCalls#complexType (typedef-30.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-69.2">
+          <h3>15.22. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/EstimatedCalls#complexType (typedef-69.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -123340,11 +121159,7 @@ <h3>15.22. The complex type <code>complexType[siri:EstimatedVehicleJourneyStruct
                       <br/>
                       <code>  /EstimatedCalls #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-66.2)</code>
-=======
-                      <code>  (typedef-30.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-69.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -124110,11 +121925,7 @@ <h3>16.1. Simple type definitions</h3>
                         </tr>
                         <tr>
                           <td class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                            <p class="tableblock">tactilePatformEdges</p>
-=======
                             <p class="tableblock">tactilePlatformEdges</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                           </td>
                           <td class="tableblock halign-left valign-top">
                             <p class="tableblock anno-text">-</p>
@@ -124168,8 +121979,6 @@ <h3>16.1. Simple type definitions</h3>
                             <p class="tableblock anno-text">-</p>
                           </td>
                         </tr>
-<<<<<<< HEAD
-=======
                         <tr>
                           <td class="tableblock halign-left valign-top">
                             <p class="tableblock">tactilePatformEdges</p>
@@ -124178,7 +121987,6 @@ <h3>16.1. Simple type definitions</h3>
                             <p class="tableblock anno-text">deprecated (SIRI 2.1) - use 'tactilePlatformEdges' instead</p>
                           </td>
                         </tr>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </tbody>
                     </table>
                   </td>
@@ -127975,7 +125783,7 @@ <h3>17.1. Simple type definitions</h3>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">xs:NMTOKEN: (empty restriction)</p>
+                    <p class="tableblock">xs:normalizedString: (empty restriction)</p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">Type for identifier of a Faclility.</p>
@@ -128513,11 +126321,7 @@ <h3>17.15. The group <code>siri:FacilityAccessibilityGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-59.2" title="local-type: typedef-59.2">local-type: typedef-59.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-9.2" title="local-type: typedef-9.2">local-type: typedef-9.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-52.2" title="local-type: typedef-52.2">local-type: typedef-52.2</a>
                       </em>
                     </p>
                   </td>
@@ -128538,11 +126342,7 @@ <h3>17.15. The group <code>siri:FacilityAccessibilityGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-59.3" title="local-type: typedef-59.3">local-type: typedef-59.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-9.3" title="local-type: typedef-9.3">local-type: typedef-9.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-52.3" title="local-type: typedef-52.3">local-type: typedef-52.3</a>
                       </em>
                     </p>
                   </td>
@@ -129239,11 +127039,7 @@ <h3>17.19. The complex type <code>siri:EquipmentAvailabilityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-59.6" title="local-type: typedef-59.6">local-type: typedef-59.6</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-9.6" title="local-type: typedef-9.6">local-type: typedef-9.6</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-52.6" title="local-type: typedef-52.6">local-type: typedef-52.6</a>
                       </em>
                     </p>
                   </td>
@@ -129527,11 +127323,7 @@ <h3>17.21. The complex type <code>siri:FacilityConditionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-59.5" title="local-type: typedef-59.5">local-type: typedef-59.5</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-9.5" title="local-type: typedef-9.5">local-type: typedef-9.5</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-52.5" title="local-type: typedef-52.5">local-type: typedef-52.5</a>
                       </em>
                     </p>
                   </td>
@@ -130065,8 +127857,6 @@ <h3>17.22. The complex type <code>siri:FacilityLocationStructure</code>
                   </td>
                 </tr>
                 <tr>
-<<<<<<< HEAD
-=======
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
                   </td>
@@ -130091,7 +127881,6 @@ <h3>17.22. The complex type <code>siri:FacilityLocationStructure</code>
                   </td>
                 </tr>
                 <tr>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   <td colspan="1" rowspan="3" class="tableblock halign-left valign-top">
                     <a shape="rect" href="#group.siri:BasicServiceInfoGroup" title="siri:BasicServiceInfoGroup">siri:BasicServiceInfoGroup</a>
                   </td>
@@ -130469,11 +128258,7 @@ <h3>17.25. The complex type <code>siri:FacilityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-9.1" title="local-type: typedef-9.1">local-type: typedef-9.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-52.1" title="local-type: typedef-52.1">local-type: typedef-52.1</a>
                       </em>
                     </p>
                   </td>
@@ -130593,11 +128378,7 @@ <h3>17.25. The complex type <code>siri:FacilityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-59.2" title="local-type: typedef-59.2">local-type: typedef-59.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-9.2" title="local-type: typedef-9.2">local-type: typedef-9.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-52.2" title="local-type: typedef-52.2">local-type: typedef-52.2</a>
                       </em>
                     </p>
                   </td>
@@ -130618,11 +128399,7 @@ <h3>17.25. The complex type <code>siri:FacilityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-59.3" title="local-type: typedef-59.3">local-type: typedef-59.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-9.3" title="local-type: typedef-9.3">local-type: typedef-9.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-52.3" title="local-type: typedef-52.3">local-type: typedef-52.3</a>
                       </em>
                     </p>
                   </td>
@@ -131033,11 +128810,7 @@ <h3>17.27. The complex type <code>siri:MonitoredCountingStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-59.4" title="local-type: typedef-59.4">local-type: typedef-59.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-9.4" title="local-type: typedef-9.4">local-type: typedef-9.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-52.4" title="local-type: typedef-52.4">local-type: typedef-52.4</a>
                       </em>
                     </p>
                   </td>
@@ -131544,13 +129317,8 @@ <h3>17.31. The complex type <code>siri:TypeOfVehicleFuelStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-59.2">
-          <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-59.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-9.2">
-          <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-9.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-52.2">
+          <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-52.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -131570,11 +129338,7 @@ <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
                       <br/>
                       <code>  /Limitations #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-59.2)</code>
-=======
-                      <code>  (typedef-9.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-52.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -131730,13 +129494,8 @@ <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-59.3">
-          <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-59.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-9.3">
-          <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-9.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-52.3">
+          <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-52.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -131756,11 +129515,7 @@ <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
                       <br/>
                       <code>  /Suitabilities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-59.3)</code>
-=======
-                      <code>  (typedef-9.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-52.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -131802,13 +129557,8 @@ <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-59.6">
-          <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructure]/EquipmentFeatures#complexType (typedef-59.6)</code>
-=======
-        <div class="sect2" id="local-type.typedef-9.6">
-          <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructure]/EquipmentFeatures#complexType (typedef-9.6)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-52.6">
+          <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructure]/EquipmentFeatures#complexType (typedef-52.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -131828,11 +129578,7 @@ <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructur
                       <br/>
                       <code>  /EquipmentFeatures #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-59.6)</code>
-=======
-                      <code>  (typedef-9.6)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-52.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -131874,13 +129620,8 @@ <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructur
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-59.5">
-          <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/MonitoredCounting#complexType (typedef-59.5)</code>
-=======
-        <div class="sect2" id="local-type.typedef-9.5">
-          <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/MonitoredCounting#complexType (typedef-9.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-52.5">
+          <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/MonitoredCounting#complexType (typedef-52.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -131900,11 +129641,7 @@ <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/M
                       <br/>
                       <code>  /MonitoredCounting #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-59.5)</code>
-=======
-                      <code>  (typedef-9.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-52.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -132160,11 +129897,7 @@ <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/M
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-59.4" title="local-type: typedef-59.4">local-type: typedef-59.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-9.4" title="local-type: typedef-9.4">local-type: typedef-9.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-52.4" title="local-type: typedef-52.4">local-type: typedef-52.4</a>
                       </em>
                     </p>
                   </td>
@@ -132201,13 +129934,8 @@ <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/M
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-59.4">
-          <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-59.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-9.4">
-          <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-9.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-52.4">
+          <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-52.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -132227,11 +129955,7 @@ <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/C
                       <br/>
                       <code>  /CountedItemsIdList #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-59.4)</code>
-=======
-                      <code>  (typedef-9.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-52.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -132274,13 +129998,8 @@ <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/C
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#complexType (typedef-59.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-9.1">
-          <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#complexType (typedef-9.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-52.1">
+          <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#complexType (typedef-52.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -132300,11 +130019,7 @@ <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#c
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-59.1)</code>
-=======
-                      <code>  (typedef-9.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-52.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -132346,13 +130061,8 @@ <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#c
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-59.2">
-          <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-59.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-9.2">
-          <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-9.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-52.2">
+          <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-52.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -132372,11 +130082,7 @@ <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
                       <br/>
                       <code>  /Limitations #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-59.2)</code>
-=======
-                      <code>  (typedef-9.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-52.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -132532,13 +130238,8 @@ <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-59.3">
-          <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-59.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-9.3">
-          <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-9.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-52.3">
+          <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-52.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -132558,11 +130259,7 @@ <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
                       <br/>
                       <code>  /Suitabilities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-59.3)</code>
-=======
-                      <code>  (typedef-9.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-52.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -132604,13 +130301,8 @@ <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-59.4">
-          <h3>17.40. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-59.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-9.4">
-          <h3>17.40. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-9.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-52.4">
+          <h3>17.40. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-52.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -132630,11 +130322,7 @@ <h3>17.40. The complex type <code>complexType[siri:MonitoredCountingStructure]/C
                       <br/>
                       <code>  /CountedItemsIdList #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-59.4)</code>
-=======
-                      <code>  (typedef-9.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-52.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -133417,11 +131105,7 @@ <h3>19.1. The complex type <code>siri:InterchangeJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -133442,11 +131126,7 @@ <h3>19.1. The complex type <code>siri:InterchangeJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -133467,11 +131147,7 @@ <h3>19.1. The complex type <code>siri:InterchangeJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -133556,11 +131232,7 @@ <h3>19.1. The complex type <code>siri:InterchangeJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -133581,11 +131253,7 @@ <h3>19.1. The complex type <code>siri:InterchangeJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -134122,20 +131790,12 @@ <h3>20.1. Simple type definitions</h3>
               <tbody>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p id="local-type.typedef-24.1" class="tableblock">
-=======
-                    <p id="local-type.typedef-1.1" class="tableblock">
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                    <p id="local-type.typedef-6.1" class="tableblock">
                       <code>attribute[lang]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-24.1)</code>
-=======
-                      <code>  (typedef-1.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-6.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -137472,11 +135132,7 @@ <h3>20.63. The group <code>siri:JourneyEndNamesGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -137497,11 +135153,7 @@ <h3>20.63. The group <code>siri:JourneyEndNamesGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -137522,11 +135174,7 @@ <h3>20.63. The group <code>siri:JourneyEndNamesGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -137611,11 +135259,7 @@ <h3>20.63. The group <code>siri:JourneyEndNamesGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -137636,11 +135280,7 @@ <h3>20.63. The group <code>siri:JourneyEndNamesGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -137812,11 +135452,7 @@ <h3>20.65. The group <code>siri:JourneyFormationGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.2" title="local-type: typedef-50.2">local-type: typedef-50.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.2" title="local-type: typedef-54.2">local-type: typedef-54.2</a>
                       </em>
                     </p>
                   </td>
@@ -137837,11 +135473,7 @@ <h3>20.65. The group <code>siri:JourneyFormationGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.3" title="local-type: typedef-50.3">local-type: typedef-50.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.3" title="local-type: typedef-54.3">local-type: typedef-54.3</a>
                       </em>
                     </p>
                   </td>
@@ -137862,11 +135494,7 @@ <h3>20.65. The group <code>siri:JourneyFormationGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.4" title="local-type: typedef-50.4">local-type: typedef-50.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.4" title="local-type: typedef-54.4">local-type: typedef-54.4</a>
                       </em>
                     </p>
                   </td>
@@ -138084,11 +135712,7 @@ <h3>20.67. The group <code>siri:JourneyRelationInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.1" title="local-type: typedef-50.1">local-type: typedef-50.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.1" title="local-type: typedef-18.1">local-type: typedef-18.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.1" title="local-type: typedef-54.1">local-type: typedef-54.1</a>
                       </em>
                     </p>
                   </td>
@@ -141666,11 +139290,7 @@ <h3>20.83. The group <code>siri:TrainGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.5" title="local-type: typedef-50.5">local-type: typedef-50.5</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.5" title="local-type: typedef-18.5">local-type: typedef-18.5</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.5" title="local-type: typedef-54.5">local-type: typedef-54.5</a>
                       </em>
                     </p>
                   </td>
@@ -141859,11 +139479,7 @@ <h3>20.84. The group <code>siri:TrainInCompoundTrainGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -141884,11 +139500,7 @@ <h3>20.84. The group <code>siri:TrainInCompoundTrainGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -141909,11 +139521,7 @@ <h3>20.84. The group <code>siri:TrainInCompoundTrainGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -141998,11 +139606,7 @@ <h3>20.84. The group <code>siri:TrainInCompoundTrainGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -142023,11 +139627,7 @@ <h3>20.84. The group <code>siri:TrainInCompoundTrainGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -142071,11 +139671,7 @@ <h3>20.84. The group <code>siri:TrainInCompoundTrainGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.7" title="local-type: typedef-50.7">local-type: typedef-50.7</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.7" title="local-type: typedef-18.7">local-type: typedef-18.7</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.7" title="local-type: typedef-54.7">local-type: typedef-54.7</a>
                       </em>
                     </p>
                   </td>
@@ -142683,11 +140279,7 @@ <h3>20.89. The group <code>siri:VehicleJourneyInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -142708,11 +140300,7 @@ <h3>20.89. The group <code>siri:VehicleJourneyInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -142733,11 +140321,7 @@ <h3>20.89. The group <code>siri:VehicleJourneyInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -142822,11 +140406,7 @@ <h3>20.89. The group <code>siri:VehicleJourneyInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -142847,11 +140427,7 @@ <h3>20.89. The group <code>siri:VehicleJourneyInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -143248,11 +140824,7 @@ <h3>20.90. The group <code>siri:VehicleTypeGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.9" title="local-type: typedef-50.9">local-type: typedef-50.9</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.9" title="local-type: typedef-54.9">local-type: typedef-54.9</a>
                       </em>
                     </p>
                   </td>
@@ -143430,11 +141002,7 @@ <h3>20.90. The group <code>siri:VehicleTypeGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.8" title="local-type: typedef-50.8">local-type: typedef-50.8</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.8" title="local-type: typedef-18.8">local-type: typedef-18.8</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.8" title="local-type: typedef-54.8">local-type: typedef-54.8</a>
                       </em>
                     </p>
                   </td>
@@ -143571,11 +141139,7 @@ <h3>20.91. The group <code>siri:VehicleTypePropertiesGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.9" title="local-type: typedef-50.9">local-type: typedef-50.9</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.9" title="local-type: typedef-54.9">local-type: typedef-54.9</a>
                       </em>
                     </p>
                   </td>
@@ -144225,11 +141789,7 @@ <h3>20.94. The complex type <code>siri:CompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.9" title="local-type: typedef-50.9">local-type: typedef-50.9</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.9" title="local-type: typedef-54.9">local-type: typedef-54.9</a>
                       </em>
                     </p>
                   </td>
@@ -144407,11 +141967,7 @@ <h3>20.94. The complex type <code>siri:CompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.8" title="local-type: typedef-50.8">local-type: typedef-50.8</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.8" title="local-type: typedef-18.8">local-type: typedef-18.8</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.8" title="local-type: typedef-54.8">local-type: typedef-54.8</a>
                       </em>
                     </p>
                   </td>
@@ -144435,11 +141991,7 @@ <h3>20.94. The complex type <code>siri:CompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.6" title="local-type: typedef-50.6">local-type: typedef-50.6</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.6" title="local-type: typedef-18.6">local-type: typedef-18.6</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.6" title="local-type: typedef-54.6">local-type: typedef-54.6</a>
                       </em>
                     </p>
                   </td>
@@ -145600,11 +143152,7 @@ <h3>20.102. The complex type <code>siri:JourneyRelationStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.1" title="local-type: typedef-50.1">local-type: typedef-50.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.1" title="local-type: typedef-18.1">local-type: typedef-18.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.1" title="local-type: typedef-54.1">local-type: typedef-54.1</a>
                       </em>
                     </p>
                   </td>
@@ -148623,11 +146171,7 @@ <h3>20.113. The complex type <code>siri:RelatedJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.1" title="local-type: typedef-50.1">local-type: typedef-50.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.1" title="local-type: typedef-18.1">local-type: typedef-18.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.1" title="local-type: typedef-54.1">local-type: typedef-54.1</a>
                       </em>
                     </p>
                   </td>
@@ -148639,8 +146183,208 @@ <h3>20.113. The complex type <code>siri:RelatedJourneyStructure</code>
             </table>
           </div>
         </div>
+        <div class="sect2" id="type.siri:ServiceLinkViewsStructure">
+          <h3>20.114. The complex type <code>siri:ServiceLinkViewsStructure</code>
+          </h3>
+          <div class="sectionbody">
+            <table class="tableblock frame-all grid-all spread">
+              <colgroup span="1">
+                <col span="1" style="width:11.9047619047619%"/>
+                <col span="1" style="width:1.19047619047619%"/>
+                <col span="1" style="width:11.9047619047619%"/>
+                <col span="1" style="width:1.19047619047619%"/>
+                <col span="1" style="width:23.8095238095238%"/>
+                <col span="1" style="width:35.7142857142857%"/>
+              </colgroup>
+              <tbody>
+                <tr>
+                  <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>siri:ServiceLinkViewsStructure</code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"/>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock anno-text">Provides information about updated SERVICE LINKs</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>
+                        <strong>siri:ServiceLinkView</strong>
+                      </code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>
+                        <strong title="mandatory, at least one">1:*</strong>
+                      </code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>+<a shape="rect" href="#type.siri:ServiceLinkViewStructure" title="siri:ServiceLinkViewStructure">siri:ServiceLinkViewStructure</a>
+                      </em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown"/>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+        <div class="sect2" id="type.siri:ServiceLinkViewStructure">
+          <h3>20.115. The complex type <code>siri:ServiceLinkViewStructure</code>
+          </h3>
+          <div class="sectionbody">
+            <table class="tableblock frame-all grid-all spread">
+              <colgroup span="1">
+                <col span="1" style="width:11.9047619047619%"/>
+                <col span="1" style="width:1.19047619047619%"/>
+                <col span="1" style="width:11.9047619047619%"/>
+                <col span="1" style="width:1.19047619047619%"/>
+                <col span="1" style="width:23.8095238095238%"/>
+                <col span="1" style="width:35.7142857142857%"/>
+              </colgroup>
+              <tbody>
+                <tr>
+                  <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>siri:ServiceLinkViewStructure</code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"/>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock anno-text">Simplified description of an update of a SERVICE LINK, in order to provide an updated schematic shape (not ROUTE POINTs) in case of rerouting. Only updated ServiceLink are expected to be provided here, the scheduled one being provided by a NeTEx feed. The SERVICE JOURNEY itself is knonw from hte context</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>
+                        <strong>siri:FromStopPointRef</strong>
+                      </code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>
+                        <strong title="mandatory, single">1:1</strong>
+                      </code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>&gt;<a shape="rect" href="#type.siri:StopPointRefStructure" title="siri:StopPointRefStructure">siri:StopPointRefStructure</a>
+                      </em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Reference to the SCHEDULED STOP POINT at which the related SERVICE LINK begins.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>
+                        <strong>siri:ToStopPointRef</strong>
+                      </code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>
+                        <strong title="mandatory, single">1:1</strong>
+                      </code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>&gt;<a shape="rect" href="#type.siri:StopPointRefStructure" title="siri:StopPointRefStructure">siri:StopPointRefStructure</a>
+                      </em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Reference to the SCHEDULED STOP POINT at which the related SERVICE LINK ends.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>siri:Distance</code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <span title="optional, single">0:1</span>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>
+                        <a shape="rect" href="#type.siri:LengthType" title="siri:LengthType">siri:LengthType</a>
+                      </em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Length of LINK.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>
+                        <strong>→‍<a shape="rect" href="gml.html#element.gml:LineString" title="gml:LineString">gml:LineString</a>
+                        </strong>
+                      </code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>
+                        <strong title="mandatory, single">1:1</strong>
+                      </code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>+<a shape="rect" href="gml.html#type.gml:LineStringType" title="gml:LineStringType">gml:LineStringType</a>
+                      </em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">A LineString is a special curve that consists of a single segment with linear interpolation. It is defined by two or more coordinate tuples, with linear interpolation between them. The number of direct positions in the list shall be at least two.</p>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
         <div class="sect2" id="type.siri:SimpleContactStructure">
-          <h3>20.114. The complex type <code>siri:SimpleContactStructure</code>
+          <h3>20.116. The complex type <code>siri:SimpleContactStructure</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -148719,7 +146463,7 @@ <h3>20.114. The complex type <code>siri:SimpleContactStructure</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:StopAssignmentStructure">
-          <h3>20.115. The complex type <code>siri:StopAssignmentStructure</code>
+          <h3>20.117. The complex type <code>siri:StopAssignmentStructure</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149296,7 +147040,7 @@ <h3>20.115. The complex type <code>siri:StopAssignmentStructure</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:TrainComponentStructure">
-          <h3>20.116. The complex type <code>siri:TrainComponentStructure</code>
+          <h3>20.118. The complex type <code>siri:TrainComponentStructure</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149511,7 +147255,7 @@ <h3>20.116. The complex type <code>siri:TrainComponentStructure</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:TrainElementStructure">
-          <h3>20.117. The complex type <code>siri:TrainElementStructure</code>
+          <h3>20.119. The complex type <code>siri:TrainElementStructure</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149818,11 +147562,7 @@ <h3>20.117. The complex type <code>siri:TrainElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.9" title="local-type: typedef-50.9">local-type: typedef-50.9</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.9" title="local-type: typedef-54.9">local-type: typedef-54.9</a>
                       </em>
                     </p>
                   </td>
@@ -150000,11 +147740,7 @@ <h3>20.117. The complex type <code>siri:TrainElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.8" title="local-type: typedef-50.8">local-type: typedef-50.8</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.8" title="local-type: typedef-18.8">local-type: typedef-18.8</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.8" title="local-type: typedef-54.8">local-type: typedef-54.8</a>
                       </em>
                     </p>
                   </td>
@@ -150017,7 +147753,7 @@ <h3>20.117. The complex type <code>siri:TrainElementStructure</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:TrainInCompoundTrainStructure">
-          <h3>20.118. The complex type <code>siri:TrainInCompoundTrainStructure</code>
+          <h3>20.120. The complex type <code>siri:TrainInCompoundTrainStructure</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150245,11 +147981,7 @@ <h3>20.118. The complex type <code>siri:TrainInCompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -150270,11 +148002,7 @@ <h3>20.118. The complex type <code>siri:TrainInCompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -150295,11 +148023,7 @@ <h3>20.118. The complex type <code>siri:TrainInCompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -150384,11 +148108,7 @@ <h3>20.118. The complex type <code>siri:TrainInCompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -150409,11 +148129,7 @@ <h3>20.118. The complex type <code>siri:TrainInCompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -150457,11 +148173,7 @@ <h3>20.118. The complex type <code>siri:TrainInCompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.7" title="local-type: typedef-50.7">local-type: typedef-50.7</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.7" title="local-type: typedef-18.7">local-type: typedef-18.7</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.7" title="local-type: typedef-54.7">local-type: typedef-54.7</a>
                       </em>
                     </p>
                   </td>
@@ -150474,7 +148186,7 @@ <h3>20.118. The complex type <code>siri:TrainInCompoundTrainStructure</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:TrainStructure">
-          <h3>20.119. The complex type <code>siri:TrainStructure</code>
+          <h3>20.121. The complex type <code>siri:TrainStructure</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150709,11 +148421,7 @@ <h3>20.119. The complex type <code>siri:TrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.9" title="local-type: typedef-50.9">local-type: typedef-50.9</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.9" title="local-type: typedef-54.9">local-type: typedef-54.9</a>
                       </em>
                     </p>
                   </td>
@@ -150891,11 +148599,7 @@ <h3>20.119. The complex type <code>siri:TrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.8" title="local-type: typedef-50.8">local-type: typedef-50.8</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.8" title="local-type: typedef-18.8">local-type: typedef-18.8</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.8" title="local-type: typedef-54.8">local-type: typedef-54.8</a>
                       </em>
                     </p>
                   </td>
@@ -150961,11 +148665,7 @@ <h3>20.119. The complex type <code>siri:TrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.5" title="local-type: typedef-50.5">local-type: typedef-50.5</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.5" title="local-type: typedef-18.5">local-type: typedef-18.5</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.5" title="local-type: typedef-54.5">local-type: typedef-54.5</a>
                       </em>
                     </p>
                   </td>
@@ -150978,7 +148678,7 @@ <h3>20.119. The complex type <code>siri:TrainStructure</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:VehicleInFormationStatusStructure">
-          <h3>20.120. The complex type <code>siri:VehicleInFormationStatusStructure</code>
+          <h3>20.122. The complex type <code>siri:VehicleInFormationStatusStructure</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151105,7 +148805,7 @@ <h3>20.120. The complex type <code>siri:VehicleInFormationStatusStructure</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:VehicleOccupancyStructure">
-          <h3>20.121. The complex type <code>siri:VehicleOccupancyStructure</code>
+          <h3>20.123. The complex type <code>siri:VehicleOccupancyStructure</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151615,7 +149315,7 @@ <h3>20.121. The complex type <code>siri:VehicleOccupancyStructure</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:VehicleOrientationRelativeToQuay">
-          <h3>20.122. The complex type <code>siri:VehicleOrientationRelativeToQuay</code>
+          <h3>20.124. The complex type <code>siri:VehicleOrientationRelativeToQuay</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151682,7 +149382,7 @@ <h3>20.122. The complex type <code>siri:VehicleOrientationRelativeToQuay</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:ViaNameStructure">
-          <h3>20.123. The complex type <code>siri:ViaNameStructure</code>
+          <h3>20.125. The complex type <code>siri:ViaNameStructure</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151819,13 +149519,8 @@ <h3>20.123. The complex type <code>siri:ViaNameStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.2">
-          <h3>20.124. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-50.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.2">
-          <h3>20.124. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.2">
+          <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-54.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151845,11 +149540,7 @@ <h3>20.124. The complex type <code>group[siri:JourneyFormationGroup]/TrainElemen
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.2)</code>
-=======
-                      <code>  (typedef-18.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -151936,13 +149627,8 @@ <h3>20.124. The complex type <code>group[siri:JourneyFormationGroup]/TrainElemen
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.3">
-          <h3>20.125. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-50.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.3">
-          <h3>20.125. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.3">
+          <h3>20.127. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-54.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151962,11 +149648,7 @@ <h3>20.125. The complex type <code>group[siri:JourneyFormationGroup]/Trains#comp
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.3)</code>
-=======
-                      <code>  (typedef-18.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -152053,13 +149735,8 @@ <h3>20.125. The complex type <code>group[siri:JourneyFormationGroup]/Trains#comp
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.4">
-          <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-50.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.4">
-          <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.4">
+          <h3>20.128. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-54.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -152079,11 +149756,7 @@ <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTra
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.4)</code>
-=======
-                      <code>  (typedef-18.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -152170,13 +149843,8 @@ <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTra
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.1">
-          <h3>20.127. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-50.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.1">
-          <h3>20.127. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-18.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.1">
+          <h3>20.129. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-54.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -152196,11 +149864,7 @@ <h3>20.127. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.1)</code>
-=======
-                      <code>  (typedef-18.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -152242,13 +149906,8 @@ <h3>20.127. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.5">
-          <h3>20.128. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-50.5)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.5">
-          <h3>20.128. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-18.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.5">
+          <h3>20.130. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-54.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -152268,11 +149927,7 @@ <h3>20.128. The complex type <code>group[siri:TrainGroup]/TrainComponents#comple
                       <br/>
                       <code>  /TrainComponents #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.5)</code>
-=======
-                      <code>  (typedef-18.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -152359,13 +150014,8 @@ <h3>20.128. The complex type <code>group[siri:TrainGroup]/TrainComponents#comple
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.7">
-          <h3>20.129. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-50.7)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.7">
-          <h3>20.129. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-18.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.7">
+          <h3>20.131. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-54.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -152385,11 +150035,7 @@ <h3>20.129. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
                       <br/>
                       <code>  /Passages #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.7)</code>
-=======
-                      <code>  (typedef-18.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -152431,13 +150077,8 @@ <h3>20.129. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.9">
-          <h3>20.130. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-50.9)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.9">
-          <h3>20.130. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.9">
+          <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-54.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -152457,11 +150098,7 @@ <h3>20.130. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.9)</code>
-=======
-                      <code>  (typedef-18.9)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -152503,13 +150140,8 @@ <h3>20.130. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.8">
-          <h3>20.131. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-50.8)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.8">
-          <h3>20.131. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.8">
+          <h3>20.133. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-54.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -152529,11 +150161,7 @@ <h3>20.131. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.8)</code>
-=======
-                      <code>  (typedef-18.8)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -152653,13 +150281,8 @@ <h3>20.131. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.9">
-          <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-50.9)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.9">
-          <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.9">
+          <h3>20.134. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-54.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -152679,11 +150302,7 @@ <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.9)</code>
-=======
-                      <code>  (typedef-18.9)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -152725,13 +150344,8 @@ <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.9">
-          <h3>20.133. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-50.9)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.9">
-          <h3>20.133. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.9">
+          <h3>20.135. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-54.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -152751,11 +150365,7 @@ <h3>20.133. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.9)</code>
-=======
-                      <code>  (typedef-18.9)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -152797,13 +150407,8 @@ <h3>20.133. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.8">
-          <h3>20.134. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-50.8)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.8">
-          <h3>20.134. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.8">
+          <h3>20.136. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-54.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -152823,11 +150428,7 @@ <h3>20.134. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.8)</code>
-=======
-                      <code>  (typedef-18.8)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -152947,13 +150548,8 @@ <h3>20.134. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.6">
-          <h3>20.135. The complex type <code>complexType[siri:CompoundTrainStructure]/TrainsInCompoundTrain#complexType (typedef-50.6)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.6">
-          <h3>20.135. The complex type <code>complexType[siri:CompoundTrainStructure]/TrainsInCompoundTrain#complexType (typedef-18.6)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.6">
+          <h3>20.137. The complex type <code>complexType[siri:CompoundTrainStructure]/TrainsInCompoundTrain#complexType (typedef-54.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -152973,11 +150569,7 @@ <h3>20.135. The complex type <code>complexType[siri:CompoundTrainStructure]/Trai
                       <br/>
                       <code>  /TrainsInCompoundTrain #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.6)</code>
-=======
-                      <code>  (typedef-18.6)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -153064,13 +150656,8 @@ <h3>20.135. The complex type <code>complexType[siri:CompoundTrainStructure]/Trai
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.1">
-          <h3>20.136. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-50.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.1">
-          <h3>20.136. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-18.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.1">
+          <h3>20.138. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-54.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -153090,11 +150677,7 @@ <h3>20.136. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.1)</code>
-=======
-                      <code>  (typedef-18.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -153136,13 +150719,8 @@ <h3>20.136. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.1">
-          <h3>20.137. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-50.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.1">
-          <h3>20.137. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-18.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.1">
+          <h3>20.139. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-54.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -153162,11 +150740,7 @@ <h3>20.137. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.1)</code>
-=======
-                      <code>  (typedef-18.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -153208,13 +150782,8 @@ <h3>20.137. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.9">
-          <h3>20.138. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-50.9)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.9">
-          <h3>20.138. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.9">
+          <h3>20.140. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-54.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -153234,11 +150803,7 @@ <h3>20.138. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.9)</code>
-=======
-                      <code>  (typedef-18.9)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -153280,13 +150845,8 @@ <h3>20.138. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.8">
-          <h3>20.139. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-50.8)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.8">
-          <h3>20.139. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.8">
+          <h3>20.141. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-54.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -153306,11 +150866,7 @@ <h3>20.139. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.8)</code>
-=======
-                      <code>  (typedef-18.8)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -153430,13 +150986,8 @@ <h3>20.139. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.7">
-          <h3>20.140. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-50.7)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.7">
-          <h3>20.140. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-18.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.7">
+          <h3>20.142. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-54.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -153456,11 +151007,7 @@ <h3>20.140. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
                       <br/>
                       <code>  /Passages #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.7)</code>
-=======
-                      <code>  (typedef-18.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -153502,13 +151049,8 @@ <h3>20.140. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.9">
-          <h3>20.141. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-50.9)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.9">
-          <h3>20.141. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.9">
+          <h3>20.143. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-54.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -153528,11 +151070,7 @@ <h3>20.141. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.9)</code>
-=======
-                      <code>  (typedef-18.9)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -153574,13 +151112,8 @@ <h3>20.141. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.8">
-          <h3>20.142. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-50.8)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.8">
-          <h3>20.142. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.8">
+          <h3>20.144. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-54.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -153600,11 +151133,7 @@ <h3>20.142. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.8)</code>
-=======
-                      <code>  (typedef-18.8)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -153724,13 +151253,8 @@ <h3>20.142. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.5">
-          <h3>20.143. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-50.5)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.5">
-          <h3>20.143. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-18.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.5">
+          <h3>20.145. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-54.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -153750,11 +151274,7 @@ <h3>20.143. The complex type <code>group[siri:TrainGroup]/TrainComponents#comple
                       <br/>
                       <code>  /TrainComponents #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.5)</code>
-=======
-                      <code>  (typedef-18.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -153898,6 +151418,14 @@ <h3>21.1. Simple type definitions</h3>
                             <p class="tableblock anno-text">-</p>
                           </td>
                         </tr>
+                        <tr>
+                          <td class="tableblock halign-left valign-top">
+                            <p class="tableblock">journeyRelationRestricted</p>
+                          </td>
+                          <td class="tableblock halign-left valign-top">
+                            <p class="tableblock anno-text">Restricts alighting so that it is only permitted when the passenger is interchanging to a journey explicitly referenced in a JourneyRelation.</p>
+                          </td>
+                        </tr>
                       </tbody>
                     </table>
                   </td>
@@ -153969,6 +151497,14 @@ <h3>21.1. Simple type definitions</h3>
                             <p class="tableblock anno-text">-</p>
                           </td>
                         </tr>
+                        <tr>
+                          <td class="tableblock halign-left valign-top">
+                            <p class="tableblock">journeyRelationRestricted</p>
+                          </td>
+                          <td class="tableblock halign-left valign-top">
+                            <p class="tableblock anno-text">Restricts boarding or alighting so that it is only permitted when the passenger is interchanging from/to a journey explicitly referenced in a JourneyRelation.</p>
+                          </td>
+                        </tr>
                       </tbody>
                     </table>
                   </td>
@@ -154123,7 +151659,7 @@ <h3>21.1. Simple type definitions</h3>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">xs:NMTOKEN: (empty restriction)</p>
+                    <p class="tableblock">xs:normalizedString: (empty restriction)</p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">Type for identifier of a Dated VEHICLE JOURNEY.</p>
@@ -154173,6 +151709,14 @@ <h3>21.1. Simple type definitions</h3>
                             <p class="tableblock anno-text">-</p>
                           </td>
                         </tr>
+                        <tr>
+                          <td class="tableblock halign-left valign-top">
+                            <p class="tableblock">journeyRelationRestricted</p>
+                          </td>
+                          <td class="tableblock halign-left valign-top">
+                            <p class="tableblock anno-text">Restricts boarding so that it is only permitted when the passenger is interchanging from a journey explicitly referenced in a JourneyRelation.</p>
+                          </td>
+                        </tr>
                       </tbody>
                     </table>
                   </td>
@@ -154201,7 +151745,7 @@ <h3>21.1. Simple type definitions</h3>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">xs:NMTOKEN: (empty restriction)</p>
+                    <p class="tableblock">xs:normalizedString: (empty restriction)</p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">Type for identifier of a Realtime VEHICLE JOURNEY. Used for adhoc journeys.</p>
@@ -154248,8 +151792,6 @@ <h3>21.1. Simple type definitions</h3>
                             <p class="tableblock">secondClass </p>
                           </td>
                           <td class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-=======
                             <p class="tableblock anno-text">pti23_7. -v.2.1</p>
                           </td>
                         </tr>
@@ -154258,7 +151800,6 @@ <h3>21.1. Simple type definitions</h3>
                             <p class="tableblock">secondClass</p>
                           </td>
                           <td class="tableblock halign-left valign-top">
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                             <p class="tableblock anno-text">pti23_7</p>
                           </td>
                         </tr>
@@ -154371,8 +151912,6 @@ <h3>21.1. Simple type definitions</h3>
                             <p class="tableblock">secondClass </p>
                           </td>
                           <td class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-=======
                             <p class="tableblock anno-text">pti23_7. -v.2.1</p>
                           </td>
                         </tr>
@@ -154381,7 +151920,6 @@ <h3>21.1. Simple type definitions</h3>
                             <p class="tableblock">secondClass</p>
                           </td>
                           <td class="tableblock halign-left valign-top">
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                             <p class="tableblock anno-text">pti23_7</p>
                           </td>
                         </tr>
@@ -155438,7 +152976,7 @@ <h3>21.1. Simple type definitions</h3>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">xs:NMTOKEN: (empty restriction)</p>
+                    <p class="tableblock">xs:normalizedString: (empty restriction)</p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">Type for identifier of a VEHICLE JOURNEY.</p>
@@ -157261,11 +154799,7 @@ <h3>21.64. The complex type <code>siri:FramedVehicleJourneyRefStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">identifier of data frame within particpant service. Used to ensure that the Reference to a DATED VEGICLE JOURNEY is unique with the data horizon of the service. Often the OperationalDayType is used for this purpose.</p>
-=======
                     <p class="tableblock darkbrown">Identifier of data frame within participant service. Used to ensure that the Reference to a DATED VEHICLE JOURNEY is unique with the data horizon of the service. Often the OPERATING DAY is used for this purpose.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -158897,11 +156431,7 @@ <h3>22.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-36.1" title="local-type: typedef-36.1">local-type: typedef-36.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-50.1" title="local-type: typedef-50.1">local-type: typedef-50.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
                       </em>
                     </p>
                   </td>
@@ -158935,11 +156465,7 @@ <h3>22.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-56.2" title="local-type: typedef-56.2">local-type: typedef-56.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-8.2" title="local-type: typedef-8.2">local-type: typedef-8.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-68.2" title="local-type: typedef-68.2">local-type: typedef-68.2</a>
                       </em>
                     </p>
                   </td>
@@ -158968,11 +156494,7 @@ <h3>22.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-56.1" title="local-type: typedef-56.1">local-type: typedef-56.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-8.1" title="local-type: typedef-8.1">local-type: typedef-8.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -159001,11 +156523,7 @@ <h3>22.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-56.3" title="local-type: typedef-56.3">local-type: typedef-56.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-8.3" title="local-type: typedef-8.3">local-type: typedef-8.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-68.3" title="local-type: typedef-68.3">local-type: typedef-68.3</a>
                       </em>
                     </p>
                   </td>
@@ -159557,13 +157075,8 @@ <h3>22.30. The complex type <code>siri:StopMonitorPermissionStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-56.3">
-          <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-56.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-8.3">
-          <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-8.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-68.3">
+          <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-68.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -159583,11 +157096,7 @@ <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-56.3)</code>
-=======
-                      <code>  (typedef-8.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-68.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -159672,13 +157181,8 @@ <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#comple
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-56.1">
-          <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-56.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-8.1">
-          <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-8.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-68.1">
+          <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-68.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -159698,11 +157202,7 @@ <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-56.1)</code>
-=======
-                      <code>  (typedef-8.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-68.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -159787,13 +157287,8 @@ <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-56.2">
-          <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-56.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-8.2">
-          <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-8.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-68.2">
+          <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-68.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -159813,11 +157308,7 @@ <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-56.2)</code>
-=======
-                      <code>  (typedef-8.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-68.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -159902,13 +157393,8 @@ <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-36.1">
-          <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-36.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-50.1">
-          <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-50.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-39.1">
+          <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-39.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -159928,11 +157414,7 @@ <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-36.1)</code>
-=======
-                      <code>  (typedef-50.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-39.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -160000,13 +157482,8 @@ <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-56.2">
-          <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-56.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-8.2">
-          <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-8.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-68.2">
+          <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-68.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -160026,11 +157503,7 @@ <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-56.2)</code>
-=======
-                      <code>  (typedef-8.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-68.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -160115,13 +157588,8 @@ <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-56.1">
-          <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typedef-56.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-8.1">
-          <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typedef-8.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-68.1">
+          <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typedef-68.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -160141,11 +157609,7 @@ <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-56.1)</code>
-=======
-                      <code>  (typedef-8.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-68.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -160230,13 +157694,8 @@ <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-56.3">
-          <h3>22.37. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-56.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-8.3">
-          <h3>22.37. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-8.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-68.3">
+          <h3>22.37. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-68.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -160256,11 +157715,7 @@ <h3>22.37. The complex type <code>element[siri:ConnectionLinkPermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-56.3)</code>
-=======
-                      <code>  (typedef-8.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-68.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -166473,11 +163928,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-57.6" title="local-type: typedef-57.6">local-type: typedef-57.6</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-14.6" title="local-type: typedef-14.6">local-type: typedef-14.6</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-53.6" title="local-type: typedef-53.6">local-type: typedef-53.6</a>
                       </em>
                     </p>
                   </td>
@@ -166498,11 +163949,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-57.7" title="local-type: typedef-57.7">local-type: typedef-57.7</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-14.7" title="local-type: typedef-14.7">local-type: typedef-14.7</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-53.7" title="local-type: typedef-53.7">local-type: typedef-53.7</a>
                       </em>
                     </p>
                   </td>
@@ -166526,11 +163973,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.2" title="local-type: typedef-50.2">local-type: typedef-50.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.2" title="local-type: typedef-54.2">local-type: typedef-54.2</a>
                       </em>
                     </p>
                   </td>
@@ -166551,11 +163994,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.3" title="local-type: typedef-50.3">local-type: typedef-50.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.3" title="local-type: typedef-54.3">local-type: typedef-54.3</a>
                       </em>
                     </p>
                   </td>
@@ -166576,11 +164015,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.4" title="local-type: typedef-50.4">local-type: typedef-50.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.4" title="local-type: typedef-54.4">local-type: typedef-54.4</a>
                       </em>
                     </p>
                   </td>
@@ -167022,11 +164457,7 @@ <h3>24.5. The group <code>siri:JourneyProgressGroup</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Velocity of VEHICLE. EIther actual speed or average speed may be used. (since SIRI 2.0)</p>
-=======
                     <p class="tableblock darkbrown">Velocity of VEHICLE. Either actual speed or average speed may be used. (since SIRI 2.0)</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -168989,11 +166420,7 @@ <h3>24.10. The group <code>siri:ProgressDataGroup</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Velocity of VEHICLE. EIther actual speed or average speed may be used. (since SIRI 2.0)</p>
-=======
                     <p class="tableblock darkbrown">Velocity of VEHICLE. Either actual speed or average speed may be used. (since SIRI 2.0)</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -169311,11 +166738,7 @@ <h3>24.12. The group <code>siri:ServicePointsGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-57.1" title="local-type: typedef-57.1">local-type: typedef-57.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-14.1" title="local-type: typedef-14.1">local-type: typedef-14.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-53.1" title="local-type: typedef-53.1">local-type: typedef-53.1</a>
                       </em>
                     </p>
                   </td>
@@ -169336,11 +166759,7 @@ <h3>24.12. The group <code>siri:ServicePointsGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-57.2" title="local-type: typedef-57.2">local-type: typedef-57.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-14.2" title="local-type: typedef-14.2">local-type: typedef-14.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-53.2" title="local-type: typedef-53.2">local-type: typedef-53.2</a>
                       </em>
                     </p>
                   </td>
@@ -169361,11 +166780,7 @@ <h3>24.12. The group <code>siri:ServicePointsGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-57.3" title="local-type: typedef-57.3">local-type: typedef-57.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-14.3" title="local-type: typedef-14.3">local-type: typedef-14.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-53.3" title="local-type: typedef-53.3">local-type: typedef-53.3</a>
                       </em>
                     </p>
                   </td>
@@ -170470,11 +167885,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-57.4" title="local-type: typedef-57.4">local-type: typedef-57.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-14.4" title="local-type: typedef-14.4">local-type: typedef-14.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-53.4" title="local-type: typedef-53.4">local-type: typedef-53.4</a>
                       </em>
                     </p>
                   </td>
@@ -170495,11 +167906,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-57.5" title="local-type: typedef-57.5">local-type: typedef-57.5</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-14.5" title="local-type: typedef-14.5">local-type: typedef-14.5</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-53.5" title="local-type: typedef-53.5">local-type: typedef-53.5</a>
                       </em>
                     </p>
                   </td>
@@ -170523,11 +167930,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.2" title="local-type: typedef-50.2">local-type: typedef-50.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.2" title="local-type: typedef-54.2">local-type: typedef-54.2</a>
                       </em>
                     </p>
                   </td>
@@ -170548,11 +167951,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.3" title="local-type: typedef-50.3">local-type: typedef-50.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.3" title="local-type: typedef-54.3">local-type: typedef-54.3</a>
                       </em>
                     </p>
                   </td>
@@ -170573,11 +167972,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.4" title="local-type: typedef-50.4">local-type: typedef-50.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.4" title="local-type: typedef-54.4">local-type: typedef-54.4</a>
                       </em>
                     </p>
                   </td>
@@ -172895,11 +170290,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -172920,11 +170311,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -172945,11 +170332,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -173034,11 +170417,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -173059,11 +170438,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -173636,11 +171011,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Velocity of VEHICLE. EIther actual speed or average speed may be used. (since SIRI 2.0)</p>
-=======
                     <p class="tableblock darkbrown">Velocity of VEHICLE. Either actual speed or average speed may be used. (since SIRI 2.0)</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -173944,11 +171315,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-57.4" title="local-type: typedef-57.4">local-type: typedef-57.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-14.4" title="local-type: typedef-14.4">local-type: typedef-14.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-53.4" title="local-type: typedef-53.4">local-type: typedef-53.4</a>
                       </em>
                     </p>
                   </td>
@@ -173969,11 +171336,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-57.5" title="local-type: typedef-57.5">local-type: typedef-57.5</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-14.5" title="local-type: typedef-14.5">local-type: typedef-14.5</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-53.5" title="local-type: typedef-53.5">local-type: typedef-53.5</a>
                       </em>
                     </p>
                   </td>
@@ -173997,11 +171360,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.2" title="local-type: typedef-50.2">local-type: typedef-50.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.2" title="local-type: typedef-54.2">local-type: typedef-54.2</a>
                       </em>
                     </p>
                   </td>
@@ -174022,11 +171381,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.3" title="local-type: typedef-50.3">local-type: typedef-50.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.3" title="local-type: typedef-54.3">local-type: typedef-54.3</a>
                       </em>
                     </p>
                   </td>
@@ -174047,11 +171402,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.4" title="local-type: typedef-50.4">local-type: typedef-50.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.4" title="local-type: typedef-54.4">local-type: typedef-54.4</a>
                       </em>
                     </p>
                   </td>
@@ -174713,13 +172064,8 @@ <h3>24.22. The complex type <code>siri:TrainBlockPartStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-57.6">
-          <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-57.6)</code>
-=======
-        <div class="sect2" id="local-type.typedef-14.6">
-          <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-14.6)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-53.6">
+          <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-53.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -174739,11 +172085,7 @@ <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-57.6)</code>
-=======
-                      <code>  (typedef-14.6)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-53.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -174785,13 +172127,8 @@ <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-57.7">
-          <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-57.7)</code>
-=======
-        <div class="sect2" id="local-type.typedef-14.7">
-          <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-14.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-53.7">
+          <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-53.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -174811,11 +172148,7 @@ <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-57.7)</code>
-=======
-                      <code>  (typedef-14.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-53.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -174857,13 +172190,8 @@ <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.2">
-          <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-50.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.2">
-          <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.2">
+          <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-54.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -174883,11 +172211,7 @@ <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.2)</code>
-=======
-                      <code>  (typedef-18.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -174974,13 +172298,8 @@ <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.3">
-          <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-50.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.3">
-          <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.3">
+          <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-54.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -175000,11 +172319,7 @@ <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.3)</code>
-=======
-                      <code>  (typedef-18.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -175091,13 +172406,8 @@ <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.4">
-          <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-50.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.4">
-          <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.4">
+          <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-54.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -175117,11 +172427,7 @@ <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.4)</code>
-=======
-                      <code>  (typedef-18.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -175208,13 +172514,8 @@ <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-57.1">
-          <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexType (typedef-57.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-14.1">
-          <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexType (typedef-14.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-53.1">
+          <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexType (typedef-53.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -175234,11 +172535,7 @@ <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexT
                       <br/>
                       <code>  /Origin #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-57.1)</code>
-=======
-                      <code>  (typedef-14.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-53.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -175302,13 +172599,8 @@ <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexT
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-57.2">
-          <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType (typedef-57.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-14.2">
-          <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType (typedef-14.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-53.2">
+          <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType (typedef-53.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -175328,11 +172620,7 @@ <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType
                       <br/>
                       <code>  /Via #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-57.2)</code>
-=======
-                      <code>  (typedef-14.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-53.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -175419,13 +172707,8 @@ <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-57.3">
-          <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#complexType (typedef-57.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-14.3">
-          <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#complexType (typedef-14.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-53.3">
+          <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#complexType (typedef-53.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -175445,11 +172728,7 @@ <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#com
                       <br/>
                       <code>  /Destination #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-57.3)</code>
-=======
-                      <code>  (typedef-14.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-53.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -175513,13 +172792,8 @@ <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#com
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-57.4">
-          <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-57.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-14.4">
-          <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-14.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-53.4">
+          <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-53.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -175539,11 +172813,7 @@ <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-57.4)</code>
-=======
-                      <code>  (typedef-14.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-53.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -175585,13 +172855,8 @@ <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-57.5">
-          <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-57.5)</code>
-=======
-        <div class="sect2" id="local-type.typedef-14.5">
-          <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-14.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-53.5">
+          <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-53.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -175611,11 +172876,7 @@ <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-57.5)</code>
-=======
-                      <code>  (typedef-14.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-53.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -175657,13 +172918,8 @@ <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.2">
-          <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-50.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.2">
-          <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.2">
+          <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-54.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -175683,11 +172939,7 @@ <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.2)</code>
-=======
-                      <code>  (typedef-18.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -175774,13 +173026,8 @@ <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.3">
-          <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-50.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.3">
-          <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.3">
+          <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-54.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -175800,11 +173047,7 @@ <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.3)</code>
-=======
-                      <code>  (typedef-18.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -175891,13 +173134,8 @@ <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.4">
-          <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-50.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.4">
-          <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.4">
+          <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-54.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -175917,11 +173155,7 @@ <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.4)</code>
-=======
-                      <code>  (typedef-18.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -176008,13 +173242,8 @@ <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-57.4">
-          <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-57.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-14.4">
-          <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-14.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-53.4">
+          <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-53.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -176034,11 +173263,7 @@ <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-57.4)</code>
-=======
-                      <code>  (typedef-14.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-53.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -176080,13 +173305,8 @@ <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-57.5">
-          <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-57.5)</code>
-=======
-        <div class="sect2" id="local-type.typedef-14.5">
-          <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-14.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-53.5">
+          <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-53.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -176106,11 +173326,7 @@ <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-57.5)</code>
-=======
-                      <code>  (typedef-14.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-53.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -176152,13 +173368,8 @@ <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.2">
-          <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-50.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.2">
-          <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.2">
+          <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-54.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -176178,11 +173389,7 @@ <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.2)</code>
-=======
-                      <code>  (typedef-18.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -176269,13 +173476,8 @@ <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.3">
-          <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-50.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.3">
-          <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.3">
+          <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-54.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -176295,11 +173497,7 @@ <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.3)</code>
-=======
-                      <code>  (typedef-18.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -176386,13 +173584,8 @@ <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.4">
-          <h3>24.40. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-50.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.4">
-          <h3>24.40. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.4">
+          <h3>24.40. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-54.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -176412,11 +173605,7 @@ <h3>24.40. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.4)</code>
-=======
-                      <code>  (typedef-18.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -176525,7 +173714,7 @@ <h3>25.1. Simple type definitions</h3>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">xs:NMTOKEN: (empty restriction)</p>
+                    <p class="tableblock">xs:normalizedString: (empty restriction)</p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">Type for identifier of an OPERATOR Code.</p>
@@ -176540,7 +173729,7 @@ <h3>25.1. Simple type definitions</h3>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">xs:NMTOKEN: (empty restriction)</p>
+                    <p class="tableblock">xs:normalizedString: (empty restriction)</p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">Type for identifier of an OrganisationCode.</p>
@@ -176873,7 +174062,7 @@ <h3>26.1. Simple type definitions</h3>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">xs:NMTOKEN: (empty restriction)</p>
+                    <p class="tableblock">xs:normalizedString: (empty restriction)</p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">Type for identifier of a DESTINATION.</p>
@@ -176978,7 +174167,7 @@ <h3>26.1. Simple type definitions</h3>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">xs:NMTOKEN: (empty restriction)</p>
+                    <p class="tableblock">xs:normalizedString: (empty restriction)</p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">Type for identifier of a LINE</p>
@@ -177195,7 +174384,7 @@ <h3>26.1. Simple type definitions</h3>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">xs:NMTOKEN: (empty restriction)</p>
+                    <p class="tableblock">xs:normalizedString: (empty restriction)</p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">Type for identifier of a SCHEDULED STOP POINT.</p>
@@ -177286,8 +174475,6 @@ <h3>26.1. Simple type definitions</h3>
                         </tr>
                         <tr>
                           <td class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-=======
                             <p class="tableblock">taxi</p>
                           </td>
                           <td class="tableblock halign-left valign-top">
@@ -177296,7 +174483,6 @@ <h3>26.1. Simple type definitions</h3>
                         </tr>
                         <tr>
                           <td class="tableblock halign-left valign-top">
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                             <p class="tableblock">tram</p>
                           </td>
                           <td class="tableblock halign-left valign-top">
@@ -179286,11 +176472,11 @@ <h3>26.64. The complex type <code>siri:JourneyPlaceRefStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <code>xs:NMTOKEN</code>
+                      <a shape="rect" href="#type.siri:IdType" title="siri:IdType">siri:IdType</a>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock anno-text">-</p>
+                    <p class="tableblock anno-text">Id type for document references.</p>
                   </td>
                 </tr>
               </tbody>
@@ -180596,11 +177782,7 @@ <h3>27.1. Simple type definitions</h3>
                     <p class="tableblock">xs:NMTOKEN: (empty restriction)</p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock anno-text">Type for Publication status.</p>
-=======
                     <p class="tableblock anno-text">DEPRECATED - Type for Publication status. -v2.1</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -181133,20 +178315,12 @@ <h3>27.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p id="local-type.typedef-60.3" class="tableblock">
-=======
-                    <p id="local-type.typedef-16.3" class="tableblock">
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                    <p id="local-type.typedef-47.3" class="tableblock">
                       <code>group[siri:ClassifierGroup]</code>
                       <br/>
                       <code>  /ScopeType #simpleType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.3)</code>
-=======
-                      <code>  (typedef-16.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.3)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -181327,20 +178501,12 @@ <h3>27.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p id="local-type.typedef-60.1" class="tableblock">
-=======
-                    <p id="local-type.typedef-16.1" class="tableblock">
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                    <p id="local-type.typedef-47.1" class="tableblock">
                       <code>group[siri:StatusGroup]</code>
                       <br/>
                       <code>  /Verification #simpleType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.1)</code>
-=======
-                      <code>  (typedef-16.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.1)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -181401,20 +178567,12 @@ <h3>27.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p id="local-type.typedef-24.1" class="tableblock">
-=======
-                    <p id="local-type.typedef-1.1" class="tableblock">
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                    <p id="local-type.typedef-6.1" class="tableblock">
                       <code>attribute[lang]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-24.1)</code>
-=======
-                      <code>  (typedef-1.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-6.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -181455,11 +178613,7 @@ <h3>27.14. The toplevel element <code>siri:PtSituationElement</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock">Type for individual IPT ncident.</p>
-=======
                     <p class="tableblock">Type for individual PT Incident.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
@@ -181493,11 +178647,7 @@ <h3>27.15. The toplevel element <code>siri:RoadSituationElement</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock">Type for individual IPT ncident.</p>
-=======
                     <p class="tableblock">Type for individual PT incident.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
@@ -182050,11 +179200,7 @@ <h3>27.16. The group <code>siri:ClassifierGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-<<<<<<< HEAD
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-60.3" title="local-type: typedef-60.3">local-type: typedef-60.3</a>
-=======
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-16.3" title="local-type: typedef-16.3">local-type: typedef-16.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-47.3" title="local-type: typedef-47.3">local-type: typedef-47.3</a>
                       </em>
                     </p>
                   </td>
@@ -182102,11 +179248,7 @@ <h3>27.16. The group <code>siri:ClassifierGroup</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Whether the SITUATION was planned (eg engineering works) or unplanned (eg service alteration). Default is 'false', i.e. unplanned.</p>
-=======
                     <p class="tableblock darkbrown">Whether the SITUATION was planned (e.g. engineering works) or unplanned (e.g. service alteration). Default is 'false', i.e. unplanned.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -182126,7 +179268,7 @@ <h3>27.16. The group <code>siri:ClassifierGroup</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Arbitrary application specific classifiers.</p>
+                    <p class="tableblock darkbrown">A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Can be overwritten in an individual action.</p>
                   </td>
                 </tr>
                 <tr>
@@ -182142,11 +179284,7 @@ <h3>27.16. The group <code>siri:ClassifierGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.4" title="local-type: typedef-60.4">local-type: typedef-60.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.4" title="local-type: typedef-16.4">local-type: typedef-16.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.4" title="local-type: typedef-47.4">local-type: typedef-47.4</a>
                       </em>
                     </p>
                   </td>
@@ -182311,11 +179449,7 @@ <h3>27.18. The group <code>siri:Datex2ManagementGroup</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">The date/time that the SITUATIONRecord object (the first version of the record) was created by the original supplier.</p>
-=======
                     <p class="tableblock darkbrown">The date/time that the SITUATION Record object (the first version of the record) was created by the original supplier.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -182381,11 +179515,7 @@ <h3>27.18. The group <code>siri:Datex2ManagementGroup</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">The date/time that this current version of the SITUATIONRecord was written into the database of the supplier which is involved in the data exchange.</p>
-=======
                     <p class="tableblock darkbrown">The date/time that this current version of the SITUATION Record was written into the database of the supplier which is involved in the data exchange.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -182539,11 +179669,7 @@ <h3>27.20. The group <code>siri:Datex2RoadGroup</code>
                     <p class="tableblock"/>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock anno-text">Datex2 Trrffic element road.</p>
-=======
                     <p class="tableblock anno-text">Datex2 Traffic element road.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -182824,11 +179950,7 @@ <h3>27.22. The group <code>siri:DescriptionGroup</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Summary of SITUATION. If absent should be generated from structure elements / and or by condensing Description. (Unbounded since SIRI 2.0)</p>
-=======
                     <p class="tableblock darkbrown">Summary of SITUATION. If absent should be generated from structure elements, and/or by condensing Description. (Unbounded since SIRI 2.0)</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -182928,11 +180050,7 @@ <h3>27.22. The group <code>siri:DescriptionGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.14" title="local-type: typedef-60.14">local-type: typedef-60.14</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.14" title="local-type: typedef-16.14">local-type: typedef-16.14</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.14" title="local-type: typedef-47.14">local-type: typedef-47.14</a>
                       </em>
                     </p>
                   </td>
@@ -182953,11 +180071,7 @@ <h3>27.22. The group <code>siri:DescriptionGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.16" title="local-type: typedef-60.16">local-type: typedef-60.16</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.16" title="local-type: typedef-16.16">local-type: typedef-16.16</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.16" title="local-type: typedef-47.16">local-type: typedef-47.16</a>
                       </em>
                     </p>
                   </td>
@@ -183110,11 +180224,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-<<<<<<< HEAD
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-60.1" title="local-type: typedef-60.1">local-type: typedef-60.1</a>
-=======
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-16.1" title="local-type: typedef-16.1">local-type: typedef-16.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-47.1" title="local-type: typedef-47.1">local-type: typedef-47.1</a>
                       </em>
                     </p>
                   </td>
@@ -183229,11 +180339,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Publishing status one of a specified set of substates to which a SITUATION can be assigned.</p>
-=======
                     <p class="tableblock darkbrown">DEPRECATED - Use the element Progress instead, which provides an enumeration of possible values detailed in WorkflowStatusEnumeration. Publishing status one of a specified set of substates to which a SITUATION can be assigned. -v2.1</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -183277,20 +180383,12 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.2" title="local-type: typedef-60.2">local-type: typedef-60.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.2" title="local-type: typedef-16.2">local-type: typedef-16.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.2" title="local-type: typedef-47.2">local-type: typedef-47.2</a>
                       </em>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">situation applies only on the repeated day types within the overall validity period(s). For example Sunday.</p>
-=======
                     <p class="tableblock darkbrown">Situation applies only on the repeated day types within the overall validity period(s). For example, Sunday.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -183833,11 +180931,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-<<<<<<< HEAD
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-60.3" title="local-type: typedef-60.3">local-type: typedef-60.3</a>
-=======
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-16.3" title="local-type: typedef-16.3">local-type: typedef-16.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-47.3" title="local-type: typedef-47.3">local-type: typedef-47.3</a>
                       </em>
                     </p>
                   </td>
@@ -183885,11 +180979,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Whether the SITUATION was planned (eg engineering works) or unplanned (eg service alteration). Default is 'false', i.e. unplanned.</p>
-=======
                     <p class="tableblock darkbrown">Whether the SITUATION was planned (e.g. engineering works) or unplanned (e.g. service alteration). Default is 'false', i.e. unplanned.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -183909,7 +180999,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Arbitrary application specific classifiers.</p>
+                    <p class="tableblock darkbrown">A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Can be overwritten in an individual action.</p>
                   </td>
                 </tr>
                 <tr>
@@ -183925,11 +181015,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.4" title="local-type: typedef-60.4">local-type: typedef-60.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.4" title="local-type: typedef-16.4">local-type: typedef-16.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.4" title="local-type: typedef-47.4">local-type: typedef-47.4</a>
                       </em>
                     </p>
                   </td>
@@ -183978,11 +181064,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Summary of SITUATION. If absent should be generated from structure elements / and or by condensing Description. (Unbounded since SIRI 2.0)</p>
-=======
                     <p class="tableblock darkbrown">Summary of SITUATION. If absent should be generated from structure elements, and/or by condensing Description. (Unbounded since SIRI 2.0)</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -184082,11 +181164,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.14" title="local-type: typedef-60.14">local-type: typedef-60.14</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.14" title="local-type: typedef-16.14">local-type: typedef-16.14</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.14" title="local-type: typedef-47.14">local-type: typedef-47.14</a>
                       </em>
                     </p>
                   </td>
@@ -184107,11 +181185,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.16" title="local-type: typedef-60.16">local-type: typedef-60.16</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.16" title="local-type: typedef-16.16">local-type: typedef-16.16</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.16" title="local-type: typedef-47.16">local-type: typedef-47.16</a>
                       </em>
                     </p>
                   </td>
@@ -184797,11 +181871,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-<<<<<<< HEAD
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-60.1" title="local-type: typedef-60.1">local-type: typedef-60.1</a>
-=======
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-16.1" title="local-type: typedef-16.1">local-type: typedef-16.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-47.1" title="local-type: typedef-47.1">local-type: typedef-47.1</a>
                       </em>
                     </p>
                   </td>
@@ -184916,11 +181986,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Publishing status one of a specified set of substates to which a SITUATION can be assigned.</p>
-=======
                     <p class="tableblock darkbrown">DEPRECATED - Use the element Progress instead, which provides an enumeration of possible values detailed in WorkflowStatusEnumeration. Publishing status one of a specified set of substates to which a SITUATION can be assigned. -v2.1</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -184964,20 +182030,12 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.2" title="local-type: typedef-60.2">local-type: typedef-60.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.2" title="local-type: typedef-16.2">local-type: typedef-16.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.2" title="local-type: typedef-47.2">local-type: typedef-47.2</a>
                       </em>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">situation applies only on the repeated day types within the overall validity period(s). For example Sunday.</p>
-=======
                     <p class="tableblock darkbrown">Situation applies only on the repeated day types within the overall validity period(s). For example, Sunday.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -185520,11 +182578,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-<<<<<<< HEAD
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-60.3" title="local-type: typedef-60.3">local-type: typedef-60.3</a>
-=======
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-16.3" title="local-type: typedef-16.3">local-type: typedef-16.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-47.3" title="local-type: typedef-47.3">local-type: typedef-47.3</a>
                       </em>
                     </p>
                   </td>
@@ -185572,11 +182626,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Whether the SITUATION was planned (eg engineering works) or unplanned (eg service alteration). Default is 'false', i.e. unplanned.</p>
-=======
                     <p class="tableblock darkbrown">Whether the SITUATION was planned (e.g. engineering works) or unplanned (e.g. service alteration). Default is 'false', i.e. unplanned.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -185596,7 +182646,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Arbitrary application specific classifiers.</p>
+                    <p class="tableblock darkbrown">A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Can be overwritten in an individual action.</p>
                   </td>
                 </tr>
                 <tr>
@@ -185612,11 +182662,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.4" title="local-type: typedef-60.4">local-type: typedef-60.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.4" title="local-type: typedef-16.4">local-type: typedef-16.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.4" title="local-type: typedef-47.4">local-type: typedef-47.4</a>
                       </em>
                     </p>
                   </td>
@@ -185665,11 +182711,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Summary of SITUATION. If absent should be generated from structure elements / and or by condensing Description. (Unbounded since SIRI 2.0)</p>
-=======
                     <p class="tableblock darkbrown">Summary of SITUATION. If absent should be generated from structure elements, and/or by condensing Description. (Unbounded since SIRI 2.0)</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -185769,11 +182811,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.14" title="local-type: typedef-60.14">local-type: typedef-60.14</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.14" title="local-type: typedef-16.14">local-type: typedef-16.14</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.14" title="local-type: typedef-47.14">local-type: typedef-47.14</a>
                       </em>
                     </p>
                   </td>
@@ -185794,11 +182832,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.16" title="local-type: typedef-60.16">local-type: typedef-60.16</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.16" title="local-type: typedef-16.16">local-type: typedef-16.16</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.16" title="local-type: typedef-47.16">local-type: typedef-47.16</a>
                       </em>
                     </p>
                   </td>
@@ -186161,11 +183195,7 @@ <h3>27.30. The group <code>siri:StatusGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-<<<<<<< HEAD
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-60.1" title="local-type: typedef-60.1">local-type: typedef-60.1</a>
-=======
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-16.1" title="local-type: typedef-16.1">local-type: typedef-16.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-47.1" title="local-type: typedef-47.1">local-type: typedef-47.1</a>
                       </em>
                     </p>
                   </td>
@@ -186280,11 +183310,7 @@ <h3>27.30. The group <code>siri:StatusGroup</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Publishing status one of a specified set of substates to which a SITUATION can be assigned.</p>
-=======
                     <p class="tableblock darkbrown">DEPRECATED - Use the element Progress instead, which provides an enumeration of possible values detailed in WorkflowStatusEnumeration. Publishing status one of a specified set of substates to which a SITUATION can be assigned. -v2.1</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
@@ -186359,20 +183385,12 @@ <h3>27.31. The group <code>siri:TemporalGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.2" title="local-type: typedef-60.2">local-type: typedef-60.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.2" title="local-type: typedef-16.2">local-type: typedef-16.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.2" title="local-type: typedef-47.2">local-type: typedef-47.2</a>
                       </em>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">situation applies only on the repeated day types within the overall validity period(s). For example Sunday.</p>
-=======
                     <p class="tableblock darkbrown">Situation applies only on the repeated day types within the overall validity period(s). For example, Sunday.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -186698,11 +183716,7 @@ <h3>27.34. The complex type <code>siri:AffectedRoadStructure</code>
                     <p class="tableblock"/>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock anno-text">Type for Raod scope for scope of SITUATION or effect.</p>
-=======
                     <p class="tableblock anno-text">Type for Road scope for scope of SITUATION or effect.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -186726,11 +183740,7 @@ <h3>27.34. The complex type <code>siri:AffectedRoadStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Affected Road as described by a Date2x location.</p>
-=======
                     <p class="tableblock darkbrown">Affected Road as described by a Datex 2 location.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -186875,20 +183885,12 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.6" title="local-type: typedef-60.6">local-type: typedef-60.6</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.6" title="local-type: typedef-16.6">local-type: typedef-16.6</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.6" title="local-type: typedef-47.6">local-type: typedef-47.6</a>
                       </em>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Affected OPERATORs, If absent, taken from context. If present, any OPERATORs stated completely replace those from context.</p>
-=======
                     <p class="tableblock darkbrown">Affected OPERATORs. If absent, taken from context. If present, any OPERATORs stated completely replace those from context.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -186907,11 +183909,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.7" title="local-type: typedef-60.7">local-type: typedef-60.7</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.7" title="local-type: typedef-16.7">local-type: typedef-16.7</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.7" title="local-type: typedef-47.7">local-type: typedef-47.7</a>
                       </em>
                     </p>
                   </td>
@@ -186935,11 +183933,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.9" title="local-type: typedef-60.9">local-type: typedef-60.9</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.9" title="local-type: typedef-16.9">local-type: typedef-16.9</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.9" title="local-type: typedef-47.9">local-type: typedef-47.9</a>
                       </em>
                     </p>
                   </td>
@@ -186963,11 +183957,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.10" title="local-type: typedef-60.10">local-type: typedef-60.10</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.10" title="local-type: typedef-16.10">local-type: typedef-16.10</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.10" title="local-type: typedef-47.10">local-type: typedef-47.10</a>
                       </em>
                     </p>
                   </td>
@@ -186991,11 +183981,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.11" title="local-type: typedef-60.11">local-type: typedef-60.11</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.11" title="local-type: typedef-16.11">local-type: typedef-16.11</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.11" title="local-type: typedef-47.11">local-type: typedef-47.11</a>
                       </em>
                     </p>
                   </td>
@@ -187019,11 +184005,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.12" title="local-type: typedef-60.12">local-type: typedef-60.12</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.12" title="local-type: typedef-16.12">local-type: typedef-16.12</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.12" title="local-type: typedef-47.12">local-type: typedef-47.12</a>
                       </em>
                     </p>
                   </td>
@@ -187047,11 +184029,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.13" title="local-type: typedef-60.13">local-type: typedef-60.13</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.13" title="local-type: typedef-16.13">local-type: typedef-16.13</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.13" title="local-type: typedef-47.13">local-type: typedef-47.13</a>
                       </em>
                     </p>
                   </td>
@@ -187524,11 +184502,7 @@ <h3>27.40. The complex type <code>siri:EasementsStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Ticket restriction conditiosn in effect. TPEG pti table pti25.</p>
-=======
                     <p class="tableblock darkbrown">Ticket restriction conditions in effect. TPEG pti table pti25.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -187575,11 +184549,7 @@ <h3>27.40. The complex type <code>siri:EasementsStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Refernce to a fare exceptions code that is allowed because of the disruption. An easement may relax a fare condition, for exampel "You may use your metro ticket on the bus', or 'You may use your bus ticket in teh metro between these two stops'.</p>
-=======
                     <p class="tableblock darkbrown">Refernce to a fare exceptions code that is allowed because of the disruption. An easement may relax a fare condition, for example "You may use your metro ticket on the bus', or 'You may use your bus ticket in teh metro between these two stops'.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
@@ -187866,11 +184836,7 @@ <h3>27.43. The complex type <code>siri:OptionalTrafficElementStructure</code>
                     <p class="tableblock"/>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock anno-text">An event which is not planned by the traffic OPERATOR, which is affecting, or has the potential to affect traffic flow. This SIRI-SX element embeds the Datex2 TrafficElement, making all elements optional because they may alternatvielky be specified by common SIRI-SRX SITUATION elements.</p>
-=======
                     <p class="tableblock anno-text">An event which is not planned by the traffic OPERATOR, which is affecting, or has the potential to affect traffic flow. This SIRI-SX element embeds the Datex 2 TrafficElement, making all elements optional because they may alternatvielky be specified by common SIRI-SRX SITUATION elements.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -187921,11 +184887,7 @@ <h3>27.43. The complex type <code>siri:OptionalTrafficElementStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">The date/time that the SITUATIONRecord object (the first version of the record) was created by the original supplier.</p>
-=======
                     <p class="tableblock darkbrown">The date/time that the SITUATION Record object (the first version of the record) was created by the original supplier.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -187991,11 +184953,7 @@ <h3>27.43. The complex type <code>siri:OptionalTrafficElementStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">The date/time that this current version of the SITUATIONRecord was written into the database of the supplier which is involved in the data exchange.</p>
-=======
                     <p class="tableblock darkbrown">The date/time that this current version of the SITUATION Record was written into the database of the supplier which is involved in the data exchange.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -188619,11 +185577,7 @@ <h3>27.46. The complex type <code>siri:PtConsequenceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.17" title="local-type: typedef-60.17">local-type: typedef-60.17</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.17" title="local-type: typedef-16.17">local-type: typedef-16.17</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.17" title="local-type: typedef-47.17">local-type: typedef-47.17</a>
                       </em>
                     </p>
                   </td>
@@ -188724,11 +185678,7 @@ <h3>27.46. The complex type <code>siri:PtConsequenceStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown"/>
-=======
                     <p class="tableblock darkbrown">Information on delays.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -188779,6 +185729,30 @@ <h3>27.46. The complex type <code>siri:PtConsequenceStructure</code>
                     <p class="tableblock darkbrown">Description of fare exceptions allowed because of disruption.</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>siri:UpdatedServiceLinks</code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <span title="optional, single">0:1</span>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>+<a shape="rect" href="#type.siri:ServiceLinkViewsStructure" title="siri:ServiceLinkViewsStructure">siri:ServiceLinkViewsStructure</a>
+                      </em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">List of SERVICE LINKs having updated shapes in that journey. This is only to provide updated the shapes of the journey (as gml:linestring), not to provide additional SERVICE LINK (provided through the sequence of CALLS)</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
@@ -189100,11 +186074,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-<<<<<<< HEAD
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-60.1" title="local-type: typedef-60.1">local-type: typedef-60.1</a>
-=======
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-16.1" title="local-type: typedef-16.1">local-type: typedef-16.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-47.1" title="local-type: typedef-47.1">local-type: typedef-47.1</a>
                       </em>
                     </p>
                   </td>
@@ -189219,11 +186189,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Publishing status one of a specified set of substates to which a SITUATION can be assigned.</p>
-=======
                     <p class="tableblock darkbrown">DEPRECATED - Use the element Progress instead, which provides an enumeration of possible values detailed in WorkflowStatusEnumeration. Publishing status one of a specified set of substates to which a SITUATION can be assigned. -v2.1</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -189267,20 +186233,12 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.2" title="local-type: typedef-60.2">local-type: typedef-60.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.2" title="local-type: typedef-16.2">local-type: typedef-16.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.2" title="local-type: typedef-47.2">local-type: typedef-47.2</a>
                       </em>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">situation applies only on the repeated day types within the overall validity period(s). For example Sunday.</p>
-=======
                     <p class="tableblock darkbrown">Situation applies only on the repeated day types within the overall validity period(s). For example, Sunday.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -189823,11 +186781,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-<<<<<<< HEAD
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-60.3" title="local-type: typedef-60.3">local-type: typedef-60.3</a>
-=======
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-16.3" title="local-type: typedef-16.3">local-type: typedef-16.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-47.3" title="local-type: typedef-47.3">local-type: typedef-47.3</a>
                       </em>
                     </p>
                   </td>
@@ -189875,11 +186829,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Whether the SITUATION was planned (eg engineering works) or unplanned (eg service alteration). Default is 'false', i.e. unplanned.</p>
-=======
                     <p class="tableblock darkbrown">Whether the SITUATION was planned (e.g. engineering works) or unplanned (e.g. service alteration). Default is 'false', i.e. unplanned.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -189899,7 +186849,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Arbitrary application specific classifiers.</p>
+                    <p class="tableblock darkbrown">A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Can be overwritten in an individual action.</p>
                   </td>
                 </tr>
                 <tr>
@@ -189915,11 +186865,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.4" title="local-type: typedef-60.4">local-type: typedef-60.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.4" title="local-type: typedef-16.4">local-type: typedef-16.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.4" title="local-type: typedef-47.4">local-type: typedef-47.4</a>
                       </em>
                     </p>
                   </td>
@@ -189968,11 +186914,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Summary of SITUATION. If absent should be generated from structure elements / and or by condensing Description. (Unbounded since SIRI 2.0)</p>
-=======
                     <p class="tableblock darkbrown">Summary of SITUATION. If absent should be generated from structure elements, and/or by condensing Description. (Unbounded since SIRI 2.0)</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -190072,11 +187014,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.14" title="local-type: typedef-60.14">local-type: typedef-60.14</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.14" title="local-type: typedef-16.14">local-type: typedef-16.14</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.14" title="local-type: typedef-47.14">local-type: typedef-47.14</a>
                       </em>
                     </p>
                   </td>
@@ -190097,11 +187035,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.16" title="local-type: typedef-60.16">local-type: typedef-60.16</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.16" title="local-type: typedef-16.16">local-type: typedef-16.16</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.16" title="local-type: typedef-47.16">local-type: typedef-47.16</a>
                       </em>
                     </p>
                   </td>
@@ -190823,11 +187757,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-<<<<<<< HEAD
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-60.1" title="local-type: typedef-60.1">local-type: typedef-60.1</a>
-=======
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-16.1" title="local-type: typedef-16.1">local-type: typedef-16.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-47.1" title="local-type: typedef-47.1">local-type: typedef-47.1</a>
                       </em>
                     </p>
                   </td>
@@ -190942,11 +187872,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Publishing status one of a specified set of substates to which a SITUATION can be assigned.</p>
-=======
                     <p class="tableblock darkbrown">DEPRECATED - Use the element Progress instead, which provides an enumeration of possible values detailed in WorkflowStatusEnumeration. Publishing status one of a specified set of substates to which a SITUATION can be assigned. -v2.1</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -190990,20 +187916,12 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.2" title="local-type: typedef-60.2">local-type: typedef-60.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.2" title="local-type: typedef-16.2">local-type: typedef-16.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.2" title="local-type: typedef-47.2">local-type: typedef-47.2</a>
                       </em>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">situation applies only on the repeated day types within the overall validity period(s). For example Sunday.</p>
-=======
                     <p class="tableblock darkbrown">Situation applies only on the repeated day types within the overall validity period(s). For example, Sunday.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -191546,11 +188464,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-<<<<<<< HEAD
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-60.3" title="local-type: typedef-60.3">local-type: typedef-60.3</a>
-=======
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-16.3" title="local-type: typedef-16.3">local-type: typedef-16.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-47.3" title="local-type: typedef-47.3">local-type: typedef-47.3</a>
                       </em>
                     </p>
                   </td>
@@ -191598,11 +188512,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Whether the SITUATION was planned (eg engineering works) or unplanned (eg service alteration). Default is 'false', i.e. unplanned.</p>
-=======
                     <p class="tableblock darkbrown">Whether the SITUATION was planned (e.g. engineering works) or unplanned (e.g. service alteration). Default is 'false', i.e. unplanned.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -191622,7 +188532,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Arbitrary application specific classifiers.</p>
+                    <p class="tableblock darkbrown">A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Can be overwritten in an individual action.</p>
                   </td>
                 </tr>
                 <tr>
@@ -191638,11 +188548,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.4" title="local-type: typedef-60.4">local-type: typedef-60.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.4" title="local-type: typedef-16.4">local-type: typedef-16.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.4" title="local-type: typedef-47.4">local-type: typedef-47.4</a>
                       </em>
                     </p>
                   </td>
@@ -191691,11 +188597,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Summary of SITUATION. If absent should be generated from structure elements / and or by condensing Description. (Unbounded since SIRI 2.0)</p>
-=======
                     <p class="tableblock darkbrown">Summary of SITUATION. If absent should be generated from structure elements, and/or by condensing Description. (Unbounded since SIRI 2.0)</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -191795,11 +188697,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.14" title="local-type: typedef-60.14">local-type: typedef-60.14</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.14" title="local-type: typedef-16.14">local-type: typedef-16.14</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.14" title="local-type: typedef-47.14">local-type: typedef-47.14</a>
                       </em>
                     </p>
                   </td>
@@ -191820,11 +188718,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.16" title="local-type: typedef-60.16">local-type: typedef-60.16</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.16" title="local-type: typedef-16.16">local-type: typedef-16.16</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.16" title="local-type: typedef-47.16">local-type: typedef-47.16</a>
                       </em>
                     </p>
                   </td>
@@ -192485,11 +189379,7 @@ <h3>27.52. The complex type <code>siri:SituationSourceStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Name of for source.</p>
-=======
                     <p class="tableblock darkbrown">Name of Source.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -192613,13 +189503,8 @@ <h3>27.52. The complex type <code>siri:SituationSourceStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.4">
-          <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-60.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.4">
-          <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-16.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.4">
+          <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-47.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192639,11 +189524,7 @@ <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.4)</code>
-=======
-                      <code>  (typedef-16.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192673,11 +189554,7 @@ <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.5" title="local-type: typedef-60.5">local-type: typedef-60.5</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.5" title="local-type: typedef-16.5">local-type: typedef-16.5</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.5" title="local-type: typedef-47.5">local-type: typedef-47.5</a>
                       </em>
                     </p>
                   </td>
@@ -192689,13 +189566,8 @@ <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.5">
-          <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-60.5)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.5">
-          <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-16.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.5">
+          <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-47.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192715,11 +189587,7 @@ <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.5)</code>
-=======
-                      <code>  (typedef-16.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193148,13 +190016,8 @@ <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.14">
-          <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-60.14)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.14">
-          <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-16.14)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.14">
+          <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-47.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193174,11 +190037,7 @@ <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.14)</code>
-=======
-                      <code>  (typedef-16.14)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193208,11 +190067,7 @@ <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.15" title="local-type: typedef-60.15">local-type: typedef-60.15</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.15" title="local-type: typedef-16.15">local-type: typedef-16.15</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.15" title="local-type: typedef-47.15">local-type: typedef-47.15</a>
                       </em>
                     </p>
                   </td>
@@ -193224,13 +190079,8 @@ <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.15">
-          <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-60.15)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.15">
-          <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-16.15)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.15">
+          <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-47.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193250,11 +190100,7 @@ <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.15)</code>
-=======
-                      <code>  (typedef-16.15)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193369,13 +190215,8 @@ <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.16">
-          <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-60.16)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.16">
-          <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-16.16)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.16">
+          <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-47.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193395,11 +190236,7 @@ <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.16)</code>
-=======
-                      <code>  (typedef-16.16)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193441,13 +190278,8 @@ <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.2">
-          <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-60.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.2">
-          <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-16.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.2">
+          <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-47.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193467,11 +190299,7 @@ <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.2)</code>
-=======
-                      <code>  (typedef-16.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193515,13 +190343,8 @@ <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.4">
-          <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-60.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.4">
-          <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-16.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.4">
+          <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-47.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193541,11 +190364,7 @@ <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.4)</code>
-=======
-                      <code>  (typedef-16.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193575,11 +190394,7 @@ <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.5" title="local-type: typedef-60.5">local-type: typedef-60.5</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.5" title="local-type: typedef-16.5">local-type: typedef-16.5</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.5" title="local-type: typedef-47.5">local-type: typedef-47.5</a>
                       </em>
                     </p>
                   </td>
@@ -193591,13 +190406,8 @@ <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.5">
-          <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-60.5)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.5">
-          <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-16.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.5">
+          <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-47.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193617,11 +190427,7 @@ <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.5)</code>
-=======
-                      <code>  (typedef-16.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194050,13 +190856,8 @@ <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.14">
-          <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-60.14)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.14">
-          <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-16.14)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.14">
+          <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-47.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194076,11 +190877,7 @@ <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.14)</code>
-=======
-                      <code>  (typedef-16.14)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194110,11 +190907,7 @@ <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.15" title="local-type: typedef-60.15">local-type: typedef-60.15</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.15" title="local-type: typedef-16.15">local-type: typedef-16.15</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.15" title="local-type: typedef-47.15">local-type: typedef-47.15</a>
                       </em>
                     </p>
                   </td>
@@ -194126,13 +190919,8 @@ <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.15">
-          <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-60.15)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.15">
-          <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-16.15)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.15">
+          <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-47.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194152,11 +190940,7 @@ <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.15)</code>
-=======
-                      <code>  (typedef-16.15)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194271,13 +191055,8 @@ <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.16">
-          <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-60.16)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.16">
-          <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-16.16)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.16">
+          <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-47.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194297,11 +191076,7 @@ <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.16)</code>
-=======
-                      <code>  (typedef-16.16)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194343,13 +191118,8 @@ <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.2">
-          <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-60.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.2">
-          <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-16.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.2">
+          <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-47.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194369,11 +191139,7 @@ <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.2)</code>
-=======
-                      <code>  (typedef-16.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194417,13 +191183,8 @@ <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.4">
-          <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-60.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.4">
-          <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-16.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.4">
+          <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-47.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194443,11 +191204,7 @@ <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.4)</code>
-=======
-                      <code>  (typedef-16.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194477,11 +191234,7 @@ <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.5" title="local-type: typedef-60.5">local-type: typedef-60.5</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.5" title="local-type: typedef-16.5">local-type: typedef-16.5</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.5" title="local-type: typedef-47.5">local-type: typedef-47.5</a>
                       </em>
                     </p>
                   </td>
@@ -194493,13 +191246,8 @@ <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.5">
-          <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-60.5)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.5">
-          <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-16.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.5">
+          <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-47.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194519,11 +191267,7 @@ <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.5)</code>
-=======
-                      <code>  (typedef-16.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194952,13 +191696,8 @@ <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.14">
-          <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-60.14)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.14">
-          <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-16.14)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.14">
+          <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-47.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194978,11 +191717,7 @@ <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.14)</code>
-=======
-                      <code>  (typedef-16.14)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -195012,11 +191747,7 @@ <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.15" title="local-type: typedef-60.15">local-type: typedef-60.15</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.15" title="local-type: typedef-16.15">local-type: typedef-16.15</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.15" title="local-type: typedef-47.15">local-type: typedef-47.15</a>
                       </em>
                     </p>
                   </td>
@@ -195028,13 +191759,8 @@ <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.15">
-          <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-60.15)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.15">
-          <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-16.15)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.15">
+          <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-47.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -195054,11 +191780,7 @@ <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.15)</code>
-=======
-                      <code>  (typedef-16.15)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -195173,13 +191895,8 @@ <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.16">
-          <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-60.16)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.16">
-          <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-16.16)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.16">
+          <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-47.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -195199,11 +191916,7 @@ <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.16)</code>
-=======
-                      <code>  (typedef-16.16)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -195245,13 +191958,8 @@ <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.2">
-          <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-60.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.2">
-          <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-16.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.2">
+          <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-47.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -195271,11 +191979,7 @@ <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.2)</code>
-=======
-                      <code>  (typedef-16.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -195319,13 +192023,8 @@ <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.6">
-          <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operators#complexType (typedef-60.6)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.6">
-          <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operators#complexType (typedef-16.6)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.6">
+          <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operators#complexType (typedef-47.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -195345,11 +192044,7 @@ <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operat
                       <br/>
                       <code>  /Operators #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.6)</code>
-=======
-                      <code>  (typedef-16.6)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -195395,11 +192090,7 @@ <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operat
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">All OPERATORs.</p>
-=======
                     <p class="tableblock darkbrown">All OPERATORs. DEPRECATED since SIRI 2.1</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -195439,13 +192130,8 @@ <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operat
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.7">
-          <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks#complexType (typedef-60.7)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.7">
-          <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks#complexType (typedef-16.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.7">
+          <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks#complexType (typedef-47.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -195465,11 +192151,7 @@ <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
                       <br/>
                       <code>  /Networks #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.7)</code>
-=======
-                      <code>  (typedef-16.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -195499,11 +192181,7 @@ <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.8" title="local-type: typedef-60.8">local-type: typedef-60.8</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.8" title="local-type: typedef-16.8">local-type: typedef-16.8</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.8" title="local-type: typedef-47.8">local-type: typedef-47.8</a>
                       </em>
                     </p>
                   </td>
@@ -195515,13 +192193,8 @@ <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.8">
-          <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks/AffectedNetwork#complexType (typedef-60.8)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.8">
-          <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks/AffectedNetwork#complexType (typedef-16.8)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.8">
+          <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks/AffectedNetwork#complexType (typedef-47.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -195541,11 +192214,7 @@ <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
                       <br/>
                       <code>  /Networks/AffectedNetwork #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.8)</code>
-=======
-                      <code>  (typedef-16.8)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -195583,11 +192252,7 @@ <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Operators of LINEs affected by incident. Overrides any value specified for (i) General Context.</p>
-=======
                     <p class="tableblock darkbrown">Operators of LINEs affected by incident. Overrides any value specified for (i) General Context. DEPRECATED since SIRI 2.1</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -196013,11 +192678,7 @@ <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">All LINEs in the network are affected.</p>
-=======
                     <p class="tableblock darkbrown">All LINEs in the network are affected. DEPRECATED since SIRI 2.1</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -196148,13 +192809,8 @@ <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.9">
-          <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPoints#complexType (typedef-60.9)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.9">
-          <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPoints#complexType (typedef-16.9)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.9">
+          <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPoints#complexType (typedef-47.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -196174,11 +192830,7 @@ <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPo
                       <br/>
                       <code>  /StopPoints #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.9)</code>
-=======
-                      <code>  (typedef-16.9)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -196220,13 +192872,8 @@ <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPo
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.10">
-          <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPlaces#complexType (typedef-60.10)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.10">
-          <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPlaces#complexType (typedef-16.10)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.10">
+          <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPlaces#complexType (typedef-47.10)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -196246,11 +192893,7 @@ <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPl
                       <br/>
                       <code>  /StopPlaces #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.10)</code>
-=======
-                      <code>  (typedef-16.10)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.10)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -196292,13 +192935,8 @@ <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPl
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.11">
-          <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places#complexType (typedef-60.11)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.11">
-          <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places#complexType (typedef-16.11)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.11">
+          <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places#complexType (typedef-47.11)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -196318,11 +192956,7 @@ <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places
                       <br/>
                       <code>  /Places #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.11)</code>
-=======
-                      <code>  (typedef-16.11)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.11)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -196364,13 +192998,8 @@ <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.12">
-          <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/VehicleJourneys#complexType (typedef-60.12)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.12">
-          <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/VehicleJourneys#complexType (typedef-16.12)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.12">
+          <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/VehicleJourneys#complexType (typedef-47.12)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -196390,11 +193019,7 @@ <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
                       <br/>
                       <code>  /VehicleJourneys #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.12)</code>
-=======
-                      <code>  (typedef-16.12)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.12)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -196436,13 +193061,8 @@ <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.13">
-          <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicles#complexType (typedef-60.13)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.13">
-          <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicles#complexType (typedef-16.13)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.13">
+          <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicles#complexType (typedef-47.13)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -196462,11 +193082,7 @@ <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
                       <br/>
                       <code>  /Vehicles #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.13)</code>
-=======
-                      <code>  (typedef-16.13)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.13)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -196508,13 +193124,8 @@ <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.17">
-          <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suitabilities#complexType (typedef-60.17)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.17">
-          <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suitabilities#complexType (typedef-16.17)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.17">
+          <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suitabilities#complexType (typedef-47.17)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -196534,11 +193145,7 @@ <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suita
                       <br/>
                       <code>  /Suitabilities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.17)</code>
-=======
-                      <code>  (typedef-16.17)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.17)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -196580,13 +193187,8 @@ <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suita
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.2">
-          <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-60.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.2">
-          <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-16.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.2">
+          <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-47.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -196606,11 +193208,7 @@ <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.2)</code>
-=======
-                      <code>  (typedef-16.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -196654,13 +193252,8 @@ <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.4">
-          <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-60.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.4">
-          <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-16.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.4">
+          <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-47.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -196680,11 +193273,7 @@ <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.4)</code>
-=======
-                      <code>  (typedef-16.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -196714,11 +193303,7 @@ <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.5" title="local-type: typedef-60.5">local-type: typedef-60.5</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.5" title="local-type: typedef-16.5">local-type: typedef-16.5</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.5" title="local-type: typedef-47.5">local-type: typedef-47.5</a>
                       </em>
                     </p>
                   </td>
@@ -196730,13 +193315,8 @@ <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.5">
-          <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-60.5)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.5">
-          <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-16.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.5">
+          <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-47.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -196756,11 +193336,7 @@ <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.5)</code>
-=======
-                      <code>  (typedef-16.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -197189,13 +193765,8 @@ <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.14">
-          <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-60.14)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.14">
-          <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-16.14)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.14">
+          <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-47.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -197215,11 +193786,7 @@ <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.14)</code>
-=======
-                      <code>  (typedef-16.14)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -197249,11 +193816,7 @@ <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.15" title="local-type: typedef-60.15">local-type: typedef-60.15</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.15" title="local-type: typedef-16.15">local-type: typedef-16.15</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.15" title="local-type: typedef-47.15">local-type: typedef-47.15</a>
                       </em>
                     </p>
                   </td>
@@ -197265,13 +193828,8 @@ <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.15">
-          <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-60.15)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.15">
-          <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-16.15)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.15">
+          <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-47.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -197291,11 +193849,7 @@ <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.15)</code>
-=======
-                      <code>  (typedef-16.15)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -197410,13 +193964,8 @@ <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.16">
-          <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-60.16)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.16">
-          <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-16.16)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.16">
+          <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-47.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -197436,11 +193985,7 @@ <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.16)</code>
-=======
-                      <code>  (typedef-16.16)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -197482,13 +194027,8 @@ <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.2">
-          <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-60.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.2">
-          <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-16.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.2">
+          <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-47.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -197508,11 +194048,7 @@ <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.2)</code>
-=======
-                      <code>  (typedef-16.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -197556,13 +194092,8 @@ <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.4">
-          <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-60.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.4">
-          <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-16.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.4">
+          <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-47.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -197582,11 +194113,7 @@ <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.4)</code>
-=======
-                      <code>  (typedef-16.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -197616,11 +194143,7 @@ <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.5" title="local-type: typedef-60.5">local-type: typedef-60.5</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.5" title="local-type: typedef-16.5">local-type: typedef-16.5</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.5" title="local-type: typedef-47.5">local-type: typedef-47.5</a>
                       </em>
                     </p>
                   </td>
@@ -197632,13 +194155,8 @@ <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.5">
-          <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-60.5)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.5">
-          <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-16.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.5">
+          <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-47.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -197658,11 +194176,7 @@ <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.5)</code>
-=======
-                      <code>  (typedef-16.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -198091,13 +194605,8 @@ <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.14">
-          <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-60.14)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.14">
-          <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-16.14)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.14">
+          <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-47.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -198117,11 +194626,7 @@ <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.14)</code>
-=======
-                      <code>  (typedef-16.14)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -198151,11 +194656,7 @@ <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-60.15" title="local-type: typedef-60.15">local-type: typedef-60.15</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-16.15" title="local-type: typedef-16.15">local-type: typedef-16.15</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-47.15" title="local-type: typedef-47.15">local-type: typedef-47.15</a>
                       </em>
                     </p>
                   </td>
@@ -198167,13 +194668,8 @@ <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.15">
-          <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-60.15)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.15">
-          <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-16.15)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.15">
+          <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-47.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -198193,11 +194689,7 @@ <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.15)</code>
-=======
-                      <code>  (typedef-16.15)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -198312,13 +194804,8 @@ <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-60.16">
-          <h3>27.91. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-60.16)</code>
-=======
-        <div class="sect2" id="local-type.typedef-16.16">
-          <h3>27.91. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-16.16)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-47.16">
+          <h3>27.91. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-47.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -198338,11 +194825,7 @@ <h3>27.91. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-60.16)</code>
-=======
-                      <code>  (typedef-16.16)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-47.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -198470,7 +194953,7 @@ <h3>28.1. Simple type definitions</h3>
                             <p class="tableblock">general</p>
                           </td>
                           <td class="tableblock halign-left valign-top">
-                            <p class="tableblock anno-text">-</p>
+                            <p class="tableblock anno-text">DEPRECATED since SIRI 2.3, use anywhere instead. -v2.3</p>
                           </td>
                         </tr>
                         <tr>
@@ -198478,7 +194961,7 @@ <h3>28.1. Simple type definitions</h3>
                             <p class="tableblock">stopPoint</p>
                           </td>
                           <td class="tableblock halign-left valign-top">
-                            <p class="tableblock anno-text">-</p>
+                            <p class="tableblock anno-text">DEPRECATED since SIRI 2.3, use atStopPoint instead. -v2.3</p>
                           </td>
                         </tr>
                         <tr>
@@ -198486,7 +194969,39 @@ <h3>28.1. Simple type definitions</h3>
                             <p class="tableblock">vehicleJourney</p>
                           </td>
                           <td class="tableblock halign-left valign-top">
-                            <p class="tableblock anno-text">-</p>
+                            <p class="tableblock anno-text">DEPRECATED since SIRI 2.3, use onBoardVehicle instead. -v2.3</p>
+                          </td>
+                        </tr>
+                        <tr>
+                          <td class="tableblock halign-left valign-top">
+                            <p class="tableblock">anywhere</p>
+                          </td>
+                          <td class="tableblock halign-left valign-top">
+                            <p class="tableblock anno-text">Bird's eye perspective; e.g., passenger looks at an overview of situations on a network map. +v2.3</p>
+                          </td>
+                        </tr>
+                        <tr>
+                          <td class="tableblock halign-left valign-top">
+                            <p class="tableblock">atStopPoint</p>
+                          </td>
+                          <td class="tableblock halign-left valign-top">
+                            <p class="tableblock anno-text">From the passengers' perpective at a specific stop; e.g., at a display on a platform during interchange. +v2.3</p>
+                          </td>
+                        </tr>
+                        <tr>
+                          <td class="tableblock halign-left valign-top">
+                            <p class="tableblock">onBoardVehicle</p>
+                          </td>
+                          <td class="tableblock halign-left valign-top">
+                            <p class="tableblock anno-text">From the passengers' perspective while on board a specific vehicle; e.g., at an onboard display while moving in a vehicle. +v2.3</p>
+                          </td>
+                        </tr>
+                        <tr>
+                          <td class="tableblock halign-left valign-top">
+                            <p class="tableblock">whilePlanningTrip</p>
+                          </td>
+                          <td class="tableblock halign-left valign-top">
+                            <p class="tableblock anno-text">From the passengers' perspective while plannig a trip; e.g., while using a trip search application on a smartphone. +v2.3</p>
                           </td>
                         </tr>
                       </tbody>
@@ -198580,6 +195095,29 @@ <h3>28.4. The toplevel element <code>siri:ManualAction</code>
                     <p class="tableblock darkbrown">Description of action.</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>siri:Keywords</code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <span title="optional, single">0:1</span>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>xs:NMTOKENS</em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
@@ -199126,11 +195664,7 @@ <h3>28.15. The group <code>siri:ActionsGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-54.3" title="local-type: typedef-54.3">local-type: typedef-54.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-12.3" title="local-type: typedef-12.3">local-type: typedef-12.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-62.3" title="local-type: typedef-62.3">local-type: typedef-62.3</a>
                       </em>
                     </p>
                   </td>
@@ -199263,16 +195797,12 @@ <h3>28.16. The complex type <code>siri:ActionDataStructure</code>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <code>
-                        <strong>siri:Name</strong>
-                      </code>
+                      <code>siri:Name</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <code>
-                        <strong title="mandatory, single">1:1</strong>
-                      </code>
+                      <span title="optional, single">0:1</span>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -199317,16 +195847,12 @@ <h3>28.16. The complex type <code>siri:ActionDataStructure</code>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <code>
-                        <strong>siri:Value</strong>
-                      </code>
+                      <code>siri:Value</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <code>
-                        <strong title="mandatory, at least one">1:*</strong>
-                      </code>
+                      <span title="optional, multiple">0:*</span>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -199378,11 +195904,7 @@ <h3>28.16. The complex type <code>siri:ActionDataStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-54.2" title="local-type: typedef-54.2">local-type: typedef-54.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-12.2" title="local-type: typedef-12.2">local-type: typedef-12.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-62.2" title="local-type: typedef-62.2">local-type: typedef-62.2</a>
                       </em>
                     </p>
                   </td>
@@ -199548,11 +196070,7 @@ <h3>28.17. The complex type <code>siri:ActionsStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-54.3" title="local-type: typedef-54.3">local-type: typedef-54.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-12.3" title="local-type: typedef-12.3">local-type: typedef-12.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-62.3" title="local-type: typedef-62.3">local-type: typedef-62.3</a>
                       </em>
                     </p>
                   </td>
@@ -200005,6 +196523,29 @@ <h3>28.21. The complex type <code>siri:ManualActionStructure</code>
                     <p class="tableblock darkbrown">Description of action.</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>siri:Keywords</code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <span title="optional, single">0:1</span>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>xs:NMTOKENS</em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
@@ -200140,6 +196681,29 @@ <h3>28.22. The complex type <code>siri:NotifyByEmailActionStructure</code>
                     <p class="tableblock darkbrown">Description of action.</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>siri:Keywords</code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <span title="optional, single">0:1</span>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>xs:NMTOKENS</em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
@@ -200204,11 +196768,7 @@ <h3>28.22. The complex type <code>siri:NotifyByEmailActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-54.1" title="local-type: typedef-54.1">local-type: typedef-54.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-12.1" title="local-type: typedef-12.1">local-type: typedef-12.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-62.1" title="local-type: typedef-62.1">local-type: typedef-62.1</a>
                       </em>
                     </p>
                   </td>
@@ -200356,6 +196916,29 @@ <h3>28.23. The complex type <code>siri:NotifyByPagerActionStructure</code>
                     <p class="tableblock darkbrown">Description of action.</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>siri:Keywords</code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <span title="optional, single">0:1</span>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>xs:NMTOKENS</em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
@@ -200420,11 +197003,7 @@ <h3>28.23. The complex type <code>siri:NotifyByPagerActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-54.1" title="local-type: typedef-54.1">local-type: typedef-54.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-12.1" title="local-type: typedef-12.1">local-type: typedef-12.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-62.1" title="local-type: typedef-62.1">local-type: typedef-62.1</a>
                       </em>
                     </p>
                   </td>
@@ -200593,6 +197172,29 @@ <h3>28.24. The complex type <code>siri:NotifyBySmsActionStructure</code>
                     <p class="tableblock darkbrown">Description of action.</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>siri:Keywords</code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <span title="optional, single">0:1</span>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>xs:NMTOKENS</em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
@@ -200657,11 +197259,7 @@ <h3>28.24. The complex type <code>siri:NotifyBySmsActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-54.1" title="local-type: typedef-54.1">local-type: typedef-54.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-12.1" title="local-type: typedef-12.1">local-type: typedef-12.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-62.1" title="local-type: typedef-62.1">local-type: typedef-62.1</a>
                       </em>
                     </p>
                   </td>
@@ -200832,6 +197430,29 @@ <h3>28.25. The complex type <code>siri:NotifyUserActionStructure</code>
                     <p class="tableblock darkbrown">Description of action.</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>siri:Keywords</code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <span title="optional, single">0:1</span>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>xs:NMTOKENS</em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
@@ -200896,11 +197517,7 @@ <h3>28.25. The complex type <code>siri:NotifyUserActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-54.1" title="local-type: typedef-54.1">local-type: typedef-54.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-12.1" title="local-type: typedef-12.1">local-type: typedef-12.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-62.1" title="local-type: typedef-62.1">local-type: typedef-62.1</a>
                       </em>
                     </p>
                   </td>
@@ -201097,6 +197714,29 @@ <h3>28.26. The complex type <code>siri:ParameterisedActionStructure</code>
                     <p class="tableblock darkbrown">Description of action.</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>siri:Keywords</code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <span title="optional, single">0:1</span>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>xs:NMTOKENS</em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
@@ -201232,6 +197872,29 @@ <h3>28.27. The complex type <code>siri:PassengerInformationActionStructure</code
                     <p class="tableblock darkbrown">Description of action.</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>siri:Keywords</code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <span title="optional, single">0:1</span>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>xs:NMTOKENS</em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
@@ -201361,7 +198024,7 @@ <h3>28.27. The complex type <code>siri:PassengerInformationActionStructure</code
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">The monotonically inscresing version of the passenger information instance. If absent, is the same version as the enclosing Situation</p>
+                    <p class="tableblock darkbrown">The monotonically increasing version of the passenger information instance. If absent, is the same version as the enclosing Situation</p>
                   </td>
                 </tr>
                 <tr>
@@ -201566,11 +198229,7 @@ <h3>28.28. The complex type <code>siri:PublishingActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-54.4" title="local-type: typedef-54.4">local-type: typedef-54.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-12.4" title="local-type: typedef-12.4">local-type: typedef-12.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-62.4" title="local-type: typedef-62.4">local-type: typedef-62.4</a>
                       </em>
                     </p>
                   </td>
@@ -201694,6 +198353,29 @@ <h3>28.29. The complex type <code>siri:PublishToAlertsActionStructure</code>
                     <p class="tableblock darkbrown">Description of action.</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>siri:Keywords</code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <span title="optional, single">0:1</span>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>xs:NMTOKENS</em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
@@ -201758,11 +198440,7 @@ <h3>28.29. The complex type <code>siri:PublishToAlertsActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-54.1" title="local-type: typedef-54.1">local-type: typedef-54.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-12.1" title="local-type: typedef-12.1">local-type: typedef-12.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-62.1" title="local-type: typedef-62.1">local-type: typedef-62.1</a>
                       </em>
                     </p>
                   </td>
@@ -201931,6 +198609,29 @@ <h3>28.30. The complex type <code>siri:PublishToDisplayActionStructure</code>
                     <p class="tableblock darkbrown">Description of action.</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>siri:Keywords</code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <span title="optional, single">0:1</span>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>xs:NMTOKENS</em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
@@ -202117,6 +198818,29 @@ <h3>28.31. The complex type <code>siri:PublishToMobileActionStructure</code>
                     <p class="tableblock darkbrown">Description of action.</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>siri:Keywords</code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <span title="optional, single">0:1</span>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>xs:NMTOKENS</em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
@@ -202303,6 +199027,29 @@ <h3>28.32. The complex type <code>siri:PublishToTvActionStructure</code>
                     <p class="tableblock darkbrown">Description of action.</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>siri:Keywords</code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <span title="optional, single">0:1</span>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>xs:NMTOKENS</em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
@@ -202489,6 +199236,29 @@ <h3>28.33. The complex type <code>siri:PublishToWebActionStructure</code>
                     <p class="tableblock darkbrown">Description of action.</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>siri:Keywords</code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <span title="optional, single">0:1</span>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>xs:NMTOKENS</em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
@@ -202721,6 +199491,29 @@ <h3>28.34. The complex type <code>siri:PushedActionStructure</code>
                     <p class="tableblock darkbrown">Description of action.</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>siri:Keywords</code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <span title="optional, single">0:1</span>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>xs:NMTOKENS</em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
@@ -202790,11 +199583,7 @@ <h3>28.34. The complex type <code>siri:PushedActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-54.1" title="local-type: typedef-54.1">local-type: typedef-54.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-12.1" title="local-type: typedef-12.1">local-type: typedef-12.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-62.1" title="local-type: typedef-62.1">local-type: typedef-62.1</a>
                       </em>
                     </p>
                   </td>
@@ -203344,11 +200133,7 @@ <h3>28.40. The complex type <code>siri:TextualContentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-54.3" title="local-type: typedef-54.3">local-type: typedef-54.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-12.3" title="local-type: typedef-12.3">local-type: typedef-12.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-62.3" title="local-type: typedef-62.3">local-type: typedef-62.3</a>
                       </em>
                     </p>
                   </td>
@@ -203692,13 +200477,8 @@ <h3>28.40. The complex type <code>siri:TextualContentStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-54.3">
-          <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typedef-54.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-12.3">
-          <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typedef-12.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-62.3">
+          <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typedef-62.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -203718,11 +200498,7 @@ <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typede
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-54.3)</code>
-=======
-                      <code>  (typedef-12.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-62.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -203788,6 +200564,29 @@ <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typede
                     <p class="tableblock darkbrown">Description of action.</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>siri:Keywords</code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <span title="optional, single">0:1</span>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>xs:NMTOKENS</em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
@@ -203840,13 +200639,8 @@ <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typede
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-54.3">
-          <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typedef-54.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-12.3">
-          <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typedef-12.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-62.3">
+          <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typedef-62.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -203866,11 +200660,7 @@ <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typede
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-54.3)</code>
-=======
-                      <code>  (typedef-12.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-62.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -203936,6 +200726,29 @@ <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typede
                     <p class="tableblock darkbrown">Description of action.</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>siri:Keywords</code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <span title="optional, single">0:1</span>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>xs:NMTOKENS</em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
@@ -203988,13 +200801,8 @@ <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typede
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-54.2">
-          <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishAtScope#complexType (typedef-54.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-12.2">
-          <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishAtScope#complexType (typedef-12.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-62.2">
+          <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishAtScope#complexType (typedef-62.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -204014,11 +200822,7 @@ <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishA
                       <br/>
                       <code>  /PublishAtScope #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-54.2)</code>
-=======
-                      <code>  (typedef-12.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-62.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -204034,24 +200838,12 @@ <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishA
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <code>
-                        <strong>siri:ScopeType</strong>
-                      </code>
-=======
                       <code>siri:ScopeType</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <code>
-                        <strong title="mandatory, single">1:1</strong>
-                      </code>
-=======
                       <span title="optional, single">0:1</span>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -204097,13 +200889,8 @@ <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishA
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-54.3">
-          <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typedef-54.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-12.3">
-          <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typedef-12.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-62.3">
+          <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typedef-62.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -204123,11 +200910,7 @@ <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typede
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-54.3)</code>
-=======
-                      <code>  (typedef-12.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-62.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -204193,6 +200976,29 @@ <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typede
                     <p class="tableblock darkbrown">Description of action.</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>siri:Keywords</code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <span title="optional, single">0:1</span>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>xs:NMTOKENS</em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
@@ -204245,13 +201051,8 @@ <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typede
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-54.1">
-          <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-54.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-12.1">
-          <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-12.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-62.1">
+          <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-62.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -204271,11 +201072,7 @@ <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-54.1)</code>
-=======
-                      <code>  (typedef-12.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-62.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -204314,13 +201111,8 @@ <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-54.1">
-          <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-54.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-12.1">
-          <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-12.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-62.1">
+          <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-62.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -204340,11 +201132,7 @@ <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-54.1)</code>
-=======
-                      <code>  (typedef-12.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-62.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -204383,13 +201171,8 @@ <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-54.1">
-          <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-54.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-12.1">
-          <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-12.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-62.1">
+          <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-62.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -204409,11 +201192,7 @@ <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-54.1)</code>
-=======
-                      <code>  (typedef-12.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-62.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -204452,13 +201231,8 @@ <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-54.1">
-          <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-54.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-12.1">
-          <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-12.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-62.1">
+          <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-62.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -204478,11 +201252,7 @@ <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-54.1)</code>
-=======
-                      <code>  (typedef-12.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-62.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -204521,13 +201291,8 @@ <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-54.4">
-          <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/PublishAtScope#complexType (typedef-54.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-12.4">
-          <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/PublishAtScope#complexType (typedef-12.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-62.4">
+          <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/PublishAtScope#complexType (typedef-62.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -204547,11 +201312,7 @@ <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/Pu
                       <br/>
                       <code>  /PublishAtScope #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-54.4)</code>
-=======
-                      <code>  (typedef-12.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-62.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -204567,24 +201328,12 @@ <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/Pu
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <code>
-                        <strong>siri:ScopeType</strong>
-                      </code>
-=======
                       <code>siri:ScopeType</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <code>
-                        <strong title="mandatory, single">1:1</strong>
-                      </code>
-=======
                       <span title="optional, single">0:1</span>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -204630,13 +201379,8 @@ <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/Pu
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-54.1">
-          <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-54.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-12.1">
-          <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-12.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-62.1">
+          <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-62.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -204656,11 +201400,7 @@ <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-54.1)</code>
-=======
-                      <code>  (typedef-12.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-62.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -204699,13 +201439,8 @@ <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-54.1">
-          <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-54.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-12.1">
-          <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-12.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-62.1">
+          <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-62.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -204725,11 +201460,7 @@ <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-54.1)</code>
-=======
-                      <code>  (typedef-12.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-62.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -204768,13 +201499,8 @@ <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-54.3">
-          <h3>28.52. The complex type <code>element[siri:ManualAction]#complexType (typedef-54.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-12.3">
-          <h3>28.52. The complex type <code>element[siri:ManualAction]#complexType (typedef-12.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-62.3">
+          <h3>28.52. The complex type <code>element[siri:ManualAction]#complexType (typedef-62.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -204794,11 +201520,7 @@ <h3>28.52. The complex type <code>element[siri:ManualAction]#complexType (typede
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-54.3)</code>
-=======
-                      <code>  (typedef-12.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-62.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -204864,6 +201586,29 @@ <h3>28.52. The complex type <code>element[siri:ManualAction]#complexType (typede
                     <p class="tableblock darkbrown">Description of action.</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>siri:Keywords</code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <span title="optional, single">0:1</span>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>xs:NMTOKENS</em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action).</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
@@ -206353,11 +203098,7 @@ <h3>29.16. The complex type <code>siri:AffectedCallStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock anno-text">Type for an SCHEDULED STOP POINT affected by a SITUATION.</p>
-=======
                     <p class="tableblock anno-text">Base Type for an SCHEDULED STOP POINT affected by a SITUATION.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -206671,11 +203412,7 @@ <h3>29.16. The complex type <code>siri:AffectedCallStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.1" title="local-type: typedef-64.1">local-type: typedef-64.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.1" title="local-type: typedef-13.1">local-type: typedef-13.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.1" title="local-type: typedef-51.1">local-type: typedef-51.1</a>
                       </em>
                     </p>
                   </td>
@@ -206699,20 +203436,12 @@ <h3>29.16. The complex type <code>siri:AffectedCallStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.2" title="local-type: typedef-64.2">local-type: typedef-64.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.2" title="local-type: typedef-13.2">local-type: typedef-13.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.2" title="local-type: typedef-51.2">local-type: typedef-51.2</a>
                       </em>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Used to restrict stop points to some lines</p>
-=======
                     <p class="tableblock darkbrown">Used to restrict stop points to some lines.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -207313,11 +204042,7 @@ <h3>29.16. The complex type <code>siri:AffectedCallStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.16" title="local-type: typedef-64.16">local-type: typedef-64.16</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.16" title="local-type: typedef-13.16">local-type: typedef-13.16</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.16" title="local-type: typedef-51.16">local-type: typedef-51.16</a>
                       </em>
                     </p>
                   </td>
@@ -207799,8 +204524,6 @@ <h3>29.18. The complex type <code>siri:AffectedFacilityStructure</code>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-=======
                       <code>siri:FacilityLocation</code>
                     </p>
                   </td>
@@ -207825,7 +204548,6 @@ <h3>29.18. The complex type <code>siri:AffectedFacilityStructure</code>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       <code>siri:FacilityStatus</code>
                     </p>
                   </td>
@@ -208097,12 +204819,6 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock"/>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock anno-text">Information about the individual LINEs in the network that are affected by a SITUATION. If not explicitly overridden, modes and submodes will be defaulted to any values present (i) in the AffectedNetwork (ii) in the general context.</p>
-=======
                     <p class="tableblock">
                       <a shape="rect" href="#type.siri:AffectedLineWithoutStopStructure" title="siri:AffectedLineWithoutStopStructure">siri:AffectedLineWithoutStopStructure</a>
                     </p>
@@ -208114,7 +204830,6 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                 <tr>
                   <td colspan="6" rowspan="1" class="tableblock halign-left valign-top announceBase">
                     <p class="tableblock">The element content starts with <b>items inherited</b> from the base type:</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -208193,14 +204908,11 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </td>
                 </tr>
                 <tr>
-<<<<<<< HEAD
-=======
                   <td colspan="6" rowspan="1" class="tableblock halign-left valign-top announceBase">
                     <p class="tableblock">Inherited content is followed by <b>own content</b>:</p>
                   </td>
                 </tr>
                 <tr>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
                   </td>
@@ -208216,11 +204928,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#type.siri:AffectedStopPointStructure" title="siri:AffectedStopPointStructure">siri:AffectedStopPointStructure</a>
-=======
                       <em>+<a shape="rect" href="#type.siri:AffectedStopPointWithoutLineStructure" title="siri:AffectedStopPointWithoutLineStructure">siri:AffectedStopPointWithoutLineStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -208244,11 +204952,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#type.siri:AffectedStopPointStructure" title="siri:AffectedStopPointStructure">siri:AffectedStopPointStructure</a>
-=======
                       <em>+<a shape="rect" href="#type.siri:AffectedStopPointWithoutLineStructure" title="siri:AffectedStopPointWithoutLineStructure">siri:AffectedStopPointWithoutLineStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -208296,11 +205000,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.4" title="local-type: typedef-64.4">local-type: typedef-64.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.4" title="local-type: typedef-13.4">local-type: typedef-13.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.4" title="local-type: typedef-51.4">local-type: typedef-51.4</a>
                       </em>
                     </p>
                   </td>
@@ -208324,11 +205024,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.5" title="local-type: typedef-64.5">local-type: typedef-64.5</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.5" title="local-type: typedef-13.5">local-type: typedef-13.5</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.5" title="local-type: typedef-51.5">local-type: typedef-51.5</a>
                       </em>
                     </p>
                   </td>
@@ -208352,11 +205048,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.6" title="local-type: typedef-64.6">local-type: typedef-64.6</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.6" title="local-type: typedef-13.6">local-type: typedef-13.6</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.6" title="local-type: typedef-51.6">local-type: typedef-51.6</a>
                       </em>
                     </p>
                   </td>
@@ -208380,11 +205072,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.7" title="local-type: typedef-64.7">local-type: typedef-64.7</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.7" title="local-type: typedef-13.7">local-type: typedef-13.7</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.7" title="local-type: typedef-51.7">local-type: typedef-51.7</a>
                       </em>
                     </p>
                   </td>
@@ -208421,10 +205109,6 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="type.siri:AffectedModesStructure">
-          <h3>28.21. The complex type <code>siri:AffectedModesStructure</code>
-=======
         <div class="sect2" id="type.siri:AffectedLineWithoutStopStructure">
           <h3>29.21. The complex type <code>siri:AffectedLineWithoutStopStructure</code>
           </h3>
@@ -208533,7 +205217,6 @@ <h3>29.21. The complex type <code>siri:AffectedLineWithoutStopStructure</code>
         </div>
         <div class="sect2" id="type.siri:AffectedModesStructure">
           <h3>29.22. The complex type <code>siri:AffectedModesStructure</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -208615,11 +205298,7 @@ <h3>29.22. The complex type <code>siri:AffectedModesStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.3" title="local-type: typedef-64.3">local-type: typedef-64.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.3" title="local-type: typedef-13.3">local-type: typedef-13.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.3" title="local-type: typedef-51.3">local-type: typedef-51.3</a>
                       </em>
                     </p>
                   </td>
@@ -208632,11 +205311,7 @@ <h3>29.22. The complex type <code>siri:AffectedModesStructure</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:AffectedNetworkStructure">
-<<<<<<< HEAD
-          <h3>28.22. The complex type <code>siri:AffectedNetworkStructure</code>
-=======
           <h3>29.23. The complex type <code>siri:AffectedNetworkStructure</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -208683,11 +205358,7 @@ <h3>29.23. The complex type <code>siri:AffectedNetworkStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Operators of LINEs affected by incident. Overrides any value specified for (i) General Context.</p>
-=======
                     <p class="tableblock darkbrown">Operators of LINEs affected by incident. Overrides any value specified for (i) General Context. DEPRECATED since SIRI 2.1</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -209113,11 +205784,7 @@ <h3>29.23. The complex type <code>siri:AffectedNetworkStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">All LINEs in the network are affected.</p>
-=======
                     <p class="tableblock darkbrown">All LINEs in the network are affected. DEPRECATED since SIRI 2.1</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -209249,11 +205916,7 @@ <h3>29.23. The complex type <code>siri:AffectedNetworkStructure</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:AffectedOperatorStructure">
-<<<<<<< HEAD
-          <h3>28.23. The complex type <code>siri:AffectedOperatorStructure</code>
-=======
           <h3>29.24. The complex type <code>siri:AffectedOperatorStructure</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -209405,11 +206068,7 @@ <h3>29.24. The complex type <code>siri:AffectedOperatorStructure</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:AffectedPathLinkStructure">
-<<<<<<< HEAD
-          <h3>28.24. The complex type <code>siri:AffectedPathLinkStructure</code>
-=======
           <h3>29.25. The complex type <code>siri:AffectedPathLinkStructure</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -209605,11 +206264,7 @@ <h3>29.25. The complex type <code>siri:AffectedPathLinkStructure</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:AffectedPlaceStructure">
-<<<<<<< HEAD
-          <h3>28.25. The complex type <code>siri:AffectedPlaceStructure</code>
-=======
           <h3>29.26. The complex type <code>siri:AffectedPlaceStructure</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -209829,11 +206484,7 @@ <h3>29.26. The complex type <code>siri:AffectedPlaceStructure</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:AffectedRouteStructure">
-<<<<<<< HEAD
-          <h3>28.26. The complex type <code>siri:AffectedRouteStructure</code>
-=======
           <h3>29.27. The complex type <code>siri:AffectedRouteStructure</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -209923,11 +206574,7 @@ <h3>29.27. The complex type <code>siri:AffectedRouteStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.9" title="local-type: typedef-64.9">local-type: typedef-64.9</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.9" title="local-type: typedef-13.9">local-type: typedef-13.9</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.9" title="local-type: typedef-51.9">local-type: typedef-51.9</a>
                       </em>
                     </p>
                   </td>
@@ -209951,11 +206598,7 @@ <h3>29.27. The complex type <code>siri:AffectedRouteStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.10" title="local-type: typedef-64.10">local-type: typedef-64.10</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.10" title="local-type: typedef-13.10">local-type: typedef-13.10</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.10" title="local-type: typedef-51.10">local-type: typedef-51.10</a>
                       </em>
                     </p>
                   </td>
@@ -209979,11 +206622,7 @@ <h3>29.27. The complex type <code>siri:AffectedRouteStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.11" title="local-type: typedef-64.11">local-type: typedef-64.11</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.11" title="local-type: typedef-13.11">local-type: typedef-13.11</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.11" title="local-type: typedef-51.11">local-type: typedef-51.11</a>
                       </em>
                     </p>
                   </td>
@@ -210021,11 +206660,7 @@ <h3>29.27. The complex type <code>siri:AffectedRouteStructure</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:AffectedSectionStructure">
-<<<<<<< HEAD
-          <h3>28.27. The complex type <code>siri:AffectedSectionStructure</code>
-=======
           <h3>29.28. The complex type <code>siri:AffectedSectionStructure</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210110,11 +206745,7 @@ <h3>29.28. The complex type <code>siri:AffectedSectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.8" title="local-type: typedef-64.8">local-type: typedef-64.8</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.8" title="local-type: typedef-13.8">local-type: typedef-13.8</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.8" title="local-type: typedef-51.8">local-type: typedef-51.8</a>
                       </em>
                     </p>
                   </td>
@@ -210197,11 +206828,7 @@ <h3>29.28. The complex type <code>siri:AffectedSectionStructure</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:AffectedStopPlaceComponentStructure">
-<<<<<<< HEAD
-          <h3>28.28. The complex type <code>siri:AffectedStopPlaceComponentStructure</code>
-=======
           <h3>29.29. The complex type <code>siri:AffectedStopPlaceComponentStructure</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210474,11 +207101,7 @@ <h3>29.29. The complex type <code>siri:AffectedStopPlaceComponentStructure</code
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.21" title="local-type: typedef-64.21">local-type: typedef-64.21</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.21" title="local-type: typedef-13.21">local-type: typedef-13.21</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.21" title="local-type: typedef-51.21">local-type: typedef-51.21</a>
                       </em>
                     </p>
                   </td>
@@ -210516,11 +207139,7 @@ <h3>29.29. The complex type <code>siri:AffectedStopPlaceComponentStructure</code
           </div>
         </div>
         <div class="sect2" id="type.siri:AffectedStopPlaceElementStructure">
-<<<<<<< HEAD
-          <h3>28.29. The complex type <code>siri:AffectedStopPlaceElementStructure</code>
-=======
           <h3>29.30. The complex type <code>siri:AffectedStopPlaceElementStructure</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210575,11 +207194,7 @@ <h3>29.30. The complex type <code>siri:AffectedStopPlaceElementStructure</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:AffectedStopPlaceStructure">
-<<<<<<< HEAD
-          <h3>28.30. The complex type <code>siri:AffectedStopPlaceStructure</code>
-=======
           <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210600,11 +207215,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <a shape="rect" href="#type.siri:AffectedStopPlaceElementStructure" title="siri:AffectedStopPlaceElementStructure">siri:AffectedStopPlaceElementStructure</a>
-=======
                       <a shape="rect" href="#type.siri:AffectedStopPlaceWithoutLineStructure" title="siri:AffectedStopPlaceWithoutLineStructure">siri:AffectedStopPlaceWithoutLineStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210641,14 +207252,6 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                 </tr>
                 <tr>
-<<<<<<< HEAD
-                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top announceBase">
-                    <p class="tableblock">Inherited content is followed by <b>own content</b>:</p>
-                  </td>
-                </tr>
-                <tr>
-=======
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
                   </td>
@@ -210676,6 +207279,30 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                     <p class="tableblock darkbrown">Identifier of STOP PLACE affected by SITUATION.</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>siri:StopPlaceName</code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <span title="optional, multiple">0:*</span>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
+                      </em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Name of STOP PLACE affected by SITUATION. +v2.3</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
@@ -210697,7 +207324,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Name of STOP PLACE. (Unbounded since SIRI 2.0)</p>
+                    <p class="tableblock darkbrown">Name of PLACE associated with STOP PLACE. (Unbounded since SIRI 2.0)</p>
                   </td>
                 </tr>
                 <tr>
@@ -210741,11 +207368,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.18" title="local-type: typedef-64.18">local-type: typedef-64.18</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.18" title="local-type: typedef-13.18">local-type: typedef-13.18</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.18" title="local-type: typedef-51.18">local-type: typedef-51.18</a>
                       </em>
                     </p>
                   </td>
@@ -210769,11 +207392,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.19" title="local-type: typedef-64.19">local-type: typedef-64.19</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.19" title="local-type: typedef-13.19">local-type: typedef-13.19</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.19" title="local-type: typedef-51.19">local-type: typedef-51.19</a>
                       </em>
                     </p>
                   </td>
@@ -210797,11 +207416,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.20" title="local-type: typedef-64.20">local-type: typedef-64.20</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.20" title="local-type: typedef-13.20">local-type: typedef-13.20</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.20" title="local-type: typedef-51.20">local-type: typedef-51.20</a>
                       </em>
                     </p>
                   </td>
@@ -210810,14 +207425,11 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                 </tr>
                 <tr>
-<<<<<<< HEAD
-=======
                   <td colspan="6" rowspan="1" class="tableblock halign-left valign-top announceBase">
                     <p class="tableblock">Inherited content is followed by <b>own content</b>:</p>
                   </td>
                 </tr>
                 <tr>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
                   </td>
@@ -210833,20 +207445,12 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.17" title="local-type: typedef-64.17">local-type: typedef-64.17</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.17" title="local-type: typedef-13.17">local-type: typedef-13.17</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.17" title="local-type: typedef-51.17">local-type: typedef-51.17</a>
                       </em>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Used to restrict STOP PLACEs to some lines</p>
-=======
                     <p class="tableblock darkbrown">Used to restrict STOP PLACEs to some lines.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -210969,6 +207573,30 @@ <h3>29.32. The complex type <code>siri:AffectedStopPlaceWithoutLineStructure</co
                     <p class="tableblock darkbrown">Identifier of STOP PLACE affected by SITUATION.</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <a shape="rect" href="" title=""/>
+                  </td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <code>siri:StopPlaceName</code>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <span title="optional, multiple">0:*</span>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">
+                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
+                      </em>
+                    </p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Name of STOP PLACE affected by SITUATION. +v2.3</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
@@ -210990,7 +207618,7 @@ <h3>29.32. The complex type <code>siri:AffectedStopPlaceWithoutLineStructure</co
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Name of STOP PLACE. (Unbounded since SIRI 2.0)</p>
+                    <p class="tableblock darkbrown">Name of PLACE associated with STOP PLACE. (Unbounded since SIRI 2.0)</p>
                   </td>
                 </tr>
                 <tr>
@@ -211034,11 +207662,7 @@ <h3>29.32. The complex type <code>siri:AffectedStopPlaceWithoutLineStructure</co
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.18" title="local-type: typedef-64.18">local-type: typedef-64.18</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.18" title="local-type: typedef-13.18">local-type: typedef-13.18</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.18" title="local-type: typedef-51.18">local-type: typedef-51.18</a>
                       </em>
                     </p>
                   </td>
@@ -211062,11 +207686,7 @@ <h3>29.32. The complex type <code>siri:AffectedStopPlaceWithoutLineStructure</co
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.19" title="local-type: typedef-64.19">local-type: typedef-64.19</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.19" title="local-type: typedef-13.19">local-type: typedef-13.19</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.19" title="local-type: typedef-51.19">local-type: typedef-51.19</a>
                       </em>
                     </p>
                   </td>
@@ -211090,11 +207710,7 @@ <h3>29.32. The complex type <code>siri:AffectedStopPlaceWithoutLineStructure</co
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.20" title="local-type: typedef-64.20">local-type: typedef-64.20</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.20" title="local-type: typedef-13.20">local-type: typedef-13.20</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.20" title="local-type: typedef-51.20">local-type: typedef-51.20</a>
                       </em>
                     </p>
                   </td>
@@ -211107,11 +207723,7 @@ <h3>29.32. The complex type <code>siri:AffectedStopPlaceWithoutLineStructure</co
           </div>
         </div>
         <div class="sect2" id="type.siri:AffectedStopPointStructure">
-<<<<<<< HEAD
-          <h3>28.31. The complex type <code>siri:AffectedStopPointStructure</code>
-=======
           <h3>29.33. The complex type <code>siri:AffectedStopPointStructure</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211131,12 +207743,6 @@ <h3>29.33. The complex type <code>siri:AffectedStopPointStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock"/>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock anno-text">Type for an SCHEDULED STOP POINT affected by a SITUATION.</p>
-=======
                     <p class="tableblock">
                       <a shape="rect" href="#type.siri:AffectedStopPointWithoutLineStructure" title="siri:AffectedStopPointWithoutLineStructure">siri:AffectedStopPointWithoutLineStructure</a>
                     </p>
@@ -211148,7 +207754,6 @@ <h3>29.33. The complex type <code>siri:AffectedStopPointStructure</code>
                 <tr>
                   <td colspan="6" rowspan="1" class="tableblock halign-left valign-top announceBase">
                     <p class="tableblock">The element content starts with <b>items inherited</b> from the base type:</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -211457,11 +208062,7 @@ <h3>29.33. The complex type <code>siri:AffectedStopPointStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.1" title="local-type: typedef-64.1">local-type: typedef-64.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.1" title="local-type: typedef-13.1">local-type: typedef-13.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.1" title="local-type: typedef-51.1">local-type: typedef-51.1</a>
                       </em>
                     </p>
                   </td>
@@ -211470,14 +208071,11 @@ <h3>29.33. The complex type <code>siri:AffectedStopPointStructure</code>
                   </td>
                 </tr>
                 <tr>
-<<<<<<< HEAD
-=======
                   <td colspan="6" rowspan="1" class="tableblock halign-left valign-top announceBase">
                     <p class="tableblock">Inherited content is followed by <b>own content</b>:</p>
                   </td>
                 </tr>
                 <tr>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <a shape="rect" href="" title=""/>
                   </td>
@@ -211493,20 +208091,12 @@ <h3>29.33. The complex type <code>siri:AffectedStopPointStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.2" title="local-type: typedef-64.2">local-type: typedef-64.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.2" title="local-type: typedef-13.2">local-type: typedef-13.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.2" title="local-type: typedef-51.2">local-type: typedef-51.2</a>
                       </em>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Used to restrict stop points to some lines</p>
-=======
                     <p class="tableblock darkbrown">Used to restrict stop points to some lines.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -211871,11 +208461,7 @@ <h3>29.34. The complex type <code>siri:AffectedStopPointWithoutLineStructure</co
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.1" title="local-type: typedef-64.1">local-type: typedef-64.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.1" title="local-type: typedef-13.1">local-type: typedef-13.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.1" title="local-type: typedef-51.1">local-type: typedef-51.1</a>
                       </em>
                     </p>
                   </td>
@@ -211888,11 +208474,7 @@ <h3>29.34. The complex type <code>siri:AffectedStopPointWithoutLineStructure</co
           </div>
         </div>
         <div class="sect2" id="type.siri:AffectedVehicleJourneyStructure">
-<<<<<<< HEAD
-          <h3>28.32. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
-=======
           <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212169,13 +208751,13 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <span title="optional, multiple">0:*</span>
+                      <span title="optional, single">0:1</span>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
+                        <a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
                       </em>
                     </p>
                   </td>
@@ -212223,11 +208805,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.12" title="local-type: typedef-64.12">local-type: typedef-64.12</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.12" title="local-type: typedef-13.12">local-type: typedef-13.12</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.12" title="local-type: typedef-51.12">local-type: typedef-51.12</a>
                       </em>
                     </p>
                   </td>
@@ -212251,11 +208829,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.13" title="local-type: typedef-64.13">local-type: typedef-64.13</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.13" title="local-type: typedef-13.13">local-type: typedef-13.13</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.13" title="local-type: typedef-51.13">local-type: typedef-51.13</a>
                       </em>
                     </p>
                   </td>
@@ -212397,11 +208971,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -212425,11 +208995,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -212502,11 +209068,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.14" title="local-type: typedef-64.14">local-type: typedef-64.14</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.14" title="local-type: typedef-13.14">local-type: typedef-13.14</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.14" title="local-type: typedef-51.14">local-type: typedef-51.14</a>
                       </em>
                     </p>
                   </td>
@@ -212530,11 +209092,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-64.15" title="local-type: typedef-64.15">local-type: typedef-64.15</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-13.15" title="local-type: typedef-13.15">local-type: typedef-13.15</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-51.15" title="local-type: typedef-51.15">local-type: typedef-51.15</a>
                       </em>
                     </p>
                   </td>
@@ -212572,11 +209130,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:AffectedVehicleStructure">
-<<<<<<< HEAD
-          <h3>28.33. The complex type <code>siri:AffectedVehicleStructure</code>
-=======
           <h3>29.36. The complex type <code>siri:AffectedVehicleStructure</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -213079,11 +209633,7 @@ <h3>29.36. The complex type <code>siri:AffectedVehicleStructure</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:CasualtiesStructure">
-<<<<<<< HEAD
-          <h3>28.34. The complex type <code>siri:CasualtiesStructure</code>
-=======
           <h3>29.37. The complex type <code>siri:CasualtiesStructure</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -213160,11 +209710,7 @@ <h3>29.37. The complex type <code>siri:CasualtiesStructure</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:NetworkRefStructure">
-<<<<<<< HEAD
-          <h3>28.35. The complex type <code>siri:NetworkRefStructure</code>
-=======
           <h3>29.38. The complex type <code>siri:NetworkRefStructure</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -213197,11 +209743,7 @@ <h3>29.38. The complex type <code>siri:NetworkRefStructure</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:NetworkStructure">
-<<<<<<< HEAD
-          <h3>28.36. The complex type <code>siri:NetworkStructure</code>
-=======
           <h3>29.39. The complex type <code>siri:NetworkStructure</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -213595,11 +210137,7 @@ <h3>29.39. The complex type <code>siri:NetworkStructure</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:OffsetStructure">
-<<<<<<< HEAD
-          <h3>28.37. The complex type <code>siri:OffsetStructure</code>
-=======
           <h3>29.40. The complex type <code>siri:OffsetStructure</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -213676,11 +210214,7 @@ <h3>29.40. The complex type <code>siri:OffsetStructure</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:OperationalUnitRefStructure">
-<<<<<<< HEAD
-          <h3>28.38. The complex type <code>siri:OperationalUnitRefStructure</code>
-=======
           <h3>29.41. The complex type <code>siri:OperationalUnitRefStructure</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -213713,11 +210247,7 @@ <h3>29.41. The complex type <code>siri:OperationalUnitRefStructure</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:SectionRefStructure">
-<<<<<<< HEAD
-          <h3>28.39. The complex type <code>siri:SectionRefStructure</code>
-=======
           <h3>29.42. The complex type <code>siri:SectionRefStructure</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -213750,11 +210280,7 @@ <h3>29.42. The complex type <code>siri:SectionRefStructure</code>
           </div>
         </div>
         <div class="sect2" id="type.siri:ZoneRefStructure">
-<<<<<<< HEAD
-          <h3>28.40. The complex type <code>siri:ZoneRefStructure</code>
-=======
           <h3>29.43. The complex type <code>siri:ZoneRefStructure</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -213786,13 +210312,8 @@ <h3>29.43. The complex type <code>siri:ZoneRefStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.1">
-          <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-64.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.1">
-          <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-13.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.1">
+          <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-51.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -213808,19 +210329,11 @@ <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <code>complexType[siri:AffectedStopPointStructure]</code>
-                      <br/>
-                      <code>  /ConnectionLinks #complexType</code>
-                      <br/>
-                      <code>  (typedef-64.1)</code>
-=======
                       <code>complexType[siri:AffectedStopPointWithoutLineStructure]</code>
                       <br/>
                       <code>  /ConnectionLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-13.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -213862,13 +210375,8 @@ <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.2">
-          <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-64.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.2">
-          <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-13.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.2">
+          <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-51.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -213888,11 +210396,7 @@ <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-64.2)</code>
-=======
-                      <code>  (typedef-13.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -213922,11 +210426,7 @@ <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#type.siri:AffectedLineStructure" title="siri:AffectedLineStructure">siri:AffectedLineStructure</a>
-=======
                       <em>+<a shape="rect" href="#type.siri:AffectedLineWithoutStopStructure" title="siri:AffectedLineWithoutStopStructure">siri:AffectedLineWithoutStopStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -213938,13 +210438,8 @@ <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.16">
-          <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/AffectedInterchanges#complexType (typedef-64.16)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.16">
-          <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/AffectedInterchanges#complexType (typedef-13.16)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.16">
+          <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/AffectedInterchanges#complexType (typedef-51.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -213964,11 +210459,7 @@ <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/Affect
                       <br/>
                       <code>  /AffectedInterchanges #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-64.16)</code>
-=======
-                      <code>  (typedef-13.16)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -214006,13 +210497,8 @@ <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/Affect
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.4">
-          <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes#complexType (typedef-64.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.4">
-          <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes#complexType (typedef-13.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.4">
+          <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes#complexType (typedef-51.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -214032,11 +210518,7 @@ <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes
                       <br/>
                       <code>  /Routes #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-64.4)</code>
-=======
-                      <code>  (typedef-13.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -214078,13 +210560,8 @@ <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.5">
-          <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sections#complexType (typedef-64.5)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.5">
-          <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sections#complexType (typedef-13.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.5">
+          <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sections#complexType (typedef-51.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -214104,11 +210581,7 @@ <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sectio
                       <br/>
                       <code>  /Sections #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-64.5)</code>
-=======
-                      <code>  (typedef-13.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -214150,13 +210623,8 @@ <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sectio
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.6">
-          <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPoints#complexType (typedef-64.6)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.6">
-          <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPoints#complexType (typedef-13.6)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.6">
+          <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPoints#complexType (typedef-51.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -214176,11 +210644,7 @@ <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPo
                       <br/>
                       <code>  /StopPoints #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-64.6)</code>
-=======
-                      <code>  (typedef-13.6)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -214210,11 +210674,7 @@ <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPo
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#type.siri:AffectedStopPointStructure" title="siri:AffectedStopPointStructure">siri:AffectedStopPointStructure</a>
-=======
                       <em>+<a shape="rect" href="#type.siri:AffectedStopPointWithoutLineStructure" title="siri:AffectedStopPointWithoutLineStructure">siri:AffectedStopPointWithoutLineStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -214226,13 +210686,8 @@ <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPo
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.7">
-          <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPlaces#complexType (typedef-64.7)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.7">
-          <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPlaces#complexType (typedef-13.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.7">
+          <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPlaces#complexType (typedef-51.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -214252,11 +210707,7 @@ <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPl
                       <br/>
                       <code>  /StopPlaces #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-64.7)</code>
-=======
-                      <code>  (typedef-13.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -214286,11 +210737,7 @@ <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPl
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#type.siri:AffectedStopPlaceStructure" title="siri:AffectedStopPlaceStructure">siri:AffectedStopPlaceStructure</a>
-=======
                       <em>+<a shape="rect" href="#type.siri:AffectedStopPlaceWithoutLineStructure" title="siri:AffectedStopPlaceWithoutLineStructure">siri:AffectedStopPlaceWithoutLineStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -214302,13 +210749,8 @@ <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPl
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.3">
-          <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#complexType (typedef-64.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.3">
-          <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#complexType (typedef-13.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.3">
+          <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#complexType (typedef-51.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -214328,11 +210770,7 @@ <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#
                       <br/>
                       <code>  /Mode #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-64.3)</code>
-=======
-                      <code>  (typedef-13.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -214661,13 +211099,8 @@ <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.9">
-          <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Sections#complexType (typedef-64.9)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.9">
-          <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Sections#complexType (typedef-13.9)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.9">
+          <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Sections#complexType (typedef-51.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -214687,11 +211120,7 @@ <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Secti
                       <br/>
                       <code>  /Sections #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-64.9)</code>
-=======
-                      <code>  (typedef-13.9)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -214733,13 +211162,8 @@ <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Secti
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.10">
-          <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopPoints#complexType (typedef-64.10)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.10">
-          <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopPoints#complexType (typedef-13.10)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.10">
+          <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopPoints#complexType (typedef-51.10)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -214759,11 +211183,7 @@ <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopP
                       <br/>
                       <code>  /StopPoints #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-64.10)</code>
-=======
-                      <code>  (typedef-13.10)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.10)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -214816,11 +211236,7 @@ <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopP
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#type.siri:AffectedStopPointStructure" title="siri:AffectedStopPointStructure">siri:AffectedStopPointStructure</a>
-=======
                       <em>+<a shape="rect" href="#type.siri:AffectedStopPointWithoutLineStructure" title="siri:AffectedStopPointWithoutLineStructure">siri:AffectedStopPointWithoutLineStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -214856,13 +211272,8 @@ <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopP
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.11">
-          <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/RouteLinks#complexType (typedef-64.11)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.11">
-          <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/RouteLinks#complexType (typedef-13.11)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.11">
+          <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/RouteLinks#complexType (typedef-51.11)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -214882,11 +211293,7 @@ <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/Route
                       <br/>
                       <code>  /RouteLinks #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-64.11)</code>
-=======
-                      <code>  (typedef-13.11)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.11)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -214928,13 +211335,8 @@ <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/Route
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.8">
-          <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/IndirectSectionRef#complexType (typedef-64.8)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.8">
-          <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/IndirectSectionRef#complexType (typedef-13.8)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.8">
+          <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/IndirectSectionRef#complexType (typedef-51.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -214954,11 +211356,7 @@ <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/Ind
                       <br/>
                       <code>  /IndirectSectionRef #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-64.8)</code>
-=======
-                      <code>  (typedef-13.8)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -215284,13 +211682,8 @@ <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/Ind
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.21">
-          <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStructure]/AffectedFacilities#complexType (typedef-64.21)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.21">
-          <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStructure]/AffectedFacilities#complexType (typedef-13.21)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.21">
+          <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStructure]/AffectedFacilities#complexType (typedef-51.21)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -215310,11 +211703,7 @@ <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStr
                       <br/>
                       <code>  /AffectedFacilities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-64.21)</code>
-=======
-                      <code>  (typedef-13.21)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.21)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -215356,13 +211745,8 @@ <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStr
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.18">
-          <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-64.18)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.18">
-          <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-13.18)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.18">
+          <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-51.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -215378,19 +211762,11 @@ <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <code>complexType[siri:AffectedStopPlaceStructure]</code>
-                      <br/>
-                      <code>  /AffectedFacilities #complexType</code>
-                      <br/>
-                      <code>  (typedef-64.18)</code>
-=======
                       <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]</code>
                       <br/>
                       <code>  /AffectedFacilities #complexType</code>
                       <br/>
-                      <code>  (typedef-13.18)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -215432,13 +211808,8 @@ <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.19">
-          <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-64.19)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.19">
-          <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-13.19)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.19">
+          <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-51.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -215454,19 +211825,11 @@ <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <code>complexType[siri:AffectedStopPlaceStructure]</code>
-                      <br/>
-                      <code>  /AffectedComponents #complexType</code>
-                      <br/>
-                      <code>  (typedef-64.19)</code>
-=======
                       <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]</code>
                       <br/>
                       <code>  /AffectedComponents #complexType</code>
                       <br/>
-                      <code>  (typedef-13.19)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -215504,13 +211867,8 @@ <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.20">
-          <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-64.20)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.20">
-          <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-13.20)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.20">
+          <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-51.20)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -215526,19 +211884,11 @@ <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <code>complexType[siri:AffectedStopPlaceStructure]</code>
-                      <br/>
-                      <code>  /AffectedNavigationPaths #complexType</code>
-                      <br/>
-                      <code>  (typedef-64.20)</code>
-=======
                       <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]</code>
                       <br/>
                       <code>  /AffectedNavigationPaths #complexType</code>
                       <br/>
-                      <code>  (typedef-13.20)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.20)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -215580,13 +211930,8 @@ <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.17">
-          <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/Lines#complexType (typedef-64.17)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.17">
-          <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/Lines#complexType (typedef-13.17)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.17">
+          <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/Lines#complexType (typedef-51.17)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -215606,11 +211951,7 @@ <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/L
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-64.17)</code>
-=======
-                      <code>  (typedef-13.17)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.17)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -215652,13 +211993,8 @@ <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/L
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.18">
-          <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-64.18)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.18">
-          <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-13.18)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.18">
+          <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-51.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -215678,11 +212014,7 @@ <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedFacilities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-64.18)</code>
-=======
-                      <code>  (typedef-13.18)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -215724,13 +212056,8 @@ <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.19">
-          <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-64.19)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.19">
-          <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-13.19)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.19">
+          <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-51.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -215750,11 +212077,7 @@ <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedComponents #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-64.19)</code>
-=======
-                      <code>  (typedef-13.19)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -215792,13 +212115,8 @@ <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.20">
-          <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-64.20)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.20">
-          <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-13.20)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.20">
+          <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-51.20)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -215818,11 +212136,7 @@ <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedNavigationPaths #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-64.20)</code>
-=======
-                      <code>  (typedef-13.20)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.20)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -215864,13 +212178,8 @@ <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.1">
-          <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-64.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.1">
-          <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-13.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.1">
+          <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-51.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -215890,11 +212199,7 @@ <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
                       <br/>
                       <code>  /ConnectionLinks #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-64.1)</code>
-=======
-                      <code>  (typedef-13.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -215936,13 +212241,8 @@ <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.2">
-          <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-64.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.2">
-          <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-13.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.2">
+          <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-51.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -215962,11 +212262,7 @@ <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-64.2)</code>
-=======
-                      <code>  (typedef-13.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -215996,11 +212292,7 @@ <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#type.siri:AffectedLineStructure" title="siri:AffectedLineStructure">siri:AffectedLineStructure</a>
-=======
                       <em>+<a shape="rect" href="#type.siri:AffectedLineWithoutStopStructure" title="siri:AffectedLineWithoutStopStructure">siri:AffectedLineWithoutStopStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -216012,13 +212304,8 @@ <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.1">
-          <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-64.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.1">
-          <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-13.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.1">
+          <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-51.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -216038,11 +212325,7 @@ <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
                       <br/>
                       <code>  /ConnectionLinks #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-64.1)</code>
-=======
-                      <code>  (typedef-13.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -216084,13 +212367,8 @@ <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.12">
-          <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-64.12)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.12">
-          <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-13.12)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.12">
+          <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-51.12)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -216110,11 +212388,7 @@ <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-64.12)</code>
-=======
-                      <code>  (typedef-13.12)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.12)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -216156,13 +212430,8 @@ <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.13">
-          <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/JourneyParts#complexType (typedef-64.13)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.13">
-          <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/JourneyParts#complexType (typedef-13.13)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.13">
+          <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/JourneyParts#complexType (typedef-51.13)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -216182,11 +212451,7 @@ <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-64.13)</code>
-=======
-                      <code>  (typedef-13.13)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.13)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -216228,13 +212493,8 @@ <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.14">
-          <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Calls#complexType (typedef-64.14)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.14">
-          <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Calls#complexType (typedef-13.14)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.14">
+          <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Calls#complexType (typedef-51.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -216254,11 +212514,7 @@ <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
                       <br/>
                       <code>  /Calls #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-64.14)</code>
-=======
-                      <code>  (typedef-13.14)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -216300,13 +212556,8 @@ <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-64.15">
-          <h3>29.70. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Facilities#complexType (typedef-64.15)</code>
-=======
-        <div class="sect2" id="local-type.typedef-13.15">
-          <h3>29.70. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Facilities#complexType (typedef-13.15)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-51.15">
+          <h3>29.70. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Facilities#complexType (typedef-51.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -216326,11 +212577,7 @@ <h3>29.70. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-64.15)</code>
-=======
-                      <code>  (typedef-13.15)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-51.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -216682,7 +212929,7 @@ <h3>30.1. Simple type definitions</h3>
                             <p class="tableblock">mobilityImpairedAccessLimited</p>
                           </td>
                           <td class="tableblock halign-left valign-top">
-                            <p class="tableblock anno-text">Access for mobility impaired passengers limited</p>
+                            <p class="tableblock anno-text">Access is limited for mobility impaired passengers. The value should correspond to the overall summary of the AccessibilityAssessment of the StopPoint, when known. +v2.3</p>
                           </td>
                         </tr>
                         <tr>
@@ -216995,20 +213242,12 @@ <h3>30.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
                     <p id="local-type.typedef-55.2" class="tableblock">
-=======
-                    <p id="local-type.typedef-11.2" class="tableblock">
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       <code>element[siri:Predictability]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-55.2)</code>
-=======
-                      <code>  (typedef-11.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -217053,20 +213292,12 @@ <h3>30.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
                     <p id="local-type.typedef-55.1" class="tableblock">
-=======
-                    <p id="local-type.typedef-11.1" class="tableblock">
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       <code>element[siri:VerificationStatus]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-<<<<<<< HEAD
                       <code>  (typedef-55.1)</code>
-=======
-                      <code>  (typedef-11.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -223919,11 +220150,7 @@ <h3>34.5. The complex type <code>siri:TargetedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -223944,11 +220171,7 @@ <h3>34.5. The complex type <code>siri:TargetedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -223969,11 +220192,7 @@ <h3>34.5. The complex type <code>siri:TargetedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -224058,11 +220277,7 @@ <h3>34.5. The complex type <code>siri:TargetedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -224083,11 +220298,7 @@ <h3>34.5. The complex type <code>siri:TargetedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -226881,11 +223092,7 @@ <h3>39.4. The complex type <code>siri:AnnotatedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-4.1" title="local-type: typedef-4.1">local-type: typedef-4.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-25.1" title="local-type: typedef-25.1">local-type: typedef-25.1</a>
                       </em>
                     </p>
                   </td>
@@ -226909,11 +223116,7 @@ <h3>39.4. The complex type <code>siri:AnnotatedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-4.2" title="local-type: typedef-4.2">local-type: typedef-4.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-2.2" title="local-type: typedef-2.2">local-type: typedef-2.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-25.2" title="local-type: typedef-25.2">local-type: typedef-25.2</a>
                       </em>
                     </p>
                   </td>
@@ -227057,11 +223260,7 @@ <h3>39.5. The complex type <code>siri:RouteDirectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-4.3" title="local-type: typedef-4.3">local-type: typedef-4.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-2.3" title="local-type: typedef-2.3">local-type: typedef-2.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-25.3" title="local-type: typedef-25.3">local-type: typedef-25.3</a>
                       </em>
                     </p>
                   </td>
@@ -227271,11 +223470,7 @@ <h3>39.6. The complex type <code>siri:StopPointInPatternStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-3.1" title="local-type: typedef-3.1">local-type: typedef-3.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
                       </em>
                     </p>
                   </td>
@@ -227299,11 +223494,7 @@ <h3>39.6. The complex type <code>siri:StopPointInPatternStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-2.2" title="local-type: typedef-2.2">local-type: typedef-2.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-3.2" title="local-type: typedef-3.2">local-type: typedef-3.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
                       </em>
                     </p>
                   </td>
@@ -227467,13 +223658,8 @@ <h3>39.6. The complex type <code>siri:StopPointInPatternStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-4.1">
-          <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destinations#complexType (typedef-4.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-2.1">
-          <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destinations#complexType (typedef-2.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-25.1">
+          <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destinations#complexType (typedef-25.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -227493,11 +223679,7 @@ <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destin
                       <br/>
                       <code>  /Destinations #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-4.1)</code>
-=======
-                      <code>  (typedef-2.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-25.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -227540,13 +223722,8 @@ <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destin
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-4.2">
-          <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Directions#complexType (typedef-4.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-2.2">
-          <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Directions#complexType (typedef-2.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-25.2">
+          <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Directions#complexType (typedef-25.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -227566,11 +223743,7 @@ <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Direct
                       <br/>
                       <code>  /Directions #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-4.2)</code>
-=======
-                      <code>  (typedef-2.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-25.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -227612,13 +223785,8 @@ <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Direct
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-4.3">
-          <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns#complexType (typedef-4.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-2.3">
-          <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns#complexType (typedef-2.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-25.3">
+          <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns#complexType (typedef-25.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -227638,11 +223806,7 @@ <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/Journ
                       <br/>
                       <code>  /JourneyPatterns #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-4.3)</code>
-=======
-                      <code>  (typedef-2.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-25.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -227672,11 +223836,7 @@ <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/Journ
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-4.4" title="local-type: typedef-4.4">local-type: typedef-4.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-2.4" title="local-type: typedef-2.4">local-type: typedef-2.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-25.4" title="local-type: typedef-25.4">local-type: typedef-25.4</a>
                       </em>
                     </p>
                   </td>
@@ -227688,13 +223848,8 @@ <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/Journ
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-4.4">
-          <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern#complexType (typedef-4.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-2.4">
-          <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern#complexType (typedef-2.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-25.4">
+          <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern#complexType (typedef-25.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -227714,11 +223869,7 @@ <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
                       <br/>
                       <code>  /JourneyPatterns/JourneyPattern #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-4.4)</code>
-=======
-                      <code>  (typedef-2.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-25.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -227793,11 +223944,7 @@ <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-4.5" title="local-type: typedef-4.5">local-type: typedef-4.5</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-2.5" title="local-type: typedef-2.5">local-type: typedef-2.5</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-25.5" title="local-type: typedef-25.5">local-type: typedef-25.5</a>
                       </em>
                     </p>
                   </td>
@@ -227809,13 +223956,8 @@ <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-4.5">
-          <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern/StopsInPattern#complexType (typedef-4.5)</code>
-=======
-        <div class="sect2" id="local-type.typedef-2.5">
-          <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern/StopsInPattern#complexType (typedef-2.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-25.5">
+          <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern/StopsInPattern#complexType (typedef-25.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -227835,11 +223977,7 @@ <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
                       <br/>
                       <code>  /JourneyPatterns/JourneyPattern/StopsInPattern #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-4.5)</code>
-=======
-                      <code>  (typedef-2.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-25.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -227881,13 +224019,8 @@ <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-2.1">
-          <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-2.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-3.1">
-          <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-3.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -227907,11 +224040,7 @@ <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-2.1)</code>
-=======
-                      <code>  (typedef-3.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -227997,13 +224126,8 @@ <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-2.2">
-          <h3>39.13. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-2.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-3.2">
-          <h3>39.13. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-3.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>39.13. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -228023,11 +224147,7 @@ <h3>39.13. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-2.2)</code>
-=======
-                      <code>  (typedef-3.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -228315,11 +224435,7 @@ <h3>40.2. The complex type <code>siri:AnnotatedStopPointStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-3.1" title="local-type: typedef-3.1">local-type: typedef-3.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
                       </em>
                     </p>
                   </td>
@@ -228343,11 +224459,7 @@ <h3>40.2. The complex type <code>siri:AnnotatedStopPointStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-2.2" title="local-type: typedef-2.2">local-type: typedef-2.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-3.2" title="local-type: typedef-3.2">local-type: typedef-3.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
                       </em>
                     </p>
                   </td>
@@ -228406,13 +224518,8 @@ <h3>40.2. The complex type <code>siri:AnnotatedStopPointStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-2.1">
-          <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-2.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-3.1">
-          <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-3.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -228432,11 +224539,7 @@ <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/F
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-2.1)</code>
-=======
-                      <code>  (typedef-3.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -228522,13 +224625,8 @@ <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/F
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-2.2">
-          <h3>40.4. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-2.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-3.2">
-          <h3>40.4. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-3.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>40.4. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -228548,11 +224646,7 @@ <h3>40.4. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/L
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-2.2)</code>
-=======
-                      <code>  (typedef-3.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229676,11 +225770,7 @@ <h3>41.12. The group <code>siri:ProductionTimetableTopicGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-79.1" title="local-type: typedef-79.1">local-type: typedef-79.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
                       </em>
                     </p>
                   </td>
@@ -229830,11 +225920,7 @@ <h3>41.13. The group <code>siri:SiriProductionTimetableIndexGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-79.2" title="local-type: typedef-79.2">local-type: typedef-79.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
                       </em>
                     </p>
                   </td>
@@ -229886,11 +225972,7 @@ <h3>41.13. The group <code>siri:SiriProductionTimetableIndexGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-79.3" title="local-type: typedef-79.3">local-type: typedef-79.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-72.3" title="local-type: typedef-72.3">local-type: typedef-72.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-74.3" title="local-type: typedef-74.3">local-type: typedef-74.3</a>
                       </em>
                     </p>
                   </td>
@@ -230499,11 +226581,7 @@ <h3>41.14. The complex type <code>siri:DatedTimetableVersionFrameStructure</code
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -230954,11 +227032,7 @@ <h3>41.15. The complex type <code>siri:ProductionTimetableCapabilitiesResponseSt
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-79.7" title="local-type: typedef-79.7">local-type: typedef-79.7</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-72.7" title="local-type: typedef-72.7">local-type: typedef-72.7</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-74.7" title="local-type: typedef-74.7">local-type: typedef-74.7</a>
                       </em>
                     </p>
                   </td>
@@ -231868,11 +227942,7 @@ <h3>41.19. The complex type <code>siri:ProductionTimetableRequestStructure</code
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-79.1" title="local-type: typedef-79.1">local-type: typedef-79.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
                       </em>
                     </p>
                   </td>
@@ -232203,11 +228273,7 @@ <h3>41.20. The complex type <code>siri:ProductionTimetableServiceCapabilitiesStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-79.4" title="local-type: typedef-79.4">local-type: typedef-79.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-72.4" title="local-type: typedef-72.4">local-type: typedef-72.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-74.4" title="local-type: typedef-74.4">local-type: typedef-74.4</a>
                       </em>
                     </p>
                   </td>
@@ -232231,11 +228297,7 @@ <h3>41.20. The complex type <code>siri:ProductionTimetableServiceCapabilitiesStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-79.5" title="local-type: typedef-79.5">local-type: typedef-79.5</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-72.5" title="local-type: typedef-72.5">local-type: typedef-72.5</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-74.5" title="local-type: typedef-74.5">local-type: typedef-74.5</a>
                       </em>
                     </p>
                   </td>
@@ -232259,11 +228321,7 @@ <h3>41.20. The complex type <code>siri:ProductionTimetableServiceCapabilitiesStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-79.6" title="local-type: typedef-79.6">local-type: typedef-79.6</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-72.6" title="local-type: typedef-72.6">local-type: typedef-72.6</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-74.6" title="local-type: typedef-74.6">local-type: typedef-74.6</a>
                       </em>
                     </p>
                   </td>
@@ -232635,13 +228693,8 @@ <h3>41.22. The complex type <code>siri:TimetableValidityPeriod</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-79.3">
-          <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-79.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-72.3">
-          <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-72.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-74.3">
+          <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-74.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -232661,11 +228714,7 @@ <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-79.3)</code>
-=======
-                      <code>  (typedef-72.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-74.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -232815,13 +228864,8 @@ <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-79.7">
-          <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-79.7)</code>
-=======
-        <div class="sect2" id="local-type.typedef-72.7">
-          <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-72.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-74.7">
+          <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-74.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -232841,11 +228885,7 @@ <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#c
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-79.7)</code>
-=======
-                      <code>  (typedef-72.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-74.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -232920,13 +228960,8 @@ <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#c
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-79.2">
-          <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-79.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-72.2">
-          <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-72.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-74.2">
+          <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-74.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -232946,11 +228981,7 @@ <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-79.2)</code>
-=======
-                      <code>  (typedef-72.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-74.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -233147,13 +229178,8 @@ <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-79.1">
-          <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-79.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-72.1">
-          <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-72.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-74.1">
+          <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-74.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -233173,11 +229199,7 @@ <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-79.1)</code>
-=======
-                      <code>  (typedef-72.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-74.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -233219,13 +229241,8 @@ <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-79.2">
-          <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-79.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-72.2">
-          <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-72.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-74.2">
+          <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-74.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -233245,11 +229262,7 @@ <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-79.2)</code>
-=======
-                      <code>  (typedef-72.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-74.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -233446,13 +229459,8 @@ <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-79.3">
-          <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-79.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-72.3">
-          <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-72.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-74.3">
+          <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-74.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -233472,11 +229480,7 @@ <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-79.3)</code>
-=======
-                      <code>  (typedef-72.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-74.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -233626,13 +229630,8 @@ <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-79.7">
-          <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-79.7)</code>
-=======
-        <div class="sect2" id="local-type.typedef-72.7">
-          <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-72.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-74.7">
+          <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-74.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -233652,11 +229651,7 @@ <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#c
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-79.7)</code>
-=======
-                      <code>  (typedef-72.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-74.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -233731,13 +229726,8 @@ <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#c
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-79.1">
-          <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-79.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-72.1">
-          <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-72.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-74.1">
+          <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-74.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -233757,11 +229747,7 @@ <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-79.1)</code>
-=======
-                      <code>  (typedef-72.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-74.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -233803,13 +229789,8 @@ <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-79.4">
-          <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-79.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-72.4">
-          <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-72.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-74.4">
+          <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-74.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -233829,11 +229810,7 @@ <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCap
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-79.4)</code>
-=======
-                      <code>  (typedef-72.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-74.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -234030,13 +230007,8 @@ <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCap
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-79.5">
-          <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-79.5)</code>
-=======
-        <div class="sect2" id="local-type.typedef-72.5">
-          <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-72.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-74.5">
+          <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-74.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -234056,11 +230028,7 @@ <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCap
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-79.5)</code>
-=======
-                      <code>  (typedef-72.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-74.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -234204,13 +230172,8 @@ <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCap
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-79.6">
-          <h3>41.33. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/SubscriptionPolicy#complexType (typedef-79.6)</code>
-=======
-        <div class="sect2" id="local-type.typedef-72.6">
-          <h3>41.33. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/SubscriptionPolicy#complexType (typedef-72.6)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-74.6">
+          <h3>41.33. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/SubscriptionPolicy#complexType (typedef-74.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -234230,11 +230193,7 @@ <h3>41.33. The complex type <code>complexType[siri:ProductionTimetableServiceCap
                       <br/>
                       <code>  /SubscriptionPolicy #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-79.6)</code>
-=======
-                      <code>  (typedef-72.6)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-74.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -234949,11 +230908,7 @@ <h3>42.11. The group <code>siri:SituationExchangePayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-73.3" title="local-type: typedef-73.3">local-type: typedef-73.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-77.3" title="local-type: typedef-77.3">local-type: typedef-77.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
                       </em>
                     </p>
                   </td>
@@ -235724,11 +231679,7 @@ <h3>42.14. The group <code>siri:SituationExchangeTopicGroup</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Referance to an OPERATOR. If unspecified, all OPERATOR.s.</p>
-=======
                     <p class="tableblock darkbrown">Reference to an OPERATOR. If unspecified, all OPERATOR.s.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -235823,11 +231774,7 @@ <h3>42.14. The group <code>siri:SituationExchangeTopicGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-73.2" title="local-type: typedef-73.2">local-type: typedef-73.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
                       </em>
                     </p>
                   </td>
@@ -236140,11 +232087,7 @@ <h3>42.14. The group <code>siri:SituationExchangeTopicGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-73.1" title="local-type: typedef-73.1">local-type: typedef-73.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-77.1" title="local-type: typedef-77.1">local-type: typedef-77.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-82.1" title="local-type: typedef-82.1">local-type: typedef-82.1</a>
                       </em>
                     </p>
                   </td>
@@ -236423,11 +232366,7 @@ <h3>42.17. The group <code>siri:SituationNetworkFilterGroup</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Referance to an OPERATOR. If unspecified, all OPERATOR.s.</p>
-=======
                     <p class="tableblock darkbrown">Reference to an OPERATOR. If unspecified, all OPERATOR.s.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -236522,11 +232461,7 @@ <h3>42.17. The group <code>siri:SituationNetworkFilterGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-73.2" title="local-type: typedef-73.2">local-type: typedef-73.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
                       </em>
                     </p>
                   </td>
@@ -237691,11 +233626,7 @@ <h3>42.26. The complex type <code>siri:SituationExchangeCapabilitiesResponseStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-73.8" title="local-type: typedef-73.8">local-type: typedef-73.8</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-77.8" title="local-type: typedef-77.8">local-type: typedef-77.8</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-82.8" title="local-type: typedef-82.8">local-type: typedef-82.8</a>
                       </em>
                     </p>
                   </td>
@@ -238203,11 +234134,7 @@ <h3>42.28. The complex type <code>siri:SituationExchangeDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-73.3" title="local-type: typedef-73.3">local-type: typedef-73.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-77.3" title="local-type: typedef-77.3">local-type: typedef-77.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
                       </em>
                     </p>
                   </td>
@@ -238947,11 +234874,7 @@ <h3>42.29. The complex type <code>siri:SituationExchangeRequestStructure</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Referance to an OPERATOR. If unspecified, all OPERATOR.s.</p>
-=======
                     <p class="tableblock darkbrown">Reference to an OPERATOR. If unspecified, all OPERATOR.s.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -239046,11 +234969,7 @@ <h3>42.29. The complex type <code>siri:SituationExchangeRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-73.2" title="local-type: typedef-73.2">local-type: typedef-73.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
                       </em>
                     </p>
                   </td>
@@ -239363,11 +235282,7 @@ <h3>42.29. The complex type <code>siri:SituationExchangeRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-73.1" title="local-type: typedef-73.1">local-type: typedef-73.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-77.1" title="local-type: typedef-77.1">local-type: typedef-77.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-82.1" title="local-type: typedef-82.1">local-type: typedef-82.1</a>
                       </em>
                     </p>
                   </td>
@@ -239592,11 +235507,7 @@ <h3>42.30. The complex type <code>siri:SituationExchangeServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-73.4" title="local-type: typedef-73.4">local-type: typedef-73.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-77.4" title="local-type: typedef-77.4">local-type: typedef-77.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
                       </em>
                     </p>
                   </td>
@@ -239620,11 +235531,7 @@ <h3>42.30. The complex type <code>siri:SituationExchangeServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-73.5" title="local-type: typedef-73.5">local-type: typedef-73.5</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-77.5" title="local-type: typedef-77.5">local-type: typedef-77.5</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-82.5" title="local-type: typedef-82.5">local-type: typedef-82.5</a>
                       </em>
                     </p>
                   </td>
@@ -239672,11 +235579,7 @@ <h3>42.30. The complex type <code>siri:SituationExchangeServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-73.6" title="local-type: typedef-73.6">local-type: typedef-73.6</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-77.6" title="local-type: typedef-77.6">local-type: typedef-77.6</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-82.6" title="local-type: typedef-82.6">local-type: typedef-82.6</a>
                       </em>
                     </p>
                   </td>
@@ -239700,11 +235603,7 @@ <h3>42.30. The complex type <code>siri:SituationExchangeServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-73.7" title="local-type: typedef-73.7">local-type: typedef-73.7</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-77.7" title="local-type: typedef-77.7">local-type: typedef-77.7</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-82.7" title="local-type: typedef-82.7">local-type: typedef-82.7</a>
                       </em>
                     </p>
                   </td>
@@ -239863,11 +235762,7 @@ <h3>42.31. The complex type <code>siri:SituationExchangeServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-36.1" title="local-type: typedef-36.1">local-type: typedef-36.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-50.1" title="local-type: typedef-50.1">local-type: typedef-50.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
                       </em>
                     </p>
                   </td>
@@ -239901,11 +235796,7 @@ <h3>42.31. The complex type <code>siri:SituationExchangeServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-56.2" title="local-type: typedef-56.2">local-type: typedef-56.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-8.2" title="local-type: typedef-8.2">local-type: typedef-8.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-68.2" title="local-type: typedef-68.2">local-type: typedef-68.2</a>
                       </em>
                     </p>
                   </td>
@@ -239934,11 +235825,7 @@ <h3>42.31. The complex type <code>siri:SituationExchangeServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-56.1" title="local-type: typedef-56.1">local-type: typedef-56.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-8.1" title="local-type: typedef-8.1">local-type: typedef-8.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -240194,13 +236081,8 @@ <h3>42.32. The complex type <code>siri:SituationExchangeSubscriptionStructure</c
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-73.8">
-          <h3>42.33. The complex type <code>element[siri:SituationExchangePermissions]#complexType (typedef-73.8)</code>
-=======
-        <div class="sect2" id="local-type.typedef-77.8">
-          <h3>42.33. The complex type <code>element[siri:SituationExchangePermissions]#complexType (typedef-77.8)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-82.8">
+          <h3>42.33. The complex type <code>element[siri:SituationExchangePermissions]#complexType (typedef-82.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -240220,11 +236102,7 @@ <h3>42.33. The complex type <code>element[siri:SituationExchangePermissions]#com
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-73.8)</code>
-=======
-                      <code>  (typedef-77.8)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-82.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -240298,13 +236176,8 @@ <h3>42.33. The complex type <code>element[siri:SituationExchangePermissions]#com
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-73.3">
-          <h3>42.34. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situations#complexType (typedef-73.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-77.3">
-          <h3>42.34. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situations#complexType (typedef-77.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-82.3">
+          <h3>42.34. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situations#complexType (typedef-82.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -240324,11 +236197,7 @@ <h3>42.34. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situ
                       <br/>
                       <code>  /Situations #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-73.3)</code>
-=======
-                      <code>  (typedef-77.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-82.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -240384,24 +236253,15 @@ <h3>42.34. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situ
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Type for individual IPT ncident.</p>
-=======
                     <p class="tableblock darkbrown">Type for individual PT incident.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-73.2">
-          <h3>42.35. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-73.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-77.2">
-          <h3>42.35. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-77.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>42.35. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -240421,11 +236281,7 @@ <h3>42.35. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-73.2)</code>
-=======
-                      <code>  (typedef-77.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -240467,13 +236323,8 @@ <h3>42.35. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-73.1">
-          <h3>42.36. The complex type <code>group[siri:SituationExchangeTopicGroup]/SituationRoadFilter#complexType (typedef-73.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-77.1">
-          <h3>42.36. The complex type <code>group[siri:SituationExchangeTopicGroup]/SituationRoadFilter#complexType (typedef-77.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-82.1">
+          <h3>42.36. The complex type <code>group[siri:SituationExchangeTopicGroup]/SituationRoadFilter#complexType (typedef-82.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -240493,11 +236344,7 @@ <h3>42.36. The complex type <code>group[siri:SituationExchangeTopicGroup]/Situat
                       <br/>
                       <code>  /SituationRoadFilter #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-73.1)</code>
-=======
-                      <code>  (typedef-77.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-82.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -240539,13 +236386,8 @@ <h3>42.36. The complex type <code>group[siri:SituationExchangeTopicGroup]/Situat
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-73.2">
-          <h3>42.37. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-73.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-77.2">
-          <h3>42.37. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-77.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>42.37. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -240565,11 +236407,7 @@ <h3>42.37. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-73.2)</code>
-=======
-                      <code>  (typedef-77.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -240611,13 +236449,8 @@ <h3>42.37. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-73.8">
-          <h3>42.38. The complex type <code>element[siri:SituationExchangePermissions]#complexType (typedef-73.8)</code>
-=======
-        <div class="sect2" id="local-type.typedef-77.8">
-          <h3>42.38. The complex type <code>element[siri:SituationExchangePermissions]#complexType (typedef-77.8)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-82.8">
+          <h3>42.38. The complex type <code>element[siri:SituationExchangePermissions]#complexType (typedef-82.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -240637,11 +236470,7 @@ <h3>42.38. The complex type <code>element[siri:SituationExchangePermissions]#com
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-73.8)</code>
-=======
-                      <code>  (typedef-77.8)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-82.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -240715,13 +236544,8 @@ <h3>42.38. The complex type <code>element[siri:SituationExchangePermissions]#com
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-73.3">
-          <h3>42.39. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situations#complexType (typedef-73.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-77.3">
-          <h3>42.39. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situations#complexType (typedef-77.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-82.3">
+          <h3>42.39. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situations#complexType (typedef-82.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -240741,11 +236565,7 @@ <h3>42.39. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situ
                       <br/>
                       <code>  /Situations #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-73.3)</code>
-=======
-                      <code>  (typedef-77.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-82.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -240801,24 +236621,15 @@ <h3>42.39. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situ
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Type for individual IPT ncident.</p>
-=======
                     <p class="tableblock darkbrown">Type for individual PT incident.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-73.2">
-          <h3>42.40. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-73.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-77.2">
-          <h3>42.40. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-77.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>42.40. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -240838,11 +236649,7 @@ <h3>42.40. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-73.2)</code>
-=======
-                      <code>  (typedef-77.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -240884,13 +236691,8 @@ <h3>42.40. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-73.1">
-          <h3>42.41. The complex type <code>group[siri:SituationExchangeTopicGroup]/SituationRoadFilter#complexType (typedef-73.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-77.1">
-          <h3>42.41. The complex type <code>group[siri:SituationExchangeTopicGroup]/SituationRoadFilter#complexType (typedef-77.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-82.1">
+          <h3>42.41. The complex type <code>group[siri:SituationExchangeTopicGroup]/SituationRoadFilter#complexType (typedef-82.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -240910,11 +236712,7 @@ <h3>42.41. The complex type <code>group[siri:SituationExchangeTopicGroup]/Situat
                       <br/>
                       <code>  /SituationRoadFilter #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-73.1)</code>
-=======
-                      <code>  (typedef-77.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-82.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -240956,13 +236754,8 @@ <h3>42.41. The complex type <code>group[siri:SituationExchangeTopicGroup]/Situat
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-73.4">
-          <h3>42.42. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-73.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-77.4">
-          <h3>42.42. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-77.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-82.4">
+          <h3>42.42. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-82.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -240982,11 +236775,7 @@ <h3>42.42. The complex type <code>complexType[siri:SituationExchangeServiceCapab
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-73.4)</code>
-=======
-                      <code>  (typedef-77.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-82.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -241335,13 +237124,8 @@ <h3>42.42. The complex type <code>complexType[siri:SituationExchangeServiceCapab
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-73.5">
-          <h3>42.43. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-73.5)</code>
-=======
-        <div class="sect2" id="local-type.typedef-77.5">
-          <h3>42.43. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-77.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-82.5">
+          <h3>42.43. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-82.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -241361,11 +237145,7 @@ <h3>42.43. The complex type <code>complexType[siri:SituationExchangeServiceCapab
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-73.5)</code>
-=======
-                      <code>  (typedef-77.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-82.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -241537,13 +237317,8 @@ <h3>42.43. The complex type <code>complexType[siri:SituationExchangeServiceCapab
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-73.6">
-          <h3>42.44. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/AccessControl#complexType (typedef-73.6)</code>
-=======
-        <div class="sect2" id="local-type.typedef-77.6">
-          <h3>42.44. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/AccessControl#complexType (typedef-77.6)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-82.6">
+          <h3>42.44. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/AccessControl#complexType (typedef-82.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -241563,11 +237338,7 @@ <h3>42.44. The complex type <code>complexType[siri:SituationExchangeServiceCapab
                       <br/>
                       <code>  /AccessControl #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-73.6)</code>
-=======
-                      <code>  (typedef-77.6)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-82.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -241668,13 +237439,8 @@ <h3>42.44. The complex type <code>complexType[siri:SituationExchangeServiceCapab
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-73.7">
-          <h3>42.45. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-73.7)</code>
-=======
-        <div class="sect2" id="local-type.typedef-77.7">
-          <h3>42.45. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-77.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-82.7">
+          <h3>42.45. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-82.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -241694,11 +237460,7 @@ <h3>42.45. The complex type <code>complexType[siri:SituationExchangeServiceCapab
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-73.7)</code>
-=======
-                      <code>  (typedef-77.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-82.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -241712,13 +237474,8 @@ <h3>42.45. The complex type <code>complexType[siri:SituationExchangeServiceCapab
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-36.1">
-          <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-36.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-50.1">
-          <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-50.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-39.1">
+          <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-39.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -241738,11 +237495,7 @@ <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-36.1)</code>
-=======
-                      <code>  (typedef-50.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-39.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -241810,13 +237563,8 @@ <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-56.2">
-          <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-56.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-8.2">
-          <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-8.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-68.2">
+          <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-68.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -241836,11 +237584,7 @@ <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-56.2)</code>
-=======
-                      <code>  (typedef-8.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-68.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -241925,13 +237669,8 @@ <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-56.1">
-          <h3>42.48. The complex type <code>element[siri:LinePermissions]#complexType (typedef-56.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-8.1">
-          <h3>42.48. The complex type <code>element[siri:LinePermissions]#complexType (typedef-8.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-68.1">
+          <h3>42.48. The complex type <code>element[siri:LinePermissions]#complexType (typedef-68.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -241951,11 +237690,7 @@ <h3>42.48. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-56.1)</code>
-=======
-                      <code>  (typedef-8.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-68.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -243490,11 +239225,7 @@ <h3>43.23. The group <code>siri:StopMonitoringRequestPolicyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-81.1" title="local-type: typedef-81.1">local-type: typedef-81.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-80.1" title="local-type: typedef-80.1">local-type: typedef-80.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-84.1" title="local-type: typedef-84.1">local-type: typedef-84.1</a>
                       </em>
                     </p>
                   </td>
@@ -246047,11 +241778,7 @@ <h3>43.35. The complex type <code>siri:StopMonitoringCapabilitiesResponseStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-81.5" title="local-type: typedef-81.5">local-type: typedef-81.5</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-80.5" title="local-type: typedef-80.5">local-type: typedef-80.5</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-84.5" title="local-type: typedef-84.5">local-type: typedef-84.5</a>
                       </em>
                     </p>
                   </td>
@@ -247383,11 +243110,7 @@ <h3>43.39. The complex type <code>siri:StopMonitoringFilterStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-81.1" title="local-type: typedef-81.1">local-type: typedef-81.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-80.1" title="local-type: typedef-80.1">local-type: typedef-80.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-84.1" title="local-type: typedef-84.1">local-type: typedef-84.1</a>
                       </em>
                     </p>
                   </td>
@@ -248066,11 +243789,7 @@ <h3>43.41. The complex type <code>siri:StopMonitoringRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-81.1" title="local-type: typedef-81.1">local-type: typedef-81.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-80.1" title="local-type: typedef-80.1">local-type: typedef-80.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-84.1" title="local-type: typedef-84.1">local-type: typedef-84.1</a>
                       </em>
                     </p>
                   </td>
@@ -248210,11 +243929,7 @@ <h3>43.42. The complex type <code>siri:StopMonitoringServiceCapabilitiesStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-81.2" title="local-type: typedef-81.2">local-type: typedef-81.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-80.2" title="local-type: typedef-80.2">local-type: typedef-80.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-84.2" title="local-type: typedef-84.2">local-type: typedef-84.2</a>
                       </em>
                     </p>
                   </td>
@@ -248238,11 +243953,7 @@ <h3>43.42. The complex type <code>siri:StopMonitoringServiceCapabilitiesStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-81.3" title="local-type: typedef-81.3">local-type: typedef-81.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-80.3" title="local-type: typedef-80.3">local-type: typedef-80.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-84.3" title="local-type: typedef-84.3">local-type: typedef-84.3</a>
                       </em>
                     </p>
                   </td>
@@ -248314,11 +244025,7 @@ <h3>43.42. The complex type <code>siri:StopMonitoringServiceCapabilitiesStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-81.4" title="local-type: typedef-81.4">local-type: typedef-81.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-80.4" title="local-type: typedef-80.4">local-type: typedef-80.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-84.4" title="local-type: typedef-84.4">local-type: typedef-84.4</a>
                       </em>
                     </p>
                   </td>
@@ -248452,11 +244159,7 @@ <h3>43.43. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-36.1" title="local-type: typedef-36.1">local-type: typedef-36.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-50.1" title="local-type: typedef-50.1">local-type: typedef-50.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
                       </em>
                     </p>
                   </td>
@@ -248490,11 +244193,7 @@ <h3>43.43. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-56.2" title="local-type: typedef-56.2">local-type: typedef-56.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-8.2" title="local-type: typedef-8.2">local-type: typedef-8.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-68.2" title="local-type: typedef-68.2">local-type: typedef-68.2</a>
                       </em>
                     </p>
                   </td>
@@ -248523,11 +244222,7 @@ <h3>43.43. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-56.1" title="local-type: typedef-56.1">local-type: typedef-56.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-8.1" title="local-type: typedef-8.1">local-type: typedef-8.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -248555,11 +244250,7 @@ <h3>43.43. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-81.6" title="local-type: typedef-81.6">local-type: typedef-81.6</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-80.6" title="local-type: typedef-80.6">local-type: typedef-80.6</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-84.6" title="local-type: typedef-84.6">local-type: typedef-84.6</a>
                       </em>
                     </p>
                   </td>
@@ -249262,13 +244953,8 @@ <h3>43.46. The complex type <code>siri:StopNoticeStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-81.5">
-          <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-81.5)</code>
-=======
-        <div class="sect2" id="local-type.typedef-80.5">
-          <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-80.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-84.5">
+          <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-84.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -249288,11 +244974,7 @@ <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-81.5)</code>
-=======
-                      <code>  (typedef-80.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-84.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -249366,13 +245048,8 @@ <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#comple
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-81.1">
-          <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-81.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-80.1">
-          <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-84.1">
+          <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-84.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -249392,11 +245069,7 @@ <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-81.1)</code>
-=======
-                      <code>  (typedef-80.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-84.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -249456,13 +245129,8 @@ <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-81.5">
-          <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-81.5)</code>
-=======
-        <div class="sect2" id="local-type.typedef-80.5">
-          <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-80.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-84.5">
+          <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-84.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -249482,11 +245150,7 @@ <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-81.5)</code>
-=======
-                      <code>  (typedef-80.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-84.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -249560,13 +245224,8 @@ <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#comple
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-81.1">
-          <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-81.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-80.1">
-          <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-84.1">
+          <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-84.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -249586,11 +245245,7 @@ <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-81.1)</code>
-=======
-                      <code>  (typedef-80.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-84.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -249650,13 +245305,8 @@ <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-81.1">
-          <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-81.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-80.1">
-          <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-84.1">
+          <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-84.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -249676,11 +245326,7 @@ <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-81.1)</code>
-=======
-                      <code>  (typedef-80.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-84.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -249740,13 +245386,8 @@ <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-81.2">
-          <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-81.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-80.2">
-          <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-80.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-84.2">
+          <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-84.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -249766,11 +245407,7 @@ <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-81.2)</code>
-=======
-                      <code>  (typedef-80.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-84.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -249963,13 +245600,8 @@ <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-81.3">
-          <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-81.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-80.3">
-          <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-80.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-84.3">
+          <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-84.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -249989,11 +245621,7 @@ <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-81.3)</code>
-=======
-                      <code>  (typedef-80.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-84.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250333,13 +245961,8 @@ <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-81.4">
-          <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-81.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-80.4">
-          <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-80.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-84.4">
+          <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-84.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250359,11 +245982,7 @@ <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-81.4)</code>
-=======
-                      <code>  (typedef-80.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-84.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250423,13 +246042,8 @@ <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-36.1">
-          <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-36.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-50.1">
-          <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-50.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-39.1">
+          <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-39.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250449,11 +246063,7 @@ <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-36.1)</code>
-=======
-                      <code>  (typedef-50.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-39.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250521,13 +246131,8 @@ <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-56.2">
-          <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-56.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-8.2">
-          <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-8.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-68.2">
+          <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-68.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250547,11 +246152,7 @@ <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-56.2)</code>
-=======
-                      <code>  (typedef-8.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-68.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250636,13 +246237,8 @@ <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-56.1">
-          <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typedef-56.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-8.1">
-          <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typedef-8.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-68.1">
+          <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typedef-68.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250662,11 +246258,7 @@ <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-56.1)</code>
-=======
-                      <code>  (typedef-8.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-68.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250751,13 +246343,8 @@ <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-81.6">
-          <h3>43.58. The complex type <code>complexType[siri:StopMonitoringServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-81.6)</code>
-=======
-        <div class="sect2" id="local-type.typedef-80.6">
-          <h3>43.58. The complex type <code>complexType[siri:StopMonitoringServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-80.6)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-84.6">
+          <h3>43.58. The complex type <code>complexType[siri:StopMonitoringServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-84.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250777,11 +246364,7 @@ <h3>43.58. The complex type <code>complexType[siri:StopMonitoringServicePermissi
                       <br/>
                       <code>  /StopMonitorPermissions #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-81.6)</code>
-=======
-                      <code>  (typedef-80.6)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-84.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -251925,11 +247508,7 @@ <h3>44.13. The complex type <code>siri:StopTimetableCapabilitiesResponseStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-76.3" title="local-type: typedef-76.3">local-type: typedef-76.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-72.3" title="local-type: typedef-72.3">local-type: typedef-72.3</a>
                       </em>
                     </p>
                   </td>
@@ -253073,11 +248652,7 @@ <h3>44.18. The complex type <code>siri:StopTimetableServiceCapabilitiesStructure
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-82.1" title="local-type: typedef-82.1">local-type: typedef-82.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-76.1" title="local-type: typedef-76.1">local-type: typedef-76.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
                       </em>
                     </p>
                   </td>
@@ -253125,11 +248700,7 @@ <h3>44.18. The complex type <code>siri:StopTimetableServiceCapabilitiesStructure
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-76.2" title="local-type: typedef-76.2">local-type: typedef-76.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
                       </em>
                     </p>
                   </td>
@@ -253288,11 +248859,7 @@ <h3>44.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-36.1" title="local-type: typedef-36.1">local-type: typedef-36.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-50.1" title="local-type: typedef-50.1">local-type: typedef-50.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
                       </em>
                     </p>
                   </td>
@@ -253326,11 +248893,7 @@ <h3>44.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-56.2" title="local-type: typedef-56.2">local-type: typedef-56.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-8.2" title="local-type: typedef-8.2">local-type: typedef-8.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-68.2" title="local-type: typedef-68.2">local-type: typedef-68.2</a>
                       </em>
                     </p>
                   </td>
@@ -253359,11 +248922,7 @@ <h3>44.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-56.1" title="local-type: typedef-56.1">local-type: typedef-56.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-8.1" title="local-type: typedef-8.1">local-type: typedef-8.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -253391,11 +248950,7 @@ <h3>44.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-76.4" title="local-type: typedef-76.4">local-type: typedef-76.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-72.4" title="local-type: typedef-72.4">local-type: typedef-72.4</a>
                       </em>
                     </p>
                   </td>
@@ -254351,13 +249906,8 @@ <h3>44.22. The complex type <code>siri:TimetabledStopVisitStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-82.3">
-          <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-82.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-76.3">
-          <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-76.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-72.3">
+          <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-72.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -254377,11 +249927,7 @@ <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complex
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-82.3)</code>
-=======
-                      <code>  (typedef-76.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-72.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -254455,13 +250001,8 @@ <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complex
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-82.3">
-          <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-82.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-76.3">
-          <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-76.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-72.3">
+          <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-72.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -254481,11 +250022,7 @@ <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complex
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-82.3)</code>
-=======
-                      <code>  (typedef-76.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-72.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -254559,13 +250096,8 @@ <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complex
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-82.1">
-          <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-82.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-76.1">
-          <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-76.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-72.1">
+          <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-72.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -254585,11 +250117,7 @@ <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-82.1)</code>
-=======
-                      <code>  (typedef-76.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-72.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -254683,13 +250211,8 @@ <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-82.2">
-          <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/AccessControl#complexType (typedef-82.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-76.2">
-          <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/AccessControl#complexType (typedef-76.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-72.2">
+          <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/AccessControl#complexType (typedef-72.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -254709,11 +250232,7 @@ <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
                       <br/>
                       <code>  /AccessControl #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-82.2)</code>
-=======
-                      <code>  (typedef-76.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-72.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -254838,13 +250357,8 @@ <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-36.1">
-          <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-36.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-50.1">
-          <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-50.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-39.1">
+          <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-39.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -254864,11 +250378,7 @@ <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-36.1)</code>
-=======
-                      <code>  (typedef-50.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-39.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -254936,13 +250446,8 @@ <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-56.2">
-          <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-56.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-8.2">
-          <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-8.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-68.2">
+          <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-68.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -254962,11 +250467,7 @@ <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-56.2)</code>
-=======
-                      <code>  (typedef-8.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-68.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -255051,13 +250552,8 @@ <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-56.1">
-          <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typedef-56.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-8.1">
-          <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typedef-8.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-68.1">
+          <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typedef-68.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -255077,11 +250573,7 @@ <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-56.1)</code>
-=======
-                      <code>  (typedef-8.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-68.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -255166,13 +250658,8 @@ <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-82.4">
-          <h3>44.30. The complex type <code>complexType[siri:StopTimetableServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-82.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-76.4">
-          <h3>44.30. The complex type <code>complexType[siri:StopTimetableServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-76.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-72.4">
+          <h3>44.30. The complex type <code>complexType[siri:StopTimetableServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-72.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -255192,11 +250679,7 @@ <h3>44.30. The complex type <code>complexType[siri:StopTimetableServicePermissio
                       <br/>
                       <code>  /StopMonitorPermissions #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-82.4)</code>
-=======
-                      <code>  (typedef-76.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-72.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -255336,11 +250819,7 @@ <h3>45.1. Simple type definitions</h3>
                     <p class="tableblock">xs:nonNegativeInteger: (empty restriction)</p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock anno-text">Distance (metres) as defined by http://www.ordnancesurvey.co.uk/xml/resource/units.xml#metres. ALternative units may be specifed by context.</p>
-=======
                     <p class="tableblock anno-text">Distance (in metres) as defined by http://www.ordnancesurvey.co.uk/xml/resource/units.xml#metres.</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -255400,11 +250879,7 @@ <h3>45.1. Simple type definitions</h3>
                     <p class="tableblock">xs:nonNegativeInteger: (empty restriction)</p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock anno-text">Distance (metres per second) ALternative unist may be specifed by context.</p>
-=======
                     <p class="tableblock anno-text">Velocity (in metres per second).</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
               </tbody>
@@ -256605,11 +252080,7 @@ <h3>47.2. The complex type <code>siri:AbstractPermissionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-36.1" title="local-type: typedef-36.1">local-type: typedef-36.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-50.1" title="local-type: typedef-50.1">local-type: typedef-50.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
                       </em>
                     </p>
                   </td>
@@ -256737,13 +252208,8 @@ <h3>47.4. The complex type <code>siri:CapabilityAccessControlStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-36.1">
-          <h3>47.5. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-36.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-50.1">
-          <h3>47.5. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-50.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-39.1">
+          <h3>47.5. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-39.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -256763,11 +252229,7 @@ <h3>47.5. The complex type <code>complexType[siri:AbstractPermissionStructure]/G
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-36.1)</code>
-=======
-                      <code>  (typedef-50.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-39.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -256887,7 +252349,7 @@ <h3>48.1. Simple type definitions</h3>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">xs:NMTOKEN: (empty restriction)</p>
+                    <p class="tableblock">xs:normalizedString: (empty restriction)</p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">Id type for document references.</p>
@@ -256992,7 +252454,7 @@ <h3>48.1. Simple type definitions</h3>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">xs:duration: (empty restriction)</p>
+                    <p class="tableblock">xs:duration: value&gt;=PT0S</p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">Limited version of duration. Must be positive.</p>
@@ -257030,20 +252492,12 @@ <h3>48.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p id="local-type.typedef-24.1" class="tableblock">
-=======
-                    <p id="local-type.typedef-1.1" class="tableblock">
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                    <p id="local-type.typedef-6.1" class="tableblock">
                       <code>attribute[lang]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-24.1)</code>
-=======
-                      <code>  (typedef-1.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-6.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -259317,11 +254771,7 @@ <h3>50.14. The group <code>siri:VehicleMonitoringRequestPolicyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-80.1" title="local-type: typedef-80.1">local-type: typedef-80.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-75.1" title="local-type: typedef-75.1">local-type: typedef-75.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-77.1" title="local-type: typedef-77.1">local-type: typedef-77.1</a>
                       </em>
                     </p>
                   </td>
@@ -260444,11 +255894,7 @@ <h3>50.19. The complex type <code>siri:VehicleActivityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-80.2" title="local-type: typedef-80.2">local-type: typedef-80.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-75.2" title="local-type: typedef-75.2">local-type: typedef-75.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
                       </em>
                     </p>
                   </td>
@@ -260762,11 +256208,7 @@ <h3>50.20. The complex type <code>siri:VehicleMonitoringCapabilitiesResponseStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-80.7" title="local-type: typedef-80.7">local-type: typedef-80.7</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-75.7" title="local-type: typedef-75.7">local-type: typedef-75.7</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-77.7" title="local-type: typedef-77.7">local-type: typedef-77.7</a>
                       </em>
                     </p>
                   </td>
@@ -261906,11 +257348,7 @@ <h3>50.25. The complex type <code>siri:VehicleMonitoringRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-80.1" title="local-type: typedef-80.1">local-type: typedef-80.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-75.1" title="local-type: typedef-75.1">local-type: typedef-75.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-77.1" title="local-type: typedef-77.1">local-type: typedef-77.1</a>
                       </em>
                     </p>
                   </td>
@@ -262070,11 +257508,7 @@ <h3>50.26. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-80.3" title="local-type: typedef-80.3">local-type: typedef-80.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-75.3" title="local-type: typedef-75.3">local-type: typedef-75.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-77.3" title="local-type: typedef-77.3">local-type: typedef-77.3</a>
                       </em>
                     </p>
                   </td>
@@ -262098,11 +257532,7 @@ <h3>50.26. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-80.4" title="local-type: typedef-80.4">local-type: typedef-80.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-75.4" title="local-type: typedef-75.4">local-type: typedef-75.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-77.4" title="local-type: typedef-77.4">local-type: typedef-77.4</a>
                       </em>
                     </p>
                   </td>
@@ -262150,11 +257580,7 @@ <h3>50.26. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-80.5" title="local-type: typedef-80.5">local-type: typedef-80.5</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-75.5" title="local-type: typedef-75.5">local-type: typedef-75.5</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-77.5" title="local-type: typedef-77.5">local-type: typedef-77.5</a>
                       </em>
                     </p>
                   </td>
@@ -262178,11 +257604,7 @@ <h3>50.26. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-80.6" title="local-type: typedef-80.6">local-type: typedef-80.6</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-75.6" title="local-type: typedef-75.6">local-type: typedef-75.6</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-77.6" title="local-type: typedef-77.6">local-type: typedef-77.6</a>
                       </em>
                     </p>
                   </td>
@@ -262341,11 +257763,7 @@ <h3>50.27. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-36.1" title="local-type: typedef-36.1">local-type: typedef-36.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-50.1" title="local-type: typedef-50.1">local-type: typedef-50.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
                       </em>
                     </p>
                   </td>
@@ -262379,11 +257797,7 @@ <h3>50.27. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-56.2" title="local-type: typedef-56.2">local-type: typedef-56.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-8.2" title="local-type: typedef-8.2">local-type: typedef-8.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-68.2" title="local-type: typedef-68.2">local-type: typedef-68.2</a>
                       </em>
                     </p>
                   </td>
@@ -262412,11 +257826,7 @@ <h3>50.27. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-56.1" title="local-type: typedef-56.1">local-type: typedef-56.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-8.1" title="local-type: typedef-8.1">local-type: typedef-8.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -262444,11 +257854,7 @@ <h3>50.27. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-80.8" title="local-type: typedef-80.8">local-type: typedef-80.8</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-75.8" title="local-type: typedef-75.8">local-type: typedef-75.8</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-77.8" title="local-type: typedef-77.8">local-type: typedef-77.8</a>
                       </em>
                     </p>
                   </td>
@@ -262861,13 +258267,8 @@ <h3>50.29. The complex type <code>siri:VehicleMonitorPermissionStructure</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-80.7">
-          <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-80.7)</code>
-=======
-        <div class="sect2" id="local-type.typedef-75.7">
-          <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-75.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-77.7">
+          <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-77.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -262887,11 +258288,7 @@ <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-80.7)</code>
-=======
-                      <code>  (typedef-75.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-77.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -262965,13 +258362,8 @@ <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-80.1">
-          <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-75.1">
-          <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-75.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-77.1">
+          <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-77.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -262991,11 +258383,7 @@ <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-80.1)</code>
-=======
-                      <code>  (typedef-75.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-77.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -263055,13 +258443,8 @@ <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-80.2">
-          <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/MonitoredVehicleJourney#complexType (typedef-80.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-75.2">
-          <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/MonitoredVehicleJourney#complexType (typedef-75.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-77.2">
+          <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/MonitoredVehicleJourney#complexType (typedef-77.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -263081,11 +258464,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                       <br/>
                       <code>  /MonitoredVehicleJourney #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-80.2)</code>
-=======
-                      <code>  (typedef-75.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-77.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -263527,11 +258906,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -263552,11 +258927,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -263577,11 +258948,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -263666,11 +259033,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -263691,11 +259054,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguagePlaceNameStructure" title="siri:NaturalLanguagePlaceNameStructure">siri:NaturalLanguagePlaceNameStructure</a>
-=======
                       <em>&gt;<a shape="rect" href="#type.siri:NaturalLanguageStringStructure" title="siri:NaturalLanguageStringStructure">siri:NaturalLanguageStringStructure</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                       </em>
                     </p>
                   </td>
@@ -264268,11 +259627,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-<<<<<<< HEAD
-                    <p class="tableblock darkbrown">Velocity of VEHICLE. EIther actual speed or average speed may be used. (since SIRI 2.0)</p>
-=======
                     <p class="tableblock darkbrown">Velocity of VEHICLE. Either actual speed or average speed may be used. (since SIRI 2.0)</p>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
                   </td>
                 </tr>
                 <tr>
@@ -264576,11 +259931,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-57.4" title="local-type: typedef-57.4">local-type: typedef-57.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-14.4" title="local-type: typedef-14.4">local-type: typedef-14.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-53.4" title="local-type: typedef-53.4">local-type: typedef-53.4</a>
                       </em>
                     </p>
                   </td>
@@ -264601,11 +259952,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-57.5" title="local-type: typedef-57.5">local-type: typedef-57.5</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-14.5" title="local-type: typedef-14.5">local-type: typedef-14.5</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-53.5" title="local-type: typedef-53.5">local-type: typedef-53.5</a>
                       </em>
                     </p>
                   </td>
@@ -264629,11 +259976,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.2" title="local-type: typedef-50.2">local-type: typedef-50.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.2" title="local-type: typedef-54.2">local-type: typedef-54.2</a>
                       </em>
                     </p>
                   </td>
@@ -264654,11 +259997,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.3" title="local-type: typedef-50.3">local-type: typedef-50.3</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.3" title="local-type: typedef-54.3">local-type: typedef-54.3</a>
                       </em>
                     </p>
                   </td>
@@ -264679,11 +260018,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-50.4" title="local-type: typedef-50.4">local-type: typedef-50.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-54.4" title="local-type: typedef-54.4">local-type: typedef-54.4</a>
                       </em>
                     </p>
                   </td>
@@ -264781,13 +260116,8 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-57.4">
-          <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-57.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-14.4">
-          <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-14.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-53.4">
+          <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-53.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -264807,11 +260137,7 @@ <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-57.4)</code>
-=======
-                      <code>  (typedef-14.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-53.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -264853,13 +260179,8 @@ <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-57.5">
-          <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-57.5)</code>
-=======
-        <div class="sect2" id="local-type.typedef-14.5">
-          <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-14.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-53.5">
+          <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-53.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -264879,11 +260200,7 @@ <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-57.5)</code>
-=======
-                      <code>  (typedef-14.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-53.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -264925,13 +260242,8 @@ <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.2">
-          <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-50.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.2">
-          <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.2">
+          <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-54.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -264951,11 +260263,7 @@ <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.2)</code>
-=======
-                      <code>  (typedef-18.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -265042,13 +260350,8 @@ <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.3">
-          <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-50.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.3">
-          <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.3">
+          <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-54.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -265068,11 +260371,7 @@ <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.3)</code>
-=======
-                      <code>  (typedef-18.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -265159,13 +260458,8 @@ <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-50.4">
-          <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-50.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-18.4">
-          <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-54.4">
+          <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-54.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -265185,11 +260479,7 @@ <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-50.4)</code>
-=======
-                      <code>  (typedef-18.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-54.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -265276,13 +260566,8 @@ <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-80.7">
-          <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-80.7)</code>
-=======
-        <div class="sect2" id="local-type.typedef-75.7">
-          <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-75.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-77.7">
+          <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-77.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -265302,11 +260587,7 @@ <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-80.7)</code>
-=======
-                      <code>  (typedef-75.7)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-77.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -265380,13 +260661,8 @@ <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-80.1">
-          <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-75.1">
-          <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-75.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-77.1">
+          <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-77.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -265406,11 +260682,7 @@ <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-80.1)</code>
-=======
-                      <code>  (typedef-75.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-77.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -265470,13 +260742,8 @@ <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-80.3">
-          <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-80.3)</code>
-=======
-        <div class="sect2" id="local-type.typedef-75.3">
-          <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-75.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-77.3">
+          <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-77.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -265496,11 +260763,7 @@ <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-80.3)</code>
-=======
-                      <code>  (typedef-75.3)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-77.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -265642,13 +260905,8 @@ <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-80.4">
-          <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-80.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-75.4">
-          <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-75.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-77.4">
+          <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-77.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -265668,11 +260926,7 @@ <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-80.4)</code>
-=======
-                      <code>  (typedef-75.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-77.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -265946,13 +261200,8 @@ <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-80.5">
-          <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-80.5)</code>
-=======
-        <div class="sect2" id="local-type.typedef-75.5">
-          <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-75.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-77.5">
+          <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-77.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -265972,11 +261221,7 @@ <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
                       <br/>
                       <code>  /AccessControl #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-80.5)</code>
-=======
-                      <code>  (typedef-75.5)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-77.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -266100,13 +261345,8 @@ <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-80.6">
-          <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-80.6)</code>
-=======
-        <div class="sect2" id="local-type.typedef-75.6">
-          <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-75.6)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-77.6">
+          <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-77.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -266126,11 +261366,7 @@ <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-80.6)</code>
-=======
-                      <code>  (typedef-75.6)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-77.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -266190,13 +261426,8 @@ <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-36.1">
-          <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-36.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-50.1">
-          <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-50.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-39.1">
+          <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-39.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -266216,11 +261447,7 @@ <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-36.1)</code>
-=======
-                      <code>  (typedef-50.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-39.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -266288,13 +261515,8 @@ <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-56.2">
-          <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-56.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-8.2">
-          <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-8.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-68.2">
+          <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-68.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -266314,11 +261536,7 @@ <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-56.2)</code>
-=======
-                      <code>  (typedef-8.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-68.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -266403,13 +261621,8 @@ <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-56.1">
-          <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typedef-56.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-8.1">
-          <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typedef-8.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-68.1">
+          <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typedef-68.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -266429,11 +261642,7 @@ <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-56.1)</code>
-=======
-                      <code>  (typedef-8.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-68.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -266518,13 +261727,8 @@ <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-80.8">
-          <h3>50.47. The complex type <code>complexType[siri:VehicleMonitoringServicePermissionStructure]/VehicleMonitoringPermissions#complexType (typedef-80.8)</code>
-=======
-        <div class="sect2" id="local-type.typedef-75.8">
-          <h3>50.47. The complex type <code>complexType[siri:VehicleMonitoringServicePermissionStructure]/VehicleMonitoringPermissions#complexType (typedef-75.8)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-77.8">
+          <h3>50.47. The complex type <code>complexType[siri:VehicleMonitoringServicePermissionStructure]/VehicleMonitoringPermissions#complexType (typedef-77.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -266544,11 +261748,7 @@ <h3>50.47. The complex type <code>complexType[siri:VehicleMonitoringServicePermi
                       <br/>
                       <code>  /VehicleMonitoringPermissions #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-80.8)</code>
-=======
-                      <code>  (typedef-75.8)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-77.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -266731,11 +261931,7 @@ <h3>51.1. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
                       </em>
                     </p>
                   </td>
@@ -266766,11 +261962,7 @@ <h3>51.1. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-33.2" title="local-type: typedef-33.2">local-type: typedef-33.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-58.2" title="local-type: typedef-58.2">local-type: typedef-58.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-40.2" title="local-type: typedef-40.2">local-type: typedef-40.2</a>
                       </em>
                     </p>
                   </td>
@@ -267156,11 +262348,7 @@ <h3>51.1. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-77.4" title="local-type: typedef-77.4">local-type: typedef-77.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-85.4" title="local-type: typedef-85.4">local-type: typedef-85.4</a>
                       </em>
                     </p>
                   </td>
@@ -267342,13 +262530,8 @@ <h3>51.1. The toplevel element <code>siri:Siri</code>
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-84.1">
-          <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-84.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-81.1">
-          <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-81.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-80.1">
+          <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-80.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -267368,11 +262551,7 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-81.1)</
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-84.1)</code>
-=======
-                      <code>  (typedef-81.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-80.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -267450,11 +262629,7 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-81.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
                       </em>
                     </p>
                   </td>
@@ -267485,11 +262660,7 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-81.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-33.2" title="local-type: typedef-33.2">local-type: typedef-33.2</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-58.2" title="local-type: typedef-58.2">local-type: typedef-58.2</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-40.2" title="local-type: typedef-40.2">local-type: typedef-40.2</a>
                       </em>
                     </p>
                   </td>
@@ -267875,11 +263046,7 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-81.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-77.4" title="local-type: typedef-77.4">local-type: typedef-77.4</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-85.4" title="local-type: typedef-85.4">local-type: typedef-85.4</a>
                       </em>
                     </p>
                   </td>
@@ -268061,13 +263228,8 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-81.1)</
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-77.2">
-          <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-77.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-85.2">
+          <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-85.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -268087,11 +263249,7 @@ <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-77.2)</code>
-=======
-                      <code>  (typedef-86.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-85.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -268325,13 +263483,8 @@ <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-33.2">
-          <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-33.2)</code>
-=======
-        <div class="sect2" id="local-type.typedef-58.2">
-          <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-58.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-40.2">
+          <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-40.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -268351,11 +263504,7 @@ <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-33.2)</code>
-=======
-                      <code>  (typedef-58.2)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-40.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -268663,13 +263812,8 @@ <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-77.4">
-          <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-77.4)</code>
-=======
-        <div class="sect2" id="local-type.typedef-86.4">
-          <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-85.4">
+          <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-85.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -268689,11 +263833,7 @@ <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-77.4)</code>
-=======
-                      <code>  (typedef-86.4)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-85.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -268937,11 +264077,7 @@ <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-<<<<<<< HEAD
-                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
-=======
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
                       </em>
                     </p>
                   </td>
@@ -269002,13 +264138,8 @@ <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-<<<<<<< HEAD
-        <div class="sect2" id="local-type.typedef-34.1">
-          <h3>51.6. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-34.1)</code>
-=======
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>51.6. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+        <div class="sect2" id="local-type.typedef-44.1">
+          <h3>51.6. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -269028,11 +264159,7 @@ <h3>51.6. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-<<<<<<< HEAD
-                      <code>  (typedef-34.1)</code>
-=======
-                      <code>  (typedef-59.1)</code>
->>>>>>> 9a250e243a4d9130b16ca28935a093e9a7e73c38
+                      <code>  (typedef-44.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
diff --git a/xsd/siri_model/siri_estimatedVehicleJourney.xsd b/xsd/siri_model/siri_estimatedVehicleJourney.xsd
index e19aaf04..f4ccbde3 100644
--- a/xsd/siri_model/siri_estimatedVehicleJourney.xsd
+++ b/xsd/siri_model/siri_estimatedVehicleJourney.xsd
@@ -467,4 +467,4 @@ the original journey and the nature of the difference.</xsd:documentation>
 		</xsd:sequence>
 	</xsd:group>
 	<!-- ======================================================================= -->
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
diff --git a/xsd/siri_model/siri_journey.xsd b/xsd/siri_model/siri_journey.xsd
index 3ce80e01..43437f92 100644
--- a/xsd/siri_model/siri_journey.xsd
+++ b/xsd/siri_model/siri_journey.xsd
@@ -1910,7 +1910,7 @@ TRAINs within a COMPOUND TRAIN may have different origins and destinations due t
 		</xsd:sequence>
 	</xsd:group>
 	<!-- Service Links ======================================================================= -->
-		<xsd:complexType name="ServiceLinkViewsStructure">
+	<xsd:complexType name="ServiceLinkViewsStructure">
 		<xsd:annotation>
 			<xsd:documentation>Provides information about updated SERVICE LINKs</xsd:documentation>
 		</xsd:annotation>
diff --git a/xsd/siri_model/siri_journey_support.xsd b/xsd/siri_model/siri_journey_support.xsd
index f7e1e7a8..76d0076f 100644
--- a/xsd/siri_model/siri_journey_support.xsd
+++ b/xsd/siri_model/siri_journey_support.xsd
@@ -518,7 +518,7 @@ Has the following uses:
 			<xsd:enumeration value="noAlighting"/>
 			<xsd:enumeration value="passThru"/>
 			<xsd:enumeration value="journeyRelationRestricted">
-				 <xsd:annotation>
+				<xsd:annotation>
 					<xsd:documentation>Restricts boarding or alighting so that it is only permitted when the passenger is interchanging from/to a journey explicitly referenced in a JourneyRelation.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:enumeration>
@@ -533,7 +533,7 @@ Has the following uses:
 			<xsd:enumeration value="noAlighting"/>
 			<xsd:enumeration value="passThru"/>
 			<xsd:enumeration value="journeyRelationRestricted">
-                <xsd:annotation>
+				<xsd:annotation>
 					<xsd:documentation>Restricts alighting so that it is only permitted when the passenger is interchanging to a journey explicitly referenced in a JourneyRelation.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:enumeration>
@@ -548,7 +548,7 @@ Has the following uses:
 			<xsd:enumeration value="noBoarding"/>
 			<xsd:enumeration value="passThru"/>
 			<xsd:enumeration value="journeyRelationRestricted">
-				 <xsd:annotation>
+				<xsd:annotation>
 					<xsd:documentation>Restricts boarding so that it is only permitted when the passenger is interchanging from a journey explicitly referenced in a JourneyRelation.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:enumeration>

From 0b5d77ff8bda81350d0dfc1d8591710253a7d1d9 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 18 May 2026 06:45:13 +0000
Subject: [PATCH 5/7] Lint and update documentation tables

---
 docs/generated/contab/siri.html               |  12 +-
 .../VDV736_exm/SX_ESAF_example.xml            | 466 +++++++++---------
 .../SX_ESAF_example_without_period.xml        | 298 +++++------
 3 files changed, 388 insertions(+), 388 deletions(-)

diff --git a/docs/generated/contab/siri.html b/docs/generated/contab/siri.html
index b6991ab2..a65d3aa9 100644
--- a/docs/generated/contab/siri.html
+++ b/docs/generated/contab/siri.html
@@ -49228,7 +49228,7 @@ <h3>6.15. The group <code>siri:AuthenticatedRequestGroup</code>
                     <p class="tableblock"/>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock anno-text">Elemenst for authecticiation. (since SIRI 2.0)</p>
+                    <p class="tableblock anno-text">Elements for authentication. (since SIRI 2.0)</p>
                   </td>
                 </tr>
                 <tr>
@@ -76522,7 +76522,7 @@ <h3>9.63. The complex type <code>siri:DriverMessageStructure</code>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <code>
-                        <strong>siri:DiverScope</strong>
+                        <strong>siri:DriverScope</strong>
                       </code>
                     </p>
                   </td>
@@ -83684,7 +83684,7 @@ <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/Messa
           </div>
         </div>
         <div class="sect2" id="local-type.typedef-78.17">
-          <h3>9.123. The complex type <code>complexType[siri:DriverMessageStructure]/DiverScope#complexType (typedef-78.17)</code>
+          <h3>9.123. The complex type <code>complexType[siri:DriverMessageStructure]/DriverScope#complexType (typedef-78.17)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83702,7 +83702,7 @@ <h3>9.123. The complex type <code>complexType[siri:DriverMessageStructure]/Diver
                     <p class="tableblock">
                       <code>complexType[siri:DriverMessageStructure]</code>
                       <br/>
-                      <code>  /DiverScope #complexType</code>
+                      <code>  /DriverScope #complexType</code>
                       <br/>
                       <code>  (typedef-78.17)</code>
                     </p>
@@ -197982,7 +197982,7 @@ <h3>28.27. The complex type <code>siri:PassengerInformationActionStructure</code
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <code>siri:ActionPeriod</code>
+                      <code>siri:Period</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -197997,7 +197997,7 @@ <h3>28.27. The complex type <code>siri:PassengerInformationActionStructure</code
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Period of effect of disruption, if different from that of SITUATION, specifically in case of multiple applicable periods (for example periodic roadworks during the night). If omitted, then the ValidityPeriods on PtSituationElement level apply, otherwise overwrites the former.</p>
+                    <p class="tableblock darkbrown">Period restricts the applicability of a PassengerInformationAction to a specific sub-range of the enclosing ValidityPeriod on PtSituationElement level. In particular when using the Perspective 'whilePlanningTrip', a single ValidityPeriod at PtSituationElement level may be insufficient to ensure correct selection of the actually affected journeys in a journey planning context. This applies whenever a PassengerInformationAction is intended to be effective only during certain parts of the overall SITUATION duration or validity (e.g. time-of-day–dependent passenger information). Period SHALL ONLY be used when a single ValidityPeriod is insufficient to differentiate the applicability of multiple actions. Period MUST always be a strict subset of the enclosing ValidityPeriod and MUST NOT start earlier or end later. For PassengerInformationActions with Perspective 'atStopPoint' and/or 'onBoardVehicle', Period has no meaning and SHALL NOT be used. If omitted, then the ValidityPeriods on PtSituationElement level apply.</p>
                   </td>
                 </tr>
                 <tr>
diff --git a/examples/siri_exm_SX/VDV736_exm/SX_ESAF_example.xml b/examples/siri_exm_SX/VDV736_exm/SX_ESAF_example.xml
index c7570c1f..9b5c39a2 100644
--- a/examples/siri_exm_SX/VDV736_exm/SX_ESAF_example.xml
+++ b/examples/siri_exm_SX/VDV736_exm/SX_ESAF_example.xml
@@ -1,234 +1,234 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Siri xmlns="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.3">
-  <ServiceDelivery>
-    <ResponseTimestamp>2022-04-14T09:17:32Z</ResponseTimestamp>
-    <ProducerRef>ski-ems-out-sx_tesst</ProducerRef>
-    <ResponseMessageIdentifier>wcP9TgJhf</ResponseMessageIdentifier>
-    <Status>true</Status>
-    <MoreData>false</MoreData>
-    <SituationExchangeDelivery version="2.3">
-      <ResponseTimestamp>2022-04-14T09:17:32Z</ResponseTimestamp>
-      <SubscriberRef>ski-ddip-in-sx_test</SubscriberRef>
-      <SubscriptionRef>1</SubscriptionRef>
-      <Situations>
-        <PtSituationElement>
-          <CreationTime>2022-04-14T09:17:23Z</CreationTime>
-          <CountryRef>ch</CountryRef>
-          <ParticipantRef>ski-ems-out-sx_test</ParticipantRef>
-          <SituationNumber>ch:1:sstid:1:3ac880a2-aeb1-5757-989d-d3c15c8220c6</SituationNumber>
-          <Version>1</Version>
-          <Source>
-            <Country>ch</Country>
-            <SourceType>directReport</SourceType>
-            <Name>EMS</Name>
-            <ExternalCode>ski-ems-out-sx_test</ExternalCode>
-          </Source>
-          <VersionedAtTime>2022-04-14T09:17:26Z</VersionedAtTime>
-          <Progress>published</Progress>
-          <ValidityPeriod>
-            <StartTime>2022-08-26T04:00:00Z</StartTime>
-            <EndTime>2022-08-26T21:00:00Z</EndTime>
-          </ValidityPeriod>
-          <PublicationWindow>
-            <StartTime>2022-04-14T09:17:23Z</StartTime>
-            <EndTime>2022-08-26T21:59:00Z</EndTime>
-          </PublicationWindow>
-          <AlertCause>specialEvent</AlertCause>
-          <Severity>normal</Severity>
-          <Priority>3</Priority>
-          <Audience>public</Audience>
-          <ScopeType>stopPlace</ScopeType>
-          <Planned>true</Planned>
-          <Language>DE</Language>
-          <Summary xml:lang="DE">Haltestelle Pratteln, Bahnhof verschoben.</Summary>
-          <Summary xml:lang="EN">Pratteln, Bahnhof stop moved.</Summary>
-          <Detail xml:lang="DE">Grund ist eine Veranstaltung.</Detail>
-          <Detail xml:lang="EN">Due to an event.</Detail>
-          <Affects>
-            <StopPlaces>
-              <AffectedStopPlace>
-                <StopPlaceRef>ch:1:sloid:94994</StopPlaceRef>
-                <PlaceName>Pratteln, Bahnhof</PlaceName>
-              </AffectedStopPlace>
-            </StopPlaces>
-          </Affects>
-          <PublishingActions>
-            <PublishingAction>
-              <PublishAtScope>
-                <ScopeType>stopPlace</ScopeType>
-                <Affects>
-                  <StopPlaces>
-                    <AffectedStopPlace>
-                      <StopPlaceRef>ch:1:sloid:94994</StopPlaceRef>
-                      <PlaceName>Pratteln, Bahnhof</PlaceName>
-                    </AffectedStopPlace>
-                  </StopPlaces>
-                </Affects>
-              </PublishAtScope>
-              <PassengerInformationAction>
-                <PublicationWindow>
-                  <StartTime>2022-04-14T09:17:23Z</StartTime>
-                  <EndTime>2022-08-26T21:59:00Z</EndTime>
-                </PublicationWindow>
-                <ActionRef>ems-696-1</ActionRef>
-                <!--Compared to the other ESAF example without period, in this scenario two different texts are published: one in the morning and another one in the afternoon. As a result, one ValidityPeriod on PtSituationElement level is not sufficient and therefore Period is actually required on PassengerInformationAction level to distinguish.-->
-                <Period>
-                  <StartTime>2022-08-26T04:00:00Z</StartTime>
-                  <EndTime>2022-08-26T12:00:00Z</EndTime>
-                </Period>
-                <RecordedAtTime>2022-04-14T09:17:26Z</RecordedAtTime>
-                <OwnerRef>ch:1:sboid:100626</OwnerRef>
-                <Perspective>whilePlanningTrip</Perspective>
-                <TextualContent>
-                  <TextualContentSize>S</TextualContentSize>
-                  <SummaryContent>
-                    <SummaryText xml:lang="DE">Pratteln, Bahnhof verschoben</SummaryText>
-                    <SummaryText xml:lang="EN">Pratteln, Bahnhof moved</SummaryText>
-                  </SummaryContent>
-                  <ReasonContent>
-                    <ReasonText xml:lang="DE">Grund: Veranstaltung (ESAF)</ReasonText>
-                    <ReasonText xml:lang="EN">Due to an event (ESAF)</ReasonText>
-                  </ReasonContent>
-                  <ConsequenceContent>
-                    <ConsequenceText xml:lang="DE">Die Haltestelle ist verschoben um 500 Meter Richtung Altstadt</ConsequenceText>
-                    <ConsequenceText xml:lang="EN">The bus stop has been moved by 500 meters in the direction of the old town</ConsequenceText>
-                  </ConsequenceContent>
-                  <RecommendationContent>
-                    <RecommendationText xml:lang="DE">Bitte benutzen Sie die provisorische Haltestelle Pratteln, Bahnhof (Richtung Festgelände)</RecommendationText>
-                    <RecommendationText xml:lang="EN">Please use the temporary stop Pratteln, Bahnhof (direction Festgelände)</RecommendationText>
-                  </RecommendationContent>
-                  <DurationContent>
-                    <DurationText xml:lang="DE">Dauer: 26.08.2022, 06:00 - 26.08.2022, 14:00</DurationText>
-                    <DurationText xml:lang="EN">Duration: 26.08.2022, 06:00 - 26.08.2022, 14:00</DurationText>
-                  </DurationContent>
-                  <RemarkContent>
-                    <Remark xml:lang="DE">Bei Fragen wenden Sie sich an das Informationspersonal vor Ort</Remark>
-                    <Remark xml:lang="EN">If you have any questions, please contact the information staff on site</Remark>
-                  </RemarkContent>
-                </TextualContent>
-              </PassengerInformationAction>
-              <PassengerInformationAction>
-                <PublicationWindow>
-                  <StartTime>2022-04-14T09:17:26Z</StartTime>
-                  <EndTime>2022-08-28T21:59:00Z</EndTime>
-                </PublicationWindow>
-                <ActionRef>ems-696-2</ActionRef>
-                <!--Compared to the other ESAF example without period, in this scenario two different texts are published: one in the morning and another one in the afternoon. As a result, one ValidityPeriod on PtSituationElement level is not sufficient and therefore Period is actually required on PassengerInformationAction level to distinguish.-->
-                <Period>
-                  <StartTime>2022-08-26T13:00:00Z</StartTime>
-                  <EndTime>2022-08-26T21:00:00Z</EndTime>
-                </Period>
-                <RecordedAtTime>2022-04-14T09:17:26Z</RecordedAtTime>
-                <OwnerRef>ch:1:sboid:100626</OwnerRef>
-                <Perspective>whilePlanningTrip</Perspective>
-                <TextualContent>
-                  <TextualContentSize>S</TextualContentSize>
-                  <SummaryContent>
-                    <SummaryText xml:lang="DE">Pratteln, Bahnhof verschoben</SummaryText>
-                    <SummaryText xml:lang="EN">Pratteln, Bahnhof moved</SummaryText>
-                  </SummaryContent>
-                  <ReasonContent>
-                    <ReasonText xml:lang="DE">Grund: Veranstaltung (ESAF)</ReasonText>
-                    <ReasonText xml:lang="EN">Due to an event (ESAF)</ReasonText>
-                  </ReasonContent>
-                  <ConsequenceContent>
-                    <ConsequenceText xml:lang="DE">Die Haltestelle ist verschoben an die Wasenstrasse</ConsequenceText>
-                    <ConsequenceText xml:lang="EN">The bus stop has been moved to Wasenstrasse</ConsequenceText>
-                  </ConsequenceContent>
-                  <RecommendationContent>
-                    <RecommendationText xml:lang="DE">Bitte folgen Sie der Signalisation für den Zugang zu den Gleisen</RecommendationText>
-                    <RecommendationText xml:lang="EN">Please follow the signs to access the platforms</RecommendationText>
-                  </RecommendationContent>
-                  <DurationContent>
-                    <DurationText xml:lang="DE">Dauer: 26.08.2022, 15:00 - 26.08.2022, 23:00</DurationText>
-                    <DurationText xml:lang="EN">Duration: 26.08.2022, 15:00 - 26.08.2022, 23:00</DurationText>
-                  </DurationContent>
-                  <RemarkContent>
-                    <Remark xml:lang="DE">Bei Fragen wenden Sie sich an das Informationspersonal vor Ort</Remark>
-                    <Remark xml:lang="EN">If you have any questions, please contact the information staff on site</Remark>
-                  </RemarkContent>
-                </TextualContent>
-              </PassengerInformationAction>
-              <PassengerInformationAction>
-                <PublicationWindow>
-                  <StartTime>2022-08-26T02:00:00Z</StartTime>
-                  <EndTime>2022-08-26T12:00:00Z</EndTime>
-                </PublicationWindow>
-                <ActionRef>ems-696-3</ActionRef>
-                <RecordedAtTime>2022-04-14T09:17:26Z</RecordedAtTime>
-                <OwnerRef>ch:1:sboid:100626</OwnerRef>
-                <Perspective>atStopPoint</Perspective>
-                <Perspective>onBoardVehicle</Perspective>
-                <TextualContent>
-                  <TextualContentSize>S</TextualContentSize>
-                  <SummaryContent>
-                    <SummaryText xml:lang="DE">Pratteln, Bahnhof verschoben</SummaryText>
-                    <SummaryText xml:lang="EN">Pratteln, Bahnhof moved</SummaryText>
-                  </SummaryContent>
-                  <ReasonContent>
-                    <ReasonText xml:lang="DE">Grund: Veranstaltung (ESAF)</ReasonText>
-                    <ReasonText xml:lang="EN">Due to an event (ESAF)</ReasonText>
-                  </ReasonContent>
-                  <ConsequenceContent>
-                    <ConsequenceText xml:lang="DE">Die Haltestelle ist verschoben um 500 Meter Richtung Altstadt</ConsequenceText>
-                    <ConsequenceText xml:lang="EN">The bus stop has been moved by 500 meters in the direction of the old town</ConsequenceText>
-                  </ConsequenceContent>
-                  <RecommendationContent>
-                    <RecommendationText xml:lang="DE">Bitte benutzen Sie die provisorische Haltestelle Pratteln, Bahnhof (Richtung Festgelände)</RecommendationText>
-                    <RecommendationText xml:lang="EN">Please use the temporary stop Pratteln, Bahnhof (direction Festgelände)</RecommendationText>
-                  </RecommendationContent>
-                  <DurationContent>
-                    <DurationText xml:lang="DE">Dauer: 26.08.2022, 04:00 - 26.08.2022, 14:00</DurationText>
-                    <DurationText xml:lang="EN">Duration: 26.08.2022, 04:00 - 26.08.2022, 14:00</DurationText>
-                  </DurationContent>
-                  <RemarkContent>
-                    <Remark xml:lang="DE">Bei Fragen wenden Sie sich an das Informationspersonal vor Ort</Remark>
-                    <Remark xml:lang="EN">If you have any questions, please contact the information staff on site</Remark>
-                  </RemarkContent>
-                </TextualContent>
-              </PassengerInformationAction>
-              <PassengerInformationAction>
-                <PublicationWindow>
-                  <StartTime>2022-08-26T13:00:00Z</StartTime>
-                  <EndTime>2022-08-26T21:59:00Z</EndTime>
-                </PublicationWindow>
-                <ActionRef>ems-696-6</ActionRef>
-                <RecordedAtTime>2022-04-14T09:17:26Z</RecordedAtTime>
-                <OwnerRef>ch:1:sboid:100626</OwnerRef>
-                <Perspective>atStopPoint</Perspective>
-                <Perspective>onBoardVehicle</Perspective>
-                <TextualContent>
-                  <TextualContentSize>S</TextualContentSize>
-                  <SummaryContent>
-                    <SummaryText xml:lang="DE">Pratteln, Bahnhof verschoben</SummaryText>
-                    <SummaryText xml:lang="EN">Pratteln, Bahnhof moved</SummaryText>
-                  </SummaryContent>
-                  <ReasonContent>
-                    <ReasonText xml:lang="DE">Grund: Veranstaltung (ESAF)</ReasonText>
-                    <ReasonText xml:lang="EN">Due to an event (ESAF)</ReasonText>
-                  </ReasonContent>
-                  <ConsequenceContent>
-                    <ConsequenceText xml:lang="DE">Die Haltestelle ist verschoben an die Wasenstrasse</ConsequenceText>
-                    <ConsequenceText xml:lang="EN">The bus stop has been moved to Wasenstrasse</ConsequenceText>
-                  </ConsequenceContent>
-                  <RecommendationContent>
-                    <RecommendationText xml:lang="DE">Bitte folgen Sie der Signalisation für den Zugang zu den Gleisen</RecommendationText>
-                    <RecommendationText xml:lang="EN">Please follow the signs to access the platforms</RecommendationText>
-                  </RecommendationContent>
-                  <DurationContent>
-                    <DurationText xml:lang="DE">Dauer: 26.08.2022, 15:00 - 26.08.2022, 23:59</DurationText>
-                    <DurationText xml:lang="EN">Duration: 26.08.2022, 15:00 - 26.08.2022, 23:59</DurationText>
-                  </DurationContent>
-                  <RemarkContent>
-                    <Remark xml:lang="DE">Bei Fragen wenden Sie sich an das Informationspersonal vor Ort</Remark>
-                    <Remark xml:lang="EN">If you have any questions, please contact the information staff on site</Remark>
-                  </RemarkContent>
-                </TextualContent>
-              </PassengerInformationAction>
-            </PublishingAction>
-          </PublishingActions>
-        </PtSituationElement>
-      </Situations>
-    </SituationExchangeDelivery>
-  </ServiceDelivery>
-</Siri>
\ No newline at end of file
+	<ServiceDelivery>
+		<ResponseTimestamp>2022-04-14T09:17:32Z</ResponseTimestamp>
+		<ProducerRef>ski-ems-out-sx_tesst</ProducerRef>
+		<ResponseMessageIdentifier>wcP9TgJhf</ResponseMessageIdentifier>
+		<Status>true</Status>
+		<MoreData>false</MoreData>
+		<SituationExchangeDelivery version="2.3">
+			<ResponseTimestamp>2022-04-14T09:17:32Z</ResponseTimestamp>
+			<SubscriberRef>ski-ddip-in-sx_test</SubscriberRef>
+			<SubscriptionRef>1</SubscriptionRef>
+			<Situations>
+				<PtSituationElement>
+					<CreationTime>2022-04-14T09:17:23Z</CreationTime>
+					<CountryRef>ch</CountryRef>
+					<ParticipantRef>ski-ems-out-sx_test</ParticipantRef>
+					<SituationNumber>ch:1:sstid:1:3ac880a2-aeb1-5757-989d-d3c15c8220c6</SituationNumber>
+					<Version>1</Version>
+					<Source>
+						<Country>ch</Country>
+						<SourceType>directReport</SourceType>
+						<Name>EMS</Name>
+						<ExternalCode>ski-ems-out-sx_test</ExternalCode>
+					</Source>
+					<VersionedAtTime>2022-04-14T09:17:26Z</VersionedAtTime>
+					<Progress>published</Progress>
+					<ValidityPeriod>
+						<StartTime>2022-08-26T04:00:00Z</StartTime>
+						<EndTime>2022-08-26T21:00:00Z</EndTime>
+					</ValidityPeriod>
+					<PublicationWindow>
+						<StartTime>2022-04-14T09:17:23Z</StartTime>
+						<EndTime>2022-08-26T21:59:00Z</EndTime>
+					</PublicationWindow>
+					<AlertCause>specialEvent</AlertCause>
+					<Severity>normal</Severity>
+					<Priority>3</Priority>
+					<Audience>public</Audience>
+					<ScopeType>stopPlace</ScopeType>
+					<Planned>true</Planned>
+					<Language>DE</Language>
+					<Summary xml:lang="DE">Haltestelle Pratteln, Bahnhof verschoben.</Summary>
+					<Summary xml:lang="EN">Pratteln, Bahnhof stop moved.</Summary>
+					<Detail xml:lang="DE">Grund ist eine Veranstaltung.</Detail>
+					<Detail xml:lang="EN">Due to an event.</Detail>
+					<Affects>
+						<StopPlaces>
+							<AffectedStopPlace>
+								<StopPlaceRef>ch:1:sloid:94994</StopPlaceRef>
+								<PlaceName>Pratteln, Bahnhof</PlaceName>
+							</AffectedStopPlace>
+						</StopPlaces>
+					</Affects>
+					<PublishingActions>
+						<PublishingAction>
+							<PublishAtScope>
+								<ScopeType>stopPlace</ScopeType>
+								<Affects>
+									<StopPlaces>
+										<AffectedStopPlace>
+											<StopPlaceRef>ch:1:sloid:94994</StopPlaceRef>
+											<PlaceName>Pratteln, Bahnhof</PlaceName>
+										</AffectedStopPlace>
+									</StopPlaces>
+								</Affects>
+							</PublishAtScope>
+							<PassengerInformationAction>
+								<PublicationWindow>
+									<StartTime>2022-04-14T09:17:23Z</StartTime>
+									<EndTime>2022-08-26T21:59:00Z</EndTime>
+								</PublicationWindow>
+								<ActionRef>ems-696-1</ActionRef>
+								<!--Compared to the other ESAF example without period, in this scenario two different texts are published: one in the morning and another one in the afternoon. As a result, one ValidityPeriod on PtSituationElement level is not sufficient and therefore Period is actually required on PassengerInformationAction level to distinguish.-->
+								<Period>
+									<StartTime>2022-08-26T04:00:00Z</StartTime>
+									<EndTime>2022-08-26T12:00:00Z</EndTime>
+								</Period>
+								<RecordedAtTime>2022-04-14T09:17:26Z</RecordedAtTime>
+								<OwnerRef>ch:1:sboid:100626</OwnerRef>
+								<Perspective>whilePlanningTrip</Perspective>
+								<TextualContent>
+									<TextualContentSize>S</TextualContentSize>
+									<SummaryContent>
+										<SummaryText xml:lang="DE">Pratteln, Bahnhof verschoben</SummaryText>
+										<SummaryText xml:lang="EN">Pratteln, Bahnhof moved</SummaryText>
+									</SummaryContent>
+									<ReasonContent>
+										<ReasonText xml:lang="DE">Grund: Veranstaltung (ESAF)</ReasonText>
+										<ReasonText xml:lang="EN">Due to an event (ESAF)</ReasonText>
+									</ReasonContent>
+									<ConsequenceContent>
+										<ConsequenceText xml:lang="DE">Die Haltestelle ist verschoben um 500 Meter Richtung Altstadt</ConsequenceText>
+										<ConsequenceText xml:lang="EN">The bus stop has been moved by 500 meters in the direction of the old town</ConsequenceText>
+									</ConsequenceContent>
+									<RecommendationContent>
+										<RecommendationText xml:lang="DE">Bitte benutzen Sie die provisorische Haltestelle Pratteln, Bahnhof (Richtung Festgelände)</RecommendationText>
+										<RecommendationText xml:lang="EN">Please use the temporary stop Pratteln, Bahnhof (direction Festgelände)</RecommendationText>
+									</RecommendationContent>
+									<DurationContent>
+										<DurationText xml:lang="DE">Dauer: 26.08.2022, 06:00 - 26.08.2022, 14:00</DurationText>
+										<DurationText xml:lang="EN">Duration: 26.08.2022, 06:00 - 26.08.2022, 14:00</DurationText>
+									</DurationContent>
+									<RemarkContent>
+										<Remark xml:lang="DE">Bei Fragen wenden Sie sich an das Informationspersonal vor Ort</Remark>
+										<Remark xml:lang="EN">If you have any questions, please contact the information staff on site</Remark>
+									</RemarkContent>
+								</TextualContent>
+							</PassengerInformationAction>
+							<PassengerInformationAction>
+								<PublicationWindow>
+									<StartTime>2022-04-14T09:17:26Z</StartTime>
+									<EndTime>2022-08-28T21:59:00Z</EndTime>
+								</PublicationWindow>
+								<ActionRef>ems-696-2</ActionRef>
+								<!--Compared to the other ESAF example without period, in this scenario two different texts are published: one in the morning and another one in the afternoon. As a result, one ValidityPeriod on PtSituationElement level is not sufficient and therefore Period is actually required on PassengerInformationAction level to distinguish.-->
+								<Period>
+									<StartTime>2022-08-26T13:00:00Z</StartTime>
+									<EndTime>2022-08-26T21:00:00Z</EndTime>
+								</Period>
+								<RecordedAtTime>2022-04-14T09:17:26Z</RecordedAtTime>
+								<OwnerRef>ch:1:sboid:100626</OwnerRef>
+								<Perspective>whilePlanningTrip</Perspective>
+								<TextualContent>
+									<TextualContentSize>S</TextualContentSize>
+									<SummaryContent>
+										<SummaryText xml:lang="DE">Pratteln, Bahnhof verschoben</SummaryText>
+										<SummaryText xml:lang="EN">Pratteln, Bahnhof moved</SummaryText>
+									</SummaryContent>
+									<ReasonContent>
+										<ReasonText xml:lang="DE">Grund: Veranstaltung (ESAF)</ReasonText>
+										<ReasonText xml:lang="EN">Due to an event (ESAF)</ReasonText>
+									</ReasonContent>
+									<ConsequenceContent>
+										<ConsequenceText xml:lang="DE">Die Haltestelle ist verschoben an die Wasenstrasse</ConsequenceText>
+										<ConsequenceText xml:lang="EN">The bus stop has been moved to Wasenstrasse</ConsequenceText>
+									</ConsequenceContent>
+									<RecommendationContent>
+										<RecommendationText xml:lang="DE">Bitte folgen Sie der Signalisation für den Zugang zu den Gleisen</RecommendationText>
+										<RecommendationText xml:lang="EN">Please follow the signs to access the platforms</RecommendationText>
+									</RecommendationContent>
+									<DurationContent>
+										<DurationText xml:lang="DE">Dauer: 26.08.2022, 15:00 - 26.08.2022, 23:00</DurationText>
+										<DurationText xml:lang="EN">Duration: 26.08.2022, 15:00 - 26.08.2022, 23:00</DurationText>
+									</DurationContent>
+									<RemarkContent>
+										<Remark xml:lang="DE">Bei Fragen wenden Sie sich an das Informationspersonal vor Ort</Remark>
+										<Remark xml:lang="EN">If you have any questions, please contact the information staff on site</Remark>
+									</RemarkContent>
+								</TextualContent>
+							</PassengerInformationAction>
+							<PassengerInformationAction>
+								<PublicationWindow>
+									<StartTime>2022-08-26T02:00:00Z</StartTime>
+									<EndTime>2022-08-26T12:00:00Z</EndTime>
+								</PublicationWindow>
+								<ActionRef>ems-696-3</ActionRef>
+								<RecordedAtTime>2022-04-14T09:17:26Z</RecordedAtTime>
+								<OwnerRef>ch:1:sboid:100626</OwnerRef>
+								<Perspective>atStopPoint</Perspective>
+								<Perspective>onBoardVehicle</Perspective>
+								<TextualContent>
+									<TextualContentSize>S</TextualContentSize>
+									<SummaryContent>
+										<SummaryText xml:lang="DE">Pratteln, Bahnhof verschoben</SummaryText>
+										<SummaryText xml:lang="EN">Pratteln, Bahnhof moved</SummaryText>
+									</SummaryContent>
+									<ReasonContent>
+										<ReasonText xml:lang="DE">Grund: Veranstaltung (ESAF)</ReasonText>
+										<ReasonText xml:lang="EN">Due to an event (ESAF)</ReasonText>
+									</ReasonContent>
+									<ConsequenceContent>
+										<ConsequenceText xml:lang="DE">Die Haltestelle ist verschoben um 500 Meter Richtung Altstadt</ConsequenceText>
+										<ConsequenceText xml:lang="EN">The bus stop has been moved by 500 meters in the direction of the old town</ConsequenceText>
+									</ConsequenceContent>
+									<RecommendationContent>
+										<RecommendationText xml:lang="DE">Bitte benutzen Sie die provisorische Haltestelle Pratteln, Bahnhof (Richtung Festgelände)</RecommendationText>
+										<RecommendationText xml:lang="EN">Please use the temporary stop Pratteln, Bahnhof (direction Festgelände)</RecommendationText>
+									</RecommendationContent>
+									<DurationContent>
+										<DurationText xml:lang="DE">Dauer: 26.08.2022, 04:00 - 26.08.2022, 14:00</DurationText>
+										<DurationText xml:lang="EN">Duration: 26.08.2022, 04:00 - 26.08.2022, 14:00</DurationText>
+									</DurationContent>
+									<RemarkContent>
+										<Remark xml:lang="DE">Bei Fragen wenden Sie sich an das Informationspersonal vor Ort</Remark>
+										<Remark xml:lang="EN">If you have any questions, please contact the information staff on site</Remark>
+									</RemarkContent>
+								</TextualContent>
+							</PassengerInformationAction>
+							<PassengerInformationAction>
+								<PublicationWindow>
+									<StartTime>2022-08-26T13:00:00Z</StartTime>
+									<EndTime>2022-08-26T21:59:00Z</EndTime>
+								</PublicationWindow>
+								<ActionRef>ems-696-6</ActionRef>
+								<RecordedAtTime>2022-04-14T09:17:26Z</RecordedAtTime>
+								<OwnerRef>ch:1:sboid:100626</OwnerRef>
+								<Perspective>atStopPoint</Perspective>
+								<Perspective>onBoardVehicle</Perspective>
+								<TextualContent>
+									<TextualContentSize>S</TextualContentSize>
+									<SummaryContent>
+										<SummaryText xml:lang="DE">Pratteln, Bahnhof verschoben</SummaryText>
+										<SummaryText xml:lang="EN">Pratteln, Bahnhof moved</SummaryText>
+									</SummaryContent>
+									<ReasonContent>
+										<ReasonText xml:lang="DE">Grund: Veranstaltung (ESAF)</ReasonText>
+										<ReasonText xml:lang="EN">Due to an event (ESAF)</ReasonText>
+									</ReasonContent>
+									<ConsequenceContent>
+										<ConsequenceText xml:lang="DE">Die Haltestelle ist verschoben an die Wasenstrasse</ConsequenceText>
+										<ConsequenceText xml:lang="EN">The bus stop has been moved to Wasenstrasse</ConsequenceText>
+									</ConsequenceContent>
+									<RecommendationContent>
+										<RecommendationText xml:lang="DE">Bitte folgen Sie der Signalisation für den Zugang zu den Gleisen</RecommendationText>
+										<RecommendationText xml:lang="EN">Please follow the signs to access the platforms</RecommendationText>
+									</RecommendationContent>
+									<DurationContent>
+										<DurationText xml:lang="DE">Dauer: 26.08.2022, 15:00 - 26.08.2022, 23:59</DurationText>
+										<DurationText xml:lang="EN">Duration: 26.08.2022, 15:00 - 26.08.2022, 23:59</DurationText>
+									</DurationContent>
+									<RemarkContent>
+										<Remark xml:lang="DE">Bei Fragen wenden Sie sich an das Informationspersonal vor Ort</Remark>
+										<Remark xml:lang="EN">If you have any questions, please contact the information staff on site</Remark>
+									</RemarkContent>
+								</TextualContent>
+							</PassengerInformationAction>
+						</PublishingAction>
+					</PublishingActions>
+				</PtSituationElement>
+			</Situations>
+		</SituationExchangeDelivery>
+	</ServiceDelivery>
+</Siri>
diff --git a/examples/siri_exm_SX/VDV736_exm/SX_ESAF_example_without_period.xml b/examples/siri_exm_SX/VDV736_exm/SX_ESAF_example_without_period.xml
index a0b3dd6f..037513c9 100644
--- a/examples/siri_exm_SX/VDV736_exm/SX_ESAF_example_without_period.xml
+++ b/examples/siri_exm_SX/VDV736_exm/SX_ESAF_example_without_period.xml
@@ -1,150 +1,150 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Siri xmlns="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.3">
-  <ServiceDelivery>
-    <ResponseTimestamp>2022-04-14T09:17:32Z</ResponseTimestamp>
-    <ProducerRef>ski-ems-out-sx_tesst</ProducerRef>
-    <ResponseMessageIdentifier>wcP9TgJhf</ResponseMessageIdentifier>
-    <Status>true</Status>
-    <MoreData>false</MoreData>
-    <SituationExchangeDelivery version="2.3">
-      <ResponseTimestamp>2022-04-14T09:17:32Z</ResponseTimestamp>
-      <SubscriberRef>ski-ddip-in-sx_test</SubscriberRef>
-      <SubscriptionRef>1</SubscriptionRef>
-      <Situations>
-        <PtSituationElement>
-          <CreationTime>2022-04-14T09:17:23Z</CreationTime>
-          <CountryRef>ch</CountryRef>
-          <ParticipantRef>ski-ems-out-sx_test</ParticipantRef>
-          <SituationNumber>ch:1:sstid:1:3ac880a2-aeb1-5757-989d-d3c15c8220c6</SituationNumber>
-          <Version>1</Version>
-          <Source>
-            <Country>ch</Country>
-            <SourceType>directReport</SourceType>
-            <Name>EMS</Name>
-            <ExternalCode>ski-ems-out-sx_test</ExternalCode>
-          </Source>
-          <VersionedAtTime>2022-04-14T09:17:26Z</VersionedAtTime>
-          <Progress>published</Progress>
-          <ValidityPeriod>
-            <StartTime>2022-08-26T04:00:00Z</StartTime>
-            <EndTime>2022-08-26T21:00:00Z</EndTime>
-          </ValidityPeriod>
-          <PublicationWindow>
-            <StartTime>2022-04-14T09:17:23Z</StartTime>
-            <EndTime>2022-08-26T21:59:00Z</EndTime>
-          </PublicationWindow>
-          <AlertCause>specialEvent</AlertCause>
-          <Severity>normal</Severity>
-          <Priority>3</Priority>
-          <Audience>public</Audience>
-          <ScopeType>stopPlace</ScopeType>
-          <Planned>true</Planned>
-          <Language>DE</Language>
-          <Summary xml:lang="DE">Haltestelle Pratteln, Bahnhof verschoben.</Summary>
-          <Summary xml:lang="EN">Pratteln, Bahnhof stop moved.</Summary>
-          <Detail xml:lang="DE">Grund ist eine Veranstaltung.</Detail>
-          <Detail xml:lang="EN">Due to an event.</Detail>
-          <Affects>
-            <StopPlaces>
-              <AffectedStopPlace>
-                <StopPlaceRef>ch:1:sloid:94994</StopPlaceRef>
-                <PlaceName>Pratteln, Bahnhof</PlaceName>
-              </AffectedStopPlace>
-            </StopPlaces>
-          </Affects>
-          <PublishingActions>
-            <PublishingAction>
-              <PublishAtScope>
-                <ScopeType>stopPlace</ScopeType>
-                <Affects>
-                  <StopPlaces>
-                    <AffectedStopPlace>
-                      <StopPlaceRef>ch:1:sloid:94994</StopPlaceRef>
-                      <PlaceName>Pratteln, Bahnhof</PlaceName>
-                    </AffectedStopPlace>
-                  </StopPlaces>
-                </Affects>
-              </PublishAtScope>
-              <PassengerInformationAction>
-                <PublicationWindow>
-                  <StartTime>2022-04-14T09:17:23Z</StartTime>
-                  <EndTime>2022-08-26T21:59:00Z</EndTime>
-                </PublicationWindow>
-                <!--Compared to the other ESAF example with Period, in this scenario only a single consistent text is published over the whole day (morning and afternoon don't differ). As a result, a single ValidityPeriod on PtSituationElement level is sufficient and Period is not required on PassengerInformationAction level.-->
-                <ActionRef>ems-696-1</ActionRef>
-                <RecordedAtTime>2022-04-14T09:17:26Z</RecordedAtTime>
-                <OwnerRef>ch:1:sboid:100626</OwnerRef>
-                <Perspective>whilePlanningTrip</Perspective>
-                <TextualContent>
-                  <TextualContentSize>S</TextualContentSize>
-                  <SummaryContent>
-                    <SummaryText xml:lang="DE">Pratteln, Bahnhof verschoben</SummaryText>
-                    <SummaryText xml:lang="EN">Pratteln, Bahnhof moved</SummaryText>
-                  </SummaryContent>
-                  <ReasonContent>
-                    <ReasonText xml:lang="DE">Grund: Veranstaltung (ESAF)</ReasonText>
-                    <ReasonText xml:lang="EN">Due to an event (ESAF)</ReasonText>
-                  </ReasonContent>
-                  <ConsequenceContent>
-                    <ConsequenceText xml:lang="DE">Die Haltestelle ist verschoben um 500 Meter Richtung Altstadt</ConsequenceText>
-                    <ConsequenceText xml:lang="EN">The bus stop has been moved by 500 meters in the direction of the old town</ConsequenceText>
-                  </ConsequenceContent>
-                  <RecommendationContent>
-                    <RecommendationText xml:lang="DE">Bitte benutzen Sie die provisorische Haltestelle Pratteln, Bahnhof (Richtung Festgelände)</RecommendationText>
-                    <RecommendationText xml:lang="EN">Please use the temporary stop Pratteln, Bahnhof (direction Festgelände)</RecommendationText>
-                  </RecommendationContent>
-                  <DurationContent>
-                    <DurationText xml:lang="DE">Dauer: 26.08.2022, 06:00 - 26.08.2022, 23:00</DurationText>
-                    <DurationText xml:lang="EN">Duration: 26.08.2022, 06:00 - 26.08.2022, 23:00</DurationText>
-                  </DurationContent>
-                  <RemarkContent>
-                    <Remark xml:lang="DE">Bei Fragen wenden Sie sich an das Informationspersonal vor Ort</Remark>
-                    <Remark xml:lang="EN">If you have any questions, please contact the information staff on site</Remark>
-                  </RemarkContent>
-                </TextualContent>
-              </PassengerInformationAction>
-              <PassengerInformationAction>
-                <PublicationWindow>
-                  <StartTime>2022-08-26T02:00:00Z</StartTime>
-                  <EndTime>2022-08-26T21:59:00Z</EndTime>
-                </PublicationWindow>
-                <ActionRef>ems-696-2</ActionRef>
-                <RecordedAtTime>2022-04-14T09:17:26Z</RecordedAtTime>
-                <OwnerRef>ch:1:sboid:100626</OwnerRef>
-                <Perspective>atStopPoint</Perspective>
-                <Perspective>onBoardVehicle</Perspective>
-                <TextualContent>
-                  <TextualContentSize>S</TextualContentSize>
-                  <SummaryContent>
-                    <SummaryText xml:lang="DE">Pratteln, Bahnhof verschoben</SummaryText>
-                    <SummaryText xml:lang="EN">Pratteln, Bahnhof moved</SummaryText>
-                  </SummaryContent>
-                  <ReasonContent>
-                    <ReasonText xml:lang="DE">Grund: Veranstaltung (ESAF)</ReasonText>
-                    <ReasonText xml:lang="EN">Due to an event (ESAF)</ReasonText>
-                  </ReasonContent>
-                  <ConsequenceContent>
-                    <ConsequenceText xml:lang="DE">Die Haltestelle ist verschoben um 500 Meter Richtung Altstadt</ConsequenceText>
-                    <ConsequenceText xml:lang="EN">The bus stop has been moved by 500 meters in the direction of the old town</ConsequenceText>
-                  </ConsequenceContent>
-                  <RecommendationContent>
-                    <RecommendationText xml:lang="DE">Bitte benutzen Sie die provisorische Haltestelle Pratteln, Bahnhof (Richtung Festgelände)</RecommendationText>
-                    <RecommendationText xml:lang="EN">Please use the temporary stop Pratteln, Bahnhof (direction Festgelände)</RecommendationText>
-                  </RecommendationContent>
-                  <DurationContent>
-                    <DurationText xml:lang="DE">Dauer: 26.08.2022, 04:00 - 26.08.2022, 23:59</DurationText>
-                    <DurationText xml:lang="EN">Duration: 26.08.2022, 04:00 - 26.08.2022, 23:59</DurationText>
-                  </DurationContent>
-                  <RemarkContent>
-                    <Remark xml:lang="DE">Bei Fragen wenden Sie sich an das Informationspersonal vor Ort</Remark>
-                    <Remark xml:lang="EN">If you have any questions, please contact the information staff on site</Remark>
-                  </RemarkContent>
-                </TextualContent>
-              </PassengerInformationAction>
-            </PublishingAction>
-          </PublishingActions>
-        </PtSituationElement>
-      </Situations>
-    </SituationExchangeDelivery>
-  </ServiceDelivery>
-</Siri>
\ No newline at end of file
+	<ServiceDelivery>
+		<ResponseTimestamp>2022-04-14T09:17:32Z</ResponseTimestamp>
+		<ProducerRef>ski-ems-out-sx_tesst</ProducerRef>
+		<ResponseMessageIdentifier>wcP9TgJhf</ResponseMessageIdentifier>
+		<Status>true</Status>
+		<MoreData>false</MoreData>
+		<SituationExchangeDelivery version="2.3">
+			<ResponseTimestamp>2022-04-14T09:17:32Z</ResponseTimestamp>
+			<SubscriberRef>ski-ddip-in-sx_test</SubscriberRef>
+			<SubscriptionRef>1</SubscriptionRef>
+			<Situations>
+				<PtSituationElement>
+					<CreationTime>2022-04-14T09:17:23Z</CreationTime>
+					<CountryRef>ch</CountryRef>
+					<ParticipantRef>ski-ems-out-sx_test</ParticipantRef>
+					<SituationNumber>ch:1:sstid:1:3ac880a2-aeb1-5757-989d-d3c15c8220c6</SituationNumber>
+					<Version>1</Version>
+					<Source>
+						<Country>ch</Country>
+						<SourceType>directReport</SourceType>
+						<Name>EMS</Name>
+						<ExternalCode>ski-ems-out-sx_test</ExternalCode>
+					</Source>
+					<VersionedAtTime>2022-04-14T09:17:26Z</VersionedAtTime>
+					<Progress>published</Progress>
+					<ValidityPeriod>
+						<StartTime>2022-08-26T04:00:00Z</StartTime>
+						<EndTime>2022-08-26T21:00:00Z</EndTime>
+					</ValidityPeriod>
+					<PublicationWindow>
+						<StartTime>2022-04-14T09:17:23Z</StartTime>
+						<EndTime>2022-08-26T21:59:00Z</EndTime>
+					</PublicationWindow>
+					<AlertCause>specialEvent</AlertCause>
+					<Severity>normal</Severity>
+					<Priority>3</Priority>
+					<Audience>public</Audience>
+					<ScopeType>stopPlace</ScopeType>
+					<Planned>true</Planned>
+					<Language>DE</Language>
+					<Summary xml:lang="DE">Haltestelle Pratteln, Bahnhof verschoben.</Summary>
+					<Summary xml:lang="EN">Pratteln, Bahnhof stop moved.</Summary>
+					<Detail xml:lang="DE">Grund ist eine Veranstaltung.</Detail>
+					<Detail xml:lang="EN">Due to an event.</Detail>
+					<Affects>
+						<StopPlaces>
+							<AffectedStopPlace>
+								<StopPlaceRef>ch:1:sloid:94994</StopPlaceRef>
+								<PlaceName>Pratteln, Bahnhof</PlaceName>
+							</AffectedStopPlace>
+						</StopPlaces>
+					</Affects>
+					<PublishingActions>
+						<PublishingAction>
+							<PublishAtScope>
+								<ScopeType>stopPlace</ScopeType>
+								<Affects>
+									<StopPlaces>
+										<AffectedStopPlace>
+											<StopPlaceRef>ch:1:sloid:94994</StopPlaceRef>
+											<PlaceName>Pratteln, Bahnhof</PlaceName>
+										</AffectedStopPlace>
+									</StopPlaces>
+								</Affects>
+							</PublishAtScope>
+							<PassengerInformationAction>
+								<PublicationWindow>
+									<StartTime>2022-04-14T09:17:23Z</StartTime>
+									<EndTime>2022-08-26T21:59:00Z</EndTime>
+								</PublicationWindow>
+								<!--Compared to the other ESAF example with Period, in this scenario only a single consistent text is published over the whole day (morning and afternoon don't differ). As a result, a single ValidityPeriod on PtSituationElement level is sufficient and Period is not required on PassengerInformationAction level.-->
+								<ActionRef>ems-696-1</ActionRef>
+								<RecordedAtTime>2022-04-14T09:17:26Z</RecordedAtTime>
+								<OwnerRef>ch:1:sboid:100626</OwnerRef>
+								<Perspective>whilePlanningTrip</Perspective>
+								<TextualContent>
+									<TextualContentSize>S</TextualContentSize>
+									<SummaryContent>
+										<SummaryText xml:lang="DE">Pratteln, Bahnhof verschoben</SummaryText>
+										<SummaryText xml:lang="EN">Pratteln, Bahnhof moved</SummaryText>
+									</SummaryContent>
+									<ReasonContent>
+										<ReasonText xml:lang="DE">Grund: Veranstaltung (ESAF)</ReasonText>
+										<ReasonText xml:lang="EN">Due to an event (ESAF)</ReasonText>
+									</ReasonContent>
+									<ConsequenceContent>
+										<ConsequenceText xml:lang="DE">Die Haltestelle ist verschoben um 500 Meter Richtung Altstadt</ConsequenceText>
+										<ConsequenceText xml:lang="EN">The bus stop has been moved by 500 meters in the direction of the old town</ConsequenceText>
+									</ConsequenceContent>
+									<RecommendationContent>
+										<RecommendationText xml:lang="DE">Bitte benutzen Sie die provisorische Haltestelle Pratteln, Bahnhof (Richtung Festgelände)</RecommendationText>
+										<RecommendationText xml:lang="EN">Please use the temporary stop Pratteln, Bahnhof (direction Festgelände)</RecommendationText>
+									</RecommendationContent>
+									<DurationContent>
+										<DurationText xml:lang="DE">Dauer: 26.08.2022, 06:00 - 26.08.2022, 23:00</DurationText>
+										<DurationText xml:lang="EN">Duration: 26.08.2022, 06:00 - 26.08.2022, 23:00</DurationText>
+									</DurationContent>
+									<RemarkContent>
+										<Remark xml:lang="DE">Bei Fragen wenden Sie sich an das Informationspersonal vor Ort</Remark>
+										<Remark xml:lang="EN">If you have any questions, please contact the information staff on site</Remark>
+									</RemarkContent>
+								</TextualContent>
+							</PassengerInformationAction>
+							<PassengerInformationAction>
+								<PublicationWindow>
+									<StartTime>2022-08-26T02:00:00Z</StartTime>
+									<EndTime>2022-08-26T21:59:00Z</EndTime>
+								</PublicationWindow>
+								<ActionRef>ems-696-2</ActionRef>
+								<RecordedAtTime>2022-04-14T09:17:26Z</RecordedAtTime>
+								<OwnerRef>ch:1:sboid:100626</OwnerRef>
+								<Perspective>atStopPoint</Perspective>
+								<Perspective>onBoardVehicle</Perspective>
+								<TextualContent>
+									<TextualContentSize>S</TextualContentSize>
+									<SummaryContent>
+										<SummaryText xml:lang="DE">Pratteln, Bahnhof verschoben</SummaryText>
+										<SummaryText xml:lang="EN">Pratteln, Bahnhof moved</SummaryText>
+									</SummaryContent>
+									<ReasonContent>
+										<ReasonText xml:lang="DE">Grund: Veranstaltung (ESAF)</ReasonText>
+										<ReasonText xml:lang="EN">Due to an event (ESAF)</ReasonText>
+									</ReasonContent>
+									<ConsequenceContent>
+										<ConsequenceText xml:lang="DE">Die Haltestelle ist verschoben um 500 Meter Richtung Altstadt</ConsequenceText>
+										<ConsequenceText xml:lang="EN">The bus stop has been moved by 500 meters in the direction of the old town</ConsequenceText>
+									</ConsequenceContent>
+									<RecommendationContent>
+										<RecommendationText xml:lang="DE">Bitte benutzen Sie die provisorische Haltestelle Pratteln, Bahnhof (Richtung Festgelände)</RecommendationText>
+										<RecommendationText xml:lang="EN">Please use the temporary stop Pratteln, Bahnhof (direction Festgelände)</RecommendationText>
+									</RecommendationContent>
+									<DurationContent>
+										<DurationText xml:lang="DE">Dauer: 26.08.2022, 04:00 - 26.08.2022, 23:59</DurationText>
+										<DurationText xml:lang="EN">Duration: 26.08.2022, 04:00 - 26.08.2022, 23:59</DurationText>
+									</DurationContent>
+									<RemarkContent>
+										<Remark xml:lang="DE">Bei Fragen wenden Sie sich an das Informationspersonal vor Ort</Remark>
+										<Remark xml:lang="EN">If you have any questions, please contact the information staff on site</Remark>
+									</RemarkContent>
+								</TextualContent>
+							</PassengerInformationAction>
+						</PublishingAction>
+					</PublishingActions>
+				</PtSituationElement>
+			</Situations>
+		</SituationExchangeDelivery>
+	</ServiceDelivery>
+</Siri>

From 3aa69220da0f735d0ee0a4c4a4ae1a0f594d1494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibaut=20Barr=C3=A8re?= <thibaut.barrere@gmail.com>
Date: Thu, 18 Jun 2026 11:46:02 +0200
Subject: [PATCH 6/7] Make it clearer that the pattern is not a regex

---
 .github/workflows/ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d4b66a4f..118e14ac 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,6 +4,9 @@ on:
   push:
     branches: [ "v[0-9]*" ]
   pull_request:
+    # NB: this is a glob filter, not a regex - `*` matches any chars (except `/`),
+    # Hence it should match `v2.2`, `v2.3-wip`, etc.
+    # See https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#filter-pattern-cheat-sheet
     branches: [ "v[0-9]*" ]
 
   # Allows you to run this workflow manually from the Actions tab

From 543ff9fd419f70b959a92ca7404936239cc853ce Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 18 Jun 2026 09:47:03 +0000
Subject: [PATCH 7/7] Lint and update documentation tables

---
 docs/generated/contab/acsb.html   |   40 +-
 docs/generated/contab/datex2.html |   32 +-
 docs/generated/contab/ifopt.html  |   94 +-
 docs/generated/contab/siri.html   | 2854 ++++++++++++++---------------
 4 files changed, 1510 insertions(+), 1510 deletions(-)

diff --git a/docs/generated/contab/acsb.html b/docs/generated/contab/acsb.html
index 1bdb1fc2..d1e20447 100644
--- a/docs/generated/contab/acsb.html
+++ b/docs/generated/contab/acsb.html
@@ -248,7 +248,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-15.1" title="local-type: typedef-15.1">local-type: typedef-15.1</a>
                       </em>
                     </p>
                   </td>
@@ -272,7 +272,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.2" title="local-type: typedef-5.2">local-type: typedef-5.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-15.2" title="local-type: typedef-15.2">local-type: typedef-15.2</a>
                       </em>
                     </p>
                   </td>
@@ -297,7 +297,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-13.1" title="local-type: typedef-13.1">local-type: typedef-13.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
                       </em>
                     </p>
                   </td>
@@ -544,7 +544,7 @@ <h3>1.4. The complex type <code>acsb:AccessibilityLimitationStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-13.1" title="local-type: typedef-13.1">local-type: typedef-13.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
                       </em>
                     </p>
                   </td>
@@ -589,8 +589,8 @@ <h3>1.5. The complex type <code>acsb:LimitationRefStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-15.1">
+          <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-15.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -610,7 +610,7 @@ <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
                       <br/>
                       <code>  /Limitations #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-15.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -652,8 +652,8 @@ <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.2">
-          <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-5.2)</code>
+        <div class="sect2" id="local-type.typedef-15.2">
+          <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-15.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -673,7 +673,7 @@ <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
                       <br/>
                       <code>  /Suitabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-5.2)</code>
+                      <code>  (typedef-15.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -715,8 +715,8 @@ <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-13.1">
-          <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-13.1)</code>
+        <div class="sect2" id="local-type.typedef-59.1">
+          <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -736,7 +736,7 @@ <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-1
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-13.1)</code>
+                      <code>  (typedef-59.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -752,8 +752,8 @@ <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-1
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-13.1">
-          <h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-13.1)</code>
+        <div class="sect2" id="local-type.typedef-59.1">
+          <h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -773,7 +773,7 @@ <h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-1
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-13.1)</code>
+                      <code>  (typedef-59.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -1672,12 +1672,12 @@ <h3>3.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-2.1" class="tableblock">
+                    <p id="local-type.typedef-14.1" class="tableblock">
                       <code>group[acsb:UserNeedGroup]</code>
                       <br/>
                       <code>  /MedicalNeed #simpleType</code>
                       <br/>
-                      <code>  (typedef-2.1)</code>
+                      <code>  (typedef-14.1)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -1844,7 +1844,7 @@ <h3>3.7. The group <code>acsb:UserNeedGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-14.1" title="local-type: typedef-14.1">local-type: typedef-14.1</a>
                       </em>
                     </p>
                   </td>
@@ -2173,7 +2173,7 @@ <h3>3.10. The complex type <code>acsb:UserNeedStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-14.1" title="local-type: typedef-14.1">local-type: typedef-14.1</a>
                       </em>
                     </p>
                   </td>
diff --git a/docs/generated/contab/datex2.html b/docs/generated/contab/datex2.html
index aa6704c6..63eef8fc 100644
--- a/docs/generated/contab/datex2.html
+++ b/docs/generated/contab/datex2.html
@@ -107112,7 +107112,7 @@ <h3>2.204. The complex type <code>orc:Itinerary</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-1.1" title="local-type: typedef-1.1">local-type: typedef-1.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-70.1" title="local-type: typedef-70.1">local-type: typedef-70.1</a>
                       </em>
                     </p>
                   </td>
@@ -111020,7 +111020,7 @@ <h3>2.219. The complex type <code>orc:MeasurementSiteRecord</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-1.2" title="local-type: typedef-1.2">local-type: typedef-1.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-70.2" title="local-type: typedef-70.2">local-type: typedef-70.2</a>
                       </em>
                     </p>
                   </td>
@@ -111865,7 +111865,7 @@ <h3>2.224. The complex type <code>orc:MultilingualString</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-1.3" title="local-type: typedef-1.3">local-type: typedef-1.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-70.3" title="local-type: typedef-70.3">local-type: typedef-70.3</a>
                       </em>
                     </p>
                   </td>
@@ -127573,7 +127573,7 @@ <h3>2.266. The complex type <code>orc:SiteMeasurements</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-1.4" title="local-type: typedef-1.4">local-type: typedef-1.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-70.4" title="local-type: typedef-70.4">local-type: typedef-70.4</a>
                       </em>
                     </p>
                   </td>
@@ -145442,8 +145442,8 @@ <h3>2.326. The complex type <code>orc:WinterDrivingManagement</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-1.1">
-          <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItinerary#complexType (typedef-1.1)</code>
+        <div class="sect2" id="local-type.typedef-70.1">
+          <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItinerary#complexType (typedef-70.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -145463,7 +145463,7 @@ <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItin
                       <br/>
                       <code>  /locationContainedInItinerary #complexType</code>
                       <br/>
-                      <code>  (typedef-1.1)</code>
+                      <code>  (typedef-70.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -145588,8 +145588,8 @@ <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItin
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-1.2">
-          <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurementSpecificCharacteristics#complexType (typedef-1.2)</code>
+        <div class="sect2" id="local-type.typedef-70.2">
+          <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurementSpecificCharacteristics#complexType (typedef-70.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -145609,7 +145609,7 @@ <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurement
                       <br/>
                       <code>  /measurementSpecificCharacteristics #complexType</code>
                       <br/>
-                      <code>  (typedef-1.2)</code>
+                      <code>  (typedef-70.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -145839,8 +145839,8 @@ <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-1.3">
-          <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complexType (typedef-1.3)</code>
+        <div class="sect2" id="local-type.typedef-70.3">
+          <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complexType (typedef-70.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -145860,7 +145860,7 @@ <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complex
                       <br/>
                       <code>  /values #complexType</code>
                       <br/>
-                      <code>  (typedef-1.3)</code>
+                      <code>  (typedef-70.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -145902,8 +145902,8 @@ <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-1.4">
-          <h3>2.330. The complex type <code>complexType[SiteMeasurements]/measuredValue#complexType (typedef-1.4)</code>
+        <div class="sect2" id="local-type.typedef-70.4">
+          <h3>2.330. The complex type <code>complexType[SiteMeasurements]/measuredValue#complexType (typedef-70.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -145923,7 +145923,7 @@ <h3>2.330. The complex type <code>complexType[SiteMeasurements]/measuredValue#co
                       <br/>
                       <code>  /measuredValue #complexType</code>
                       <br/>
-                      <code>  (typedef-1.4)</code>
+                      <code>  (typedef-70.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
diff --git a/docs/generated/contab/ifopt.html b/docs/generated/contab/ifopt.html
index 08b1d230..597e1770 100644
--- a/docs/generated/contab/ifopt.html
+++ b/docs/generated/contab/ifopt.html
@@ -7206,7 +7206,7 @@ <h3>4.8. The group <code>ifopt:LocalServiceGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.1" title="local-type: typedef-18.1">local-type: typedef-18.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-54.1" title="local-type: typedef-54.1">local-type: typedef-54.1</a>
                       </em>
                     </p>
                   </td>
@@ -8212,7 +8212,7 @@ <h3>4.13. The complex type <code>ifopt:LocalServiceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.1" title="local-type: typedef-18.1">local-type: typedef-18.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-54.1" title="local-type: typedef-54.1">local-type: typedef-54.1</a>
                       </em>
                     </p>
                   </td>
@@ -8237,7 +8237,7 @@ <h3>4.13. The complex type <code>ifopt:LocalServiceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-13.1" title="local-type: typedef-13.1">local-type: typedef-13.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
                       </em>
                     </p>
                   </td>
@@ -8562,7 +8562,7 @@ <h3>4.14. The complex type <code>ifopt:PlaceEquipmentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-13.1" title="local-type: typedef-13.1">local-type: typedef-13.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
                       </em>
                     </p>
                   </td>
@@ -8574,8 +8574,8 @@ <h3>4.14. The complex type <code>ifopt:PlaceEquipmentStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.1">
-          <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-18.1)</code>
+        <div class="sect2" id="local-type.typedef-54.1">
+          <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-54.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -8595,7 +8595,7 @@ <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
                       <br/>
                       <code>  /FeatureRefs #complexType</code>
                       <br/>
-                      <code>  (typedef-18.1)</code>
+                      <code>  (typedef-54.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -8633,8 +8633,8 @@ <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.1">
-          <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-18.1)</code>
+        <div class="sect2" id="local-type.typedef-54.1">
+          <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-54.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -8654,7 +8654,7 @@ <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
                       <br/>
                       <code>  /FeatureRefs #complexType</code>
                       <br/>
-                      <code>  (typedef-18.1)</code>
+                      <code>  (typedef-54.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -8692,8 +8692,8 @@ <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-13.1">
-          <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-13.1)</code>
+        <div class="sect2" id="local-type.typedef-59.1">
+          <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -8713,7 +8713,7 @@ <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-13.1)</code>
+                      <code>  (typedef-59.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -8729,8 +8729,8 @@ <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-13.1">
-          <h3>4.18. The complex type <code>element[ifopt:Extensions]#complexType (typedef-13.1)</code>
+        <div class="sect2" id="local-type.typedef-59.1">
+          <h3>4.18. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -8750,7 +8750,7 @@ <h3>4.18. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-13.1)</code>
+                      <code>  (typedef-59.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -9391,7 +9391,7 @@ <h3>5.11. The complex type <code>ifopt:AbstractProjection</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-14.1" title="local-type: typedef-14.1">local-type: typedef-14.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-55.1" title="local-type: typedef-55.1">local-type: typedef-55.1</a>
                       </em>
                     </p>
                   </td>
@@ -9568,7 +9568,7 @@ <h3>5.14. The complex type <code>ifopt:LinkProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-14.1" title="local-type: typedef-14.1">local-type: typedef-14.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-55.1" title="local-type: typedef-55.1">local-type: typedef-55.1</a>
                       </em>
                     </p>
                   </td>
@@ -9597,7 +9597,7 @@ <h3>5.14. The complex type <code>ifopt:LinkProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-14.2" title="local-type: typedef-14.2">local-type: typedef-14.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-55.2" title="local-type: typedef-55.2">local-type: typedef-55.2</a>
                       </em>
                     </p>
                   </td>
@@ -9659,7 +9659,7 @@ <h3>5.15. The complex type <code>ifopt:PointProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-14.1" title="local-type: typedef-14.1">local-type: typedef-14.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-55.1" title="local-type: typedef-55.1">local-type: typedef-55.1</a>
                       </em>
                     </p>
                   </td>
@@ -9908,7 +9908,7 @@ <h3>5.16. The complex type <code>ifopt:ZoneProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-14.1" title="local-type: typedef-14.1">local-type: typedef-14.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-55.1" title="local-type: typedef-55.1">local-type: typedef-55.1</a>
                       </em>
                     </p>
                   </td>
@@ -9941,7 +9941,7 @@ <h3>5.16. The complex type <code>ifopt:ZoneProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-14.3" title="local-type: typedef-14.3">local-type: typedef-14.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-55.3" title="local-type: typedef-55.3">local-type: typedef-55.3</a>
                       </em>
                     </p>
                   </td>
@@ -9953,8 +9953,8 @@ <h3>5.16. The complex type <code>ifopt:ZoneProjectionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-14.1">
-          <h3>5.17. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-14.1)</code>
+        <div class="sect2" id="local-type.typedef-55.1">
+          <h3>5.17. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-55.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -9974,7 +9974,7 @@ <h3>5.17. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-14.1)</code>
+                      <code>  (typedef-55.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10016,8 +10016,8 @@ <h3>5.17. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-14.1">
-          <h3>5.18. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-14.1)</code>
+        <div class="sect2" id="local-type.typedef-55.1">
+          <h3>5.18. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-55.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10037,7 +10037,7 @@ <h3>5.18. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-14.1)</code>
+                      <code>  (typedef-55.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10079,8 +10079,8 @@ <h3>5.18. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-14.2">
-          <h3>5.19. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line#complexType (typedef-14.2)</code>
+        <div class="sect2" id="local-type.typedef-55.2">
+          <h3>5.19. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line#complexType (typedef-55.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10100,7 +10100,7 @@ <h3>5.19. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line
                       <br/>
                       <code>  /Line #complexType</code>
                       <br/>
-                      <code>  (typedef-14.2)</code>
+                      <code>  (typedef-55.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10143,8 +10143,8 @@ <h3>5.19. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-14.1">
-          <h3>5.20. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-14.1)</code>
+        <div class="sect2" id="local-type.typedef-55.1">
+          <h3>5.20. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-55.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10164,7 +10164,7 @@ <h3>5.20. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-14.1)</code>
+                      <code>  (typedef-55.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10206,8 +10206,8 @@ <h3>5.20. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-14.1">
-          <h3>5.21. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-14.1)</code>
+        <div class="sect2" id="local-type.typedef-55.1">
+          <h3>5.21. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-55.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10227,7 +10227,7 @@ <h3>5.21. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-14.1)</code>
+                      <code>  (typedef-55.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10269,8 +10269,8 @@ <h3>5.21. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-14.3">
-          <h3>5.22. The complex type <code>complexType[ifopt:ZoneProjectionStructure]/Boundary#complexType (typedef-14.3)</code>
+        <div class="sect2" id="local-type.typedef-55.3">
+          <h3>5.22. The complex type <code>complexType[ifopt:ZoneProjectionStructure]/Boundary#complexType (typedef-55.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10290,7 +10290,7 @@ <h3>5.22. The complex type <code>complexType[ifopt:ZoneProjectionStructure]/Boun
                       <br/>
                       <code>  /Boundary #complexType</code>
                       <br/>
-                      <code>  (typedef-14.3)</code>
+                      <code>  (typedef-55.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -13149,7 +13149,7 @@ <h3>10.4. The complex type <code>ifopt:ValidityConditionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-20.1" title="local-type: typedef-20.1">local-type: typedef-20.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-57.1" title="local-type: typedef-57.1">local-type: typedef-57.1</a>
                       </em>
                     </p>
                   </td>
@@ -13161,8 +13161,8 @@ <h3>10.4. The complex type <code>ifopt:ValidityConditionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-20.1">
-          <h3>10.5. The complex type <code>complexType[ifopt:ValidityConditionStructure]/Timebands#complexType (typedef-20.1)</code>
+        <div class="sect2" id="local-type.typedef-57.1">
+          <h3>10.5. The complex type <code>complexType[ifopt:ValidityConditionStructure]/Timebands#complexType (typedef-57.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -13182,7 +13182,7 @@ <h3>10.5. The complex type <code>complexType[ifopt:ValidityConditionStructure]/T
                       <br/>
                       <code>  /Timebands #complexType</code>
                       <br/>
-                      <code>  (typedef-20.1)</code>
+                      <code>  (typedef-57.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -13416,8 +13416,8 @@ <h3>11.6. The complex type <code>ifopt:InfoLinkStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-13.1">
-          <h3>11.7. The complex type <code>element[ifopt:Extensions]#complexType (typedef-13.1)</code>
+        <div class="sect2" id="local-type.typedef-59.1">
+          <h3>11.7. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -13437,7 +13437,7 @@ <h3>11.7. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-13.1)</code>
+                      <code>  (typedef-59.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
diff --git a/docs/generated/contab/siri.html b/docs/generated/contab/siri.html
index a65d3aa9..371b7077 100644
--- a/docs/generated/contab/siri.html
+++ b/docs/generated/contab/siri.html
@@ -5535,7 +5535,7 @@ <h3>1.3. The toplevel element <code>siri:ServiceDelivery</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -5944,7 +5944,7 @@ <h3>1.5. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -5975,7 +5975,7 @@ <h3>1.5. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-40.2" title="local-type: typedef-40.2">local-type: typedef-40.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-3.2" title="local-type: typedef-3.2">local-type: typedef-3.2</a>
                       </em>
                     </p>
                   </td>
@@ -6361,7 +6361,7 @@ <h3>1.5. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.4" title="local-type: typedef-85.4">local-type: typedef-85.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -6957,7 +6957,7 @@ <h3>1.7. The group <code>siri:DeliveryResponseGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.4" title="local-type: typedef-85.4">local-type: typedef-85.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -7063,7 +7063,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -7094,7 +7094,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.3" title="local-type: typedef-85.3">local-type: typedef-85.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
                       </em>
                     </p>
                   </td>
@@ -7343,7 +7343,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-76.1" title="local-type: typedef-76.1">local-type: typedef-76.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
                       </em>
                     </p>
                   </td>
@@ -7405,7 +7405,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-76.2" title="local-type: typedef-76.2">local-type: typedef-76.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -7736,7 +7736,7 @@ <h3>1.9. The group <code>siri:ResponseGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.4" title="local-type: typedef-85.4">local-type: typedef-85.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -8176,7 +8176,7 @@ <h3>1.10. The group <code>siri:ServiceDeliveryBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -8670,7 +8670,7 @@ <h3>1.11. The group <code>siri:ServiceRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -8701,7 +8701,7 @@ <h3>1.11. The group <code>siri:ServiceRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.3" title="local-type: typedef-85.3">local-type: typedef-85.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
                       </em>
                     </p>
                   </td>
@@ -8973,7 +8973,7 @@ <h3>1.13. The group <code>siri:SiriDiscoveryRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-76.1" title="local-type: typedef-76.1">local-type: typedef-76.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
                       </em>
                     </p>
                   </td>
@@ -9035,7 +9035,7 @@ <h3>1.13. The group <code>siri:SiriDiscoveryRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-76.2" title="local-type: typedef-76.2">local-type: typedef-76.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -9572,7 +9572,7 @@ <h3>1.15. The group <code>siri:SiriServiceCapabilitiesRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.3" title="local-type: typedef-74.3">local-type: typedef-74.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
                       </em>
                     </p>
                   </td>
@@ -10886,7 +10886,7 @@ <h3>1.19. The group <code>siri:SiriSubscriptionRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
                       </em>
                     </p>
                   </td>
@@ -11433,7 +11433,7 @@ <h3>1.20. The complex type <code>siri:CapabilitiesRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.3" title="local-type: typedef-74.3">local-type: typedef-74.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
                       </em>
                     </p>
                   </td>
@@ -12192,7 +12192,7 @@ <h3>1.22. The complex type <code>siri:ServiceDeliveryBodyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -12894,7 +12894,7 @@ <h3>1.23. The complex type <code>siri:ServiceDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -14410,7 +14410,7 @@ <h3>1.26. The complex type <code>siri:SiriSubscriptionRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
                       </em>
                     </p>
                   </td>
@@ -15029,7 +15029,7 @@ <h3>1.27. The complex type <code>siri:SubscriptionRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
                       </em>
                     </p>
                   </td>
@@ -15320,8 +15320,8 @@ <h3>1.27. The complex type <code>siri:SubscriptionRequestStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.4">
-          <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-85.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -15341,7 +15341,7 @@ <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -15585,7 +15585,7 @@ <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -15646,8 +15646,8 @@ <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-44.1">
-          <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -15667,7 +15667,7 @@ <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-44.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -15778,8 +15778,8 @@ <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.2">
-          <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-85.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -15799,7 +15799,7 @@ <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -16033,8 +16033,8 @@ <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.1">
-          <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-85.1)</code>
+        <div class="sect2" id="local-type.typedef-78.1">
+          <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-78.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -16054,7 +16054,7 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-85.1)</
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.1)</code>
+                      <code>  (typedef-78.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -16134,7 +16134,7 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-85.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -16165,7 +16165,7 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-85.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-40.2" title="local-type: typedef-40.2">local-type: typedef-40.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-3.2" title="local-type: typedef-3.2">local-type: typedef-3.2</a>
                       </em>
                     </p>
                   </td>
@@ -16551,7 +16551,7 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-85.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.4" title="local-type: typedef-85.4">local-type: typedef-85.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -16733,8 +16733,8 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-85.1)</
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.2">
-          <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-85.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -16754,7 +16754,7 @@ <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -16988,8 +16988,8 @@ <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.2">
-          <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-40.2)</code>
+        <div class="sect2" id="local-type.typedef-3.2">
+          <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-3.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -17009,7 +17009,7 @@ <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-40.2)</code>
+                      <code>  (typedef-3.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -17317,8 +17317,8 @@ <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.4">
-          <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-85.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -17338,7 +17338,7 @@ <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -17582,7 +17582,7 @@ <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -17643,8 +17643,8 @@ <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-44.1">
-          <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -17664,7 +17664,7 @@ <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-44.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -17775,8 +17775,8 @@ <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.3">
-          <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-85.3)</code>
+        <div class="sect2" id="local-type.typedef-78.3">
+          <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -17796,7 +17796,7 @@ <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.3)</code>
+                      <code>  (typedef-78.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -18104,8 +18104,8 @@ <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.4">
-          <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-85.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -18125,7 +18125,7 @@ <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -18369,7 +18369,7 @@ <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -18430,8 +18430,8 @@ <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-44.1">
-          <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -18451,7 +18451,7 @@ <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-44.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -18562,8 +18562,8 @@ <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.2">
-          <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-85.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -18583,7 +18583,7 @@ <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -18817,8 +18817,8 @@ <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.3">
-          <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-85.3)</code>
+        <div class="sect2" id="local-type.typedef-78.3">
+          <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -18838,7 +18838,7 @@ <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.3)</code>
+                      <code>  (typedef-78.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -19146,8 +19146,8 @@ <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.1">
-          <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-76.1)</code>
+        <div class="sect2" id="local-type.typedef-86.1">
+          <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -19167,7 +19167,7 @@ <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.1)</code>
+                      <code>  (typedef-86.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -19557,8 +19557,8 @@ <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.2">
-          <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-76.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -19578,7 +19578,7 @@ <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -19796,8 +19796,8 @@ <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.4">
-          <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-85.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -19817,7 +19817,7 @@ <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20061,7 +20061,7 @@ <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -20122,8 +20122,8 @@ <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-44.1">
-          <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20143,7 +20143,7 @@ <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-44.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20254,8 +20254,8 @@ <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-44.1">
-          <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20275,7 +20275,7 @@ <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-44.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20386,8 +20386,8 @@ <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.2">
-          <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-85.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20407,7 +20407,7 @@ <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20641,8 +20641,8 @@ <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.3">
-          <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-85.3)</code>
+        <div class="sect2" id="local-type.typedef-78.3">
+          <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20662,7 +20662,7 @@ <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.3)</code>
+                      <code>  (typedef-78.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20970,8 +20970,8 @@ <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.1">
-          <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-76.1)</code>
+        <div class="sect2" id="local-type.typedef-86.1">
+          <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20991,7 +20991,7 @@ <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.1)</code>
+                      <code>  (typedef-86.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -21381,8 +21381,8 @@ <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.2">
-          <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-76.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -21402,7 +21402,7 @@ <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -21620,8 +21620,8 @@ <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.3">
-          <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-74.3)</code>
+        <div class="sect2" id="local-type.typedef-82.3">
+          <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-82.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -21641,7 +21641,7 @@ <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-74.3)</code>
+                      <code>  (typedef-82.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -21791,8 +21791,8 @@ <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.2">
-          <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-74.2)</code>
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -21812,7 +21812,7 @@ <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-74.2)</code>
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22009,8 +22009,8 @@ <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.3">
-          <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-74.3)</code>
+        <div class="sect2" id="local-type.typedef-82.3">
+          <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-82.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22030,7 +22030,7 @@ <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-74.3)</code>
+                      <code>  (typedef-82.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22180,8 +22180,8 @@ <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-44.1">
-          <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22201,7 +22201,7 @@ <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-44.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22312,8 +22312,8 @@ <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-44.1">
-          <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22333,7 +22333,7 @@ <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-44.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22444,8 +22444,8 @@ <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.2">
-          <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-74.2)</code>
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22465,7 +22465,7 @@ <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-74.2)</code>
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22662,8 +22662,8 @@ <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.2">
-          <h3>1.56. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-74.2)</code>
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>1.56. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22683,7 +22683,7 @@ <h3>1.56. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-74.2)</code>
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -23212,7 +23212,7 @@ <h3>2.3. The toplevel element <code>siri:ServiceDelivery</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -23972,7 +23972,7 @@ <h3>2.6. The group <code>siri:DeliveryResponseGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.4" title="local-type: typedef-85.4">local-type: typedef-85.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -24280,7 +24280,7 @@ <h3>2.9. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -24311,7 +24311,7 @@ <h3>2.9. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.3" title="local-type: typedef-85.3">local-type: typedef-85.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
                       </em>
                     </p>
                   </td>
@@ -24728,7 +24728,7 @@ <h3>2.10. The group <code>siri:ResponseGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.4" title="local-type: typedef-85.4">local-type: typedef-85.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -24943,7 +24943,7 @@ <h3>2.11. The group <code>siri:ServiceDeliveryBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -25062,7 +25062,7 @@ <h3>2.12. The group <code>siri:ServiceRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -25093,7 +25093,7 @@ <h3>2.12. The group <code>siri:ServiceRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.3" title="local-type: typedef-85.3">local-type: typedef-85.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
                       </em>
                     </p>
                   </td>
@@ -25853,7 +25853,7 @@ <h3>2.16. The complex type <code>siri:ServiceDeliveryBodyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -26555,7 +26555,7 @@ <h3>2.17. The complex type <code>siri:ServiceDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -27337,7 +27337,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -27368,7 +27368,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.3" title="local-type: typedef-85.3">local-type: typedef-85.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
                       </em>
                     </p>
                   </td>
@@ -27617,7 +27617,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-76.1" title="local-type: typedef-76.1">local-type: typedef-76.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
                       </em>
                     </p>
                   </td>
@@ -27679,7 +27679,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-76.2" title="local-type: typedef-76.2">local-type: typedef-76.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -27979,7 +27979,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.4" title="local-type: typedef-85.4">local-type: typedef-85.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -28716,8 +28716,8 @@ <h3>2.20. The complex type <code>siri:SubscriptionRequestStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.3">
-          <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-40.3)</code>
+        <div class="sect2" id="local-type.typedef-3.3">
+          <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-3.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -28737,7 +28737,7 @@ <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-40.3)</code>
+                      <code>  (typedef-3.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -28981,7 +28981,7 @@ <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -29042,8 +29042,8 @@ <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-44.1">
-          <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -29063,7 +29063,7 @@ <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-44.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -29174,8 +29174,8 @@ <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.1">
-          <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-40.1)</code>
+        <div class="sect2" id="local-type.typedef-3.1">
+          <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-3.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -29195,7 +29195,7 @@ <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-40.1)</code>
+                      <code>  (typedef-3.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -29463,8 +29463,8 @@ <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.2">
-          <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-40.2)</code>
+        <div class="sect2" id="local-type.typedef-3.2">
+          <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-3.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -29484,7 +29484,7 @@ <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-40.2)</code>
+                      <code>  (typedef-3.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -29792,8 +29792,8 @@ <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.4">
-          <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-85.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -29813,7 +29813,7 @@ <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -30057,7 +30057,7 @@ <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -30118,8 +30118,8 @@ <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-44.1">
-          <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -30139,7 +30139,7 @@ <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-44.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -30250,8 +30250,8 @@ <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.2">
-          <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-85.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -30271,7 +30271,7 @@ <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -30505,8 +30505,8 @@ <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.3">
-          <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-85.3)</code>
+        <div class="sect2" id="local-type.typedef-78.3">
+          <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -30526,7 +30526,7 @@ <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.3)</code>
+                      <code>  (typedef-78.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -30834,8 +30834,8 @@ <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.4">
-          <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-85.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -30855,7 +30855,7 @@ <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -31099,7 +31099,7 @@ <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -31160,8 +31160,8 @@ <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-44.1">
-          <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -31181,7 +31181,7 @@ <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-44.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -31292,8 +31292,8 @@ <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-44.1">
-          <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -31313,7 +31313,7 @@ <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-44.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -31424,8 +31424,8 @@ <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.2">
-          <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-85.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -31445,7 +31445,7 @@ <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -31679,8 +31679,8 @@ <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.3">
-          <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-85.3)</code>
+        <div class="sect2" id="local-type.typedef-78.3">
+          <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -31700,7 +31700,7 @@ <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.3)</code>
+                      <code>  (typedef-78.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32008,8 +32008,8 @@ <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-44.1">
-          <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32029,7 +32029,7 @@ <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-44.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32140,8 +32140,8 @@ <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-44.1">
-          <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32161,7 +32161,7 @@ <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-44.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32272,8 +32272,8 @@ <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.2">
-          <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-85.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32293,7 +32293,7 @@ <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32527,8 +32527,8 @@ <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.3">
-          <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-85.3)</code>
+        <div class="sect2" id="local-type.typedef-78.3">
+          <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32548,7 +32548,7 @@ <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.3)</code>
+                      <code>  (typedef-78.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32856,8 +32856,8 @@ <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.1">
-          <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-76.1)</code>
+        <div class="sect2" id="local-type.typedef-86.1">
+          <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32877,7 +32877,7 @@ <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.1)</code>
+                      <code>  (typedef-86.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -33267,8 +33267,8 @@ <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.2">
-          <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-76.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -33288,7 +33288,7 @@ <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -33506,8 +33506,8 @@ <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.4">
-          <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-85.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -33527,7 +33527,7 @@ <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -33771,7 +33771,7 @@ <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -33832,8 +33832,8 @@ <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-44.1">
-          <h3>2.41. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>2.41. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -33853,7 +33853,7 @@ <h3>2.41. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-44.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -34542,7 +34542,7 @@ <h3>3.16. The group <code>siri:CheckStatusPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-45.4" title="local-type: typedef-45.4">local-type: typedef-45.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.4" title="local-type: typedef-2.4">local-type: typedef-2.4</a>
                       </em>
                     </p>
                   </td>
@@ -34808,7 +34808,7 @@ <h3>3.18. The group <code>siri:DataReceivedPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-45.3" title="local-type: typedef-45.3">local-type: typedef-45.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.3" title="local-type: typedef-2.3">local-type: typedef-2.3</a>
                       </em>
                     </p>
                   </td>
@@ -37048,7 +37048,7 @@ <h3>3.37. The complex type <code>siri:CheckStatusResponseBodyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-45.4" title="local-type: typedef-45.4">local-type: typedef-45.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.4" title="local-type: typedef-2.4">local-type: typedef-2.4</a>
                       </em>
                     </p>
                   </td>
@@ -37386,7 +37386,7 @@ <h3>3.38. The complex type <code>siri:CheckStatusResponseStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-45.4" title="local-type: typedef-45.4">local-type: typedef-45.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.4" title="local-type: typedef-2.4">local-type: typedef-2.4</a>
                       </em>
                     </p>
                   </td>
@@ -38301,7 +38301,7 @@ <h3>3.42. The complex type <code>siri:DataReadyResponseStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-45.2" title="local-type: typedef-45.2">local-type: typedef-45.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.2" title="local-type: typedef-2.2">local-type: typedef-2.2</a>
                       </em>
                     </p>
                   </td>
@@ -38508,7 +38508,7 @@ <h3>3.43. The complex type <code>siri:DataReceivedResponseStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-45.3" title="local-type: typedef-45.3">local-type: typedef-45.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.3" title="local-type: typedef-2.3">local-type: typedef-2.3</a>
                       </em>
                     </p>
                   </td>
@@ -39146,7 +39146,7 @@ <h3>3.46. The complex type <code>siri:HeartbeatNotificationStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-45.4" title="local-type: typedef-45.4">local-type: typedef-45.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.4" title="local-type: typedef-2.4">local-type: typedef-2.4</a>
                       </em>
                     </p>
                   </td>
@@ -41623,7 +41623,7 @@ <h3>3.55. The complex type <code>siri:TerminationResponseStatusStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-45.1" title="local-type: typedef-45.1">local-type: typedef-45.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
                       </em>
                     </p>
                   </td>
@@ -41635,8 +41635,8 @@ <h3>3.55. The complex type <code>siri:TerminationResponseStatusStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-45.4">
-          <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-45.4)</code>
+        <div class="sect2" id="local-type.typedef-2.4">
+          <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-2.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -41656,7 +41656,7 @@ <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-45.4)</code>
+                      <code>  (typedef-2.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -41767,8 +41767,8 @@ <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-45.3">
-          <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-45.3)</code>
+        <div class="sect2" id="local-type.typedef-2.3">
+          <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-2.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -41788,7 +41788,7 @@ <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-45.3)</code>
+                      <code>  (typedef-2.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -41899,8 +41899,8 @@ <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-45.4">
-          <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-45.4)</code>
+        <div class="sect2" id="local-type.typedef-2.4">
+          <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-2.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -41920,7 +41920,7 @@ <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-45.4)</code>
+                      <code>  (typedef-2.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42031,8 +42031,8 @@ <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-45.4">
-          <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-45.4)</code>
+        <div class="sect2" id="local-type.typedef-2.4">
+          <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-2.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42052,7 +42052,7 @@ <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-45.4)</code>
+                      <code>  (typedef-2.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42163,8 +42163,8 @@ <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-45.2">
-          <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/ErrorCondition#complexType (typedef-45.2)</code>
+        <div class="sect2" id="local-type.typedef-2.2">
+          <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/ErrorCondition#complexType (typedef-2.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42184,7 +42184,7 @@ <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/Er
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-45.2)</code>
+                      <code>  (typedef-2.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42295,8 +42295,8 @@ <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/Er
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-45.3">
-          <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-45.3)</code>
+        <div class="sect2" id="local-type.typedef-2.3">
+          <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-2.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42316,7 +42316,7 @@ <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-45.3)</code>
+                      <code>  (typedef-2.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42427,8 +42427,8 @@ <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-45.4">
-          <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-45.4)</code>
+        <div class="sect2" id="local-type.typedef-2.4">
+          <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-2.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42448,7 +42448,7 @@ <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-45.4)</code>
+                      <code>  (typedef-2.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42559,8 +42559,8 @@ <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-45.1">
-          <h3>3.63. The complex type <code>complexType[siri:TerminationResponseStatusStructure]/ErrorCondition#complexType (typedef-45.1)</code>
+        <div class="sect2" id="local-type.typedef-2.1">
+          <h3>3.63. The complex type <code>complexType[siri:TerminationResponseStatusStructure]/ErrorCondition#complexType (typedef-2.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42580,7 +42580,7 @@ <h3>3.63. The complex type <code>complexType[siri:TerminationResponseStatusStruc
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-45.1)</code>
+                      <code>  (typedef-2.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -50447,7 +50447,7 @@ <h3>6.29. The group <code>siri:ServiceDeliveryRequestStatusGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -53179,7 +53179,7 @@ <h3>6.50. The complex type <code>siri:CapabilityGeneralInteractionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-44.2" title="local-type: typedef-44.2">local-type: typedef-44.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.2" title="local-type: typedef-5.2">local-type: typedef-5.2</a>
                       </em>
                     </p>
                   </td>
@@ -53207,7 +53207,7 @@ <h3>6.50. The complex type <code>siri:CapabilityGeneralInteractionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-44.3" title="local-type: typedef-44.3">local-type: typedef-44.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.3" title="local-type: typedef-5.3">local-type: typedef-5.3</a>
                       </em>
                     </p>
                   </td>
@@ -55353,8 +55353,8 @@ <h3>6.63. The complex type <code>siri:TransportDescriptionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-44.1">
-          <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -55374,7 +55374,7 @@ <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-44.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -55485,8 +55485,8 @@ <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-44.2">
-          <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Interaction#complexType (typedef-44.2)</code>
+        <div class="sect2" id="local-type.typedef-5.2">
+          <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Interaction#complexType (typedef-5.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -55506,7 +55506,7 @@ <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionSt
                       <br/>
                       <code>  /Interaction #complexType</code>
                       <br/>
-                      <code>  (typedef-44.2)</code>
+                      <code>  (typedef-5.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -55574,8 +55574,8 @@ <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionSt
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-44.3">
-          <h3>6.66. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Delivery#complexType (typedef-44.3)</code>
+        <div class="sect2" id="local-type.typedef-5.3">
+          <h3>6.66. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Delivery#complexType (typedef-5.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -55595,7 +55595,7 @@ <h3>6.66. The complex type <code>complexType[siri:CapabilityGeneralInteractionSt
                       <br/>
                       <code>  /Delivery #complexType</code>
                       <br/>
-                      <code>  (typedef-44.3)</code>
+                      <code>  (typedef-5.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -57952,7 +57952,7 @@ <h3>7.24. The complex type <code>siri:ConnectionMonitoringCapabilitiesResponseSt
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.3" title="local-type: typedef-86.3">local-type: typedef-86.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-83.3" title="local-type: typedef-83.3">local-type: typedef-83.3</a>
                       </em>
                     </p>
                   </td>
@@ -59634,7 +59634,7 @@ <h3>7.30. The complex type <code>siri:ConnectionMonitoringServiceCapabilitiesStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-83.1" title="local-type: typedef-83.1">local-type: typedef-83.1</a>
                       </em>
                     </p>
                   </td>
@@ -59658,7 +59658,7 @@ <h3>7.30. The complex type <code>siri:ConnectionMonitoringServiceCapabilitiesStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-83.2" title="local-type: typedef-83.2">local-type: typedef-83.2</a>
                       </em>
                     </p>
                   </td>
@@ -61934,8 +61934,8 @@ <h3>7.36. The complex type <code>siri:WaitProlongedDepartureStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.3">
-          <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-86.3)</code>
+        <div class="sect2" id="local-type.typedef-83.3">
+          <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-83.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -61955,7 +61955,7 @@ <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.3)</code>
+                      <code>  (typedef-83.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -61993,8 +61993,8 @@ <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.3">
-          <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-86.3)</code>
+        <div class="sect2" id="local-type.typedef-83.3">
+          <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-83.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -62014,7 +62014,7 @@ <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.3)</code>
+                      <code>  (typedef-83.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -62052,8 +62052,8 @@ <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.1">
-          <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-86.1)</code>
+        <div class="sect2" id="local-type.typedef-83.1">
+          <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-83.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -62073,7 +62073,7 @@ <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCap
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-86.1)</code>
+                      <code>  (typedef-83.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -62182,8 +62182,8 @@ <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCap
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>7.40. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-86.2)</code>
+        <div class="sect2" id="local-type.typedef-83.2">
+          <h3>7.40. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-83.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -62203,7 +62203,7 @@ <h3>7.40. The complex type <code>complexType[siri:ConnectionMonitoringServiceCap
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-86.2)</code>
+                      <code>  (typedef-83.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -63829,7 +63829,7 @@ <h3>8.17. The complex type <code>siri:ConnectionTimetableCapabilitiesResponseStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-83.1" title="local-type: typedef-83.1">local-type: typedef-83.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
                       </em>
                     </p>
                   </td>
@@ -64952,7 +64952,7 @@ <h3>8.22. The complex type <code>siri:ConnectionTimetableServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-83.2" title="local-type: typedef-83.2">local-type: typedef-83.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
                       </em>
                     </p>
                   </td>
@@ -64976,7 +64976,7 @@ <h3>8.22. The complex type <code>siri:ConnectionTimetableServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-83.3" title="local-type: typedef-83.3">local-type: typedef-83.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-74.3" title="local-type: typedef-74.3">local-type: typedef-74.3</a>
                       </em>
                     </p>
                   </td>
@@ -66192,8 +66192,8 @@ <h3>8.25. The complex type <code>siri:TimetabledFeederArrivalStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-83.1">
-          <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitiesResponseStructure]/ConnectionTimetablePermissions#complexType (typedef-83.1)</code>
+        <div class="sect2" id="local-type.typedef-74.1">
+          <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitiesResponseStructure]/ConnectionTimetablePermissions#complexType (typedef-74.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -66213,7 +66213,7 @@ <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitie
                       <br/>
                       <code>  /ConnectionTimetablePermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-83.1)</code>
+                      <code>  (typedef-74.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -66287,8 +66287,8 @@ <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitie
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-83.2">
-          <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-83.2)</code>
+        <div class="sect2" id="local-type.typedef-74.2">
+          <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-74.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -66308,7 +66308,7 @@ <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapa
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-83.2)</code>
+                      <code>  (typedef-74.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -66378,8 +66378,8 @@ <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-83.3">
-          <h3>8.28. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-83.3)</code>
+        <div class="sect2" id="local-type.typedef-74.3">
+          <h3>8.28. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-74.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -66399,7 +66399,7 @@ <h3>8.28. The complex type <code>complexType[siri:ConnectionTimetableServiceCapa
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-83.3)</code>
+                      <code>  (typedef-74.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -67846,7 +67846,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
                       </em>
                     </p>
                   </td>
@@ -67867,7 +67867,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.3" title="local-type: typedef-72.3">local-type: typedef-72.3</a>
                       </em>
                     </p>
                   </td>
@@ -67888,7 +67888,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.7" title="local-type: typedef-78.7">local-type: typedef-78.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.7" title="local-type: typedef-72.7">local-type: typedef-72.7</a>
                       </em>
                     </p>
                   </td>
@@ -67909,7 +67909,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.9" title="local-type: typedef-78.9">local-type: typedef-78.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.9" title="local-type: typedef-72.9">local-type: typedef-72.9</a>
                       </em>
                     </p>
                   </td>
@@ -67930,7 +67930,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.10" title="local-type: typedef-78.10">local-type: typedef-78.10</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.10" title="local-type: typedef-72.10">local-type: typedef-72.10</a>
                       </em>
                     </p>
                   </td>
@@ -68296,7 +68296,7 @@ <h3>9.25. The group <code>siri:ControlActionTopicGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.1" title="local-type: typedef-78.1">local-type: typedef-78.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
                       </em>
                     </p>
                   </td>
@@ -69772,7 +69772,7 @@ <h3>9.35. The group <code>siri:PartialJourneyScope</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.18" title="local-type: typedef-78.18">local-type: typedef-78.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.18" title="local-type: typedef-72.18">local-type: typedef-72.18</a>
                       </em>
                     </p>
                   </td>
@@ -69802,7 +69802,7 @@ <h3>9.35. The group <code>siri:PartialJourneyScope</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.19" title="local-type: typedef-78.19">local-type: typedef-78.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.19" title="local-type: typedef-72.19">local-type: typedef-72.19</a>
                       </em>
                     </p>
                   </td>
@@ -69931,7 +69931,7 @@ <h3>9.36. The group <code>siri:PartOfJourneyPatternScope</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.18" title="local-type: typedef-78.18">local-type: typedef-78.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.18" title="local-type: typedef-72.18">local-type: typedef-72.18</a>
                       </em>
                     </p>
                   </td>
@@ -69961,7 +69961,7 @@ <h3>9.36. The group <code>siri:PartOfJourneyPatternScope</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.19" title="local-type: typedef-78.19">local-type: typedef-78.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.19" title="local-type: typedef-72.19">local-type: typedef-72.19</a>
                       </em>
                     </p>
                   </td>
@@ -71792,7 +71792,7 @@ <h3>9.44. The complex type <code>siri:CallCancellationActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.18" title="local-type: typedef-78.18">local-type: typedef-78.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.18" title="local-type: typedef-72.18">local-type: typedef-72.18</a>
                       </em>
                     </p>
                   </td>
@@ -71822,7 +71822,7 @@ <h3>9.44. The complex type <code>siri:CallCancellationActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.19" title="local-type: typedef-78.19">local-type: typedef-78.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.19" title="local-type: typedef-72.19">local-type: typedef-72.19</a>
                       </em>
                     </p>
                   </td>
@@ -72554,7 +72554,7 @@ <h3>9.49. The complex type <code>siri:ControlActionCapabilitiesResponseStructure
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.14" title="local-type: typedef-78.14">local-type: typedef-78.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.14" title="local-type: typedef-72.14">local-type: typedef-72.14</a>
                       </em>
                     </p>
                   </td>
@@ -73253,7 +73253,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
                       </em>
                     </p>
                   </td>
@@ -73274,7 +73274,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.3" title="local-type: typedef-72.3">local-type: typedef-72.3</a>
                       </em>
                     </p>
                   </td>
@@ -73295,7 +73295,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.7" title="local-type: typedef-78.7">local-type: typedef-78.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.7" title="local-type: typedef-72.7">local-type: typedef-72.7</a>
                       </em>
                     </p>
                   </td>
@@ -73316,7 +73316,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.9" title="local-type: typedef-78.9">local-type: typedef-78.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.9" title="local-type: typedef-72.9">local-type: typedef-72.9</a>
                       </em>
                     </p>
                   </td>
@@ -73337,7 +73337,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.10" title="local-type: typedef-78.10">local-type: typedef-78.10</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.10" title="local-type: typedef-72.10">local-type: typedef-72.10</a>
                       </em>
                     </p>
                   </td>
@@ -73583,7 +73583,7 @@ <h3>9.53. The complex type <code>siri:ControlActionFilterStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.1" title="local-type: typedef-78.1">local-type: typedef-78.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
                       </em>
                     </p>
                   </td>
@@ -74258,7 +74258,7 @@ <h3>9.56. The complex type <code>siri:ControlActionRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.1" title="local-type: typedef-78.1">local-type: typedef-78.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
                       </em>
                     </p>
                   </td>
@@ -74522,7 +74522,7 @@ <h3>9.57. The complex type <code>siri:ControlActionServiceCapabilitiesStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.11" title="local-type: typedef-78.11">local-type: typedef-78.11</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.11" title="local-type: typedef-72.11">local-type: typedef-72.11</a>
                       </em>
                     </p>
                   </td>
@@ -74546,7 +74546,7 @@ <h3>9.57. The complex type <code>siri:ControlActionServiceCapabilitiesStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.12" title="local-type: typedef-78.12">local-type: typedef-78.12</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.12" title="local-type: typedef-72.12">local-type: typedef-72.12</a>
                       </em>
                     </p>
                   </td>
@@ -74618,7 +74618,7 @@ <h3>9.57. The complex type <code>siri:ControlActionServiceCapabilitiesStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.13" title="local-type: typedef-78.13">local-type: typedef-78.13</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.13" title="local-type: typedef-72.13">local-type: typedef-72.13</a>
                       </em>
                     </p>
                   </td>
@@ -74752,7 +74752,7 @@ <h3>9.58. The complex type <code>siri:ControlActionServicePermissionStructure</c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -74786,7 +74786,7 @@ <h3>9.58. The complex type <code>siri:ControlActionServicePermissionStructure</c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.2" title="local-type: typedef-68.2">local-type: typedef-68.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
                       </em>
                     </p>
                   </td>
@@ -74815,7 +74815,7 @@ <h3>9.58. The complex type <code>siri:ControlActionServicePermissionStructure</c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
                       </em>
                     </p>
                   </td>
@@ -75563,7 +75563,7 @@ <h3>9.59. The complex type <code>siri:ControlActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.15" title="local-type: typedef-78.15">local-type: typedef-78.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.15" title="local-type: typedef-72.15">local-type: typedef-72.15</a>
                       </em>
                     </p>
                   </td>
@@ -76406,7 +76406,7 @@ <h3>9.63. The complex type <code>siri:DriverMessageStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.16" title="local-type: typedef-78.16">local-type: typedef-78.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.16" title="local-type: typedef-72.16">local-type: typedef-72.16</a>
                       </em>
                     </p>
                   </td>
@@ -76535,7 +76535,7 @@ <h3>9.63. The complex type <code>siri:DriverMessageStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.17" title="local-type: typedef-78.17">local-type: typedef-78.17</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.17" title="local-type: typedef-72.17">local-type: typedef-72.17</a>
                       </em>
                     </p>
                   </td>
@@ -79917,8 +79917,8 @@ <h3>9.82. The complex type <code>siri:VehicleWorkAssignment</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.14">
-          <h3>9.83. The complex type <code>element[siri:ControlActionPermissions]#complexType (typedef-78.14)</code>
+        <div class="sect2" id="local-type.typedef-72.14">
+          <h3>9.83. The complex type <code>element[siri:ControlActionPermissions]#complexType (typedef-72.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -79938,7 +79938,7 @@ <h3>9.83. The complex type <code>element[siri:ControlActionPermissions]#complexT
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.14)</code>
+                      <code>  (typedef-72.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80012,8 +80012,8 @@ <h3>9.83. The complex type <code>element[siri:ControlActionPermissions]#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.2">
-          <h3>9.84. The complex type <code>group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-78.2)</code>
+        <div class="sect2" id="local-type.typedef-72.2">
+          <h3>9.84. The complex type <code>group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-72.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80033,7 +80033,7 @@ <h3>9.84. The complex type <code>group[siri:ControlActionPayloadGroup]/controlAc
                       <br/>
                       <code>  /controlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-78.2)</code>
+                      <code>  (typedef-72.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80075,8 +80075,8 @@ <h3>9.84. The complex type <code>group[siri:ControlActionPayloadGroup]/controlAc
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.3">
-          <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-78.3)</code>
+        <div class="sect2" id="local-type.typedef-72.3">
+          <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-72.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80096,7 +80096,7 @@ <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                       <br/>
                       <code>  /groupsOfControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-78.3)</code>
+                      <code>  (typedef-72.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80126,7 +80126,7 @@ <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.4" title="local-type: typedef-72.4">local-type: typedef-72.4</a>
                       </em>
                     </p>
                   </td>
@@ -80138,8 +80138,8 @@ <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.4">
-          <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-78.4)</code>
+        <div class="sect2" id="local-type.typedef-72.4">
+          <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-72.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80159,7 +80159,7 @@ <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-78.4)</code>
+                      <code>  (typedef-72.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80329,7 +80329,7 @@ <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.5" title="local-type: typedef-78.5">local-type: typedef-78.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.5" title="local-type: typedef-72.5">local-type: typedef-72.5</a>
                       </em>
                     </p>
                   </td>
@@ -80353,7 +80353,7 @@ <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.6" title="local-type: typedef-78.6">local-type: typedef-78.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.6" title="local-type: typedef-72.6">local-type: typedef-72.6</a>
                       </em>
                     </p>
                   </td>
@@ -80365,8 +80365,8 @@ <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.5">
-          <h3>9.87. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-78.5)</code>
+        <div class="sect2" id="local-type.typedef-72.5">
+          <h3>9.87. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-72.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80386,7 +80386,7 @@ <h3>9.87. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions/AddedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-78.5)</code>
+                      <code>  (typedef-72.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80428,8 +80428,8 @@ <h3>9.87. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.6">
-          <h3>9.88. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-78.6)</code>
+        <div class="sect2" id="local-type.typedef-72.6">
+          <h3>9.88. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-72.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80449,7 +80449,7 @@ <h3>9.88. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions/RemovedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-78.6)</code>
+                      <code>  (typedef-72.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80491,8 +80491,8 @@ <h3>9.88. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.7">
-          <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-78.7)</code>
+        <div class="sect2" id="local-type.typedef-72.7">
+          <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-72.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80512,7 +80512,7 @@ <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
                       <br/>
                       <code>  /revokedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-78.7)</code>
+                      <code>  (typedef-72.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80542,7 +80542,7 @@ <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.8" title="local-type: typedef-78.8">local-type: typedef-78.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.8" title="local-type: typedef-72.8">local-type: typedef-72.8</a>
                       </em>
                     </p>
                   </td>
@@ -80554,8 +80554,8 @@ <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.8">
-          <h3>9.90. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-78.8)</code>
+        <div class="sect2" id="local-type.typedef-72.8">
+          <h3>9.90. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-72.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80575,7 +80575,7 @@ <h3>9.90. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
                       <br/>
                       <code>  /revokedControlActions/RevokedControlAction #complexType</code>
                       <br/>
-                      <code>  (typedef-78.8)</code>
+                      <code>  (typedef-72.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80708,8 +80708,8 @@ <h3>9.90. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.9">
-          <h3>9.91. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-78.9)</code>
+        <div class="sect2" id="local-type.typedef-72.9">
+          <h3>9.91. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-72.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80729,7 +80729,7 @@ <h3>9.91. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMes
                       <br/>
                       <code>  /driverMessages #complexType</code>
                       <br/>
-                      <code>  (typedef-78.9)</code>
+                      <code>  (typedef-72.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80771,8 +80771,8 @@ <h3>9.91. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMes
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.10">
-          <h3>9.92. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-78.10)</code>
+        <div class="sect2" id="local-type.typedef-72.10">
+          <h3>9.92. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-72.10)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80792,7 +80792,7 @@ <h3>9.92. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDe
                       <br/>
                       <code>  /vehicleDetectings #complexType</code>
                       <br/>
-                      <code>  (typedef-78.10)</code>
+                      <code>  (typedef-72.10)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80834,8 +80834,8 @@ <h3>9.92. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.1">
-          <h3>9.93. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-78.1)</code>
+        <div class="sect2" id="local-type.typedef-72.1">
+          <h3>9.93. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-72.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80855,7 +80855,7 @@ <h3>9.93. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#compl
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-78.1)</code>
+                      <code>  (typedef-72.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80897,8 +80897,8 @@ <h3>9.93. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.18">
-          <h3>9.94. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-78.18)</code>
+        <div class="sect2" id="local-type.typedef-72.18">
+          <h3>9.94. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-72.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80918,7 +80918,7 @@ <h3>9.94. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
                       <br/>
                       <code>  /SelectedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-78.18)</code>
+                      <code>  (typedef-72.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80960,8 +80960,8 @@ <h3>9.94. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.19">
-          <h3>9.95. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-78.19)</code>
+        <div class="sect2" id="local-type.typedef-72.19">
+          <h3>9.95. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-72.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80981,7 +80981,7 @@ <h3>9.95. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
                       <br/>
                       <code>  /CallsBetweenPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-78.19)</code>
+                      <code>  (typedef-72.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81051,8 +81051,8 @@ <h3>9.95. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.18">
-          <h3>9.96. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-78.18)</code>
+        <div class="sect2" id="local-type.typedef-72.18">
+          <h3>9.96. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-72.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81072,7 +81072,7 @@ <h3>9.96. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
                       <br/>
                       <code>  /SelectedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-78.18)</code>
+                      <code>  (typedef-72.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81114,8 +81114,8 @@ <h3>9.96. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.19">
-          <h3>9.97. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-78.19)</code>
+        <div class="sect2" id="local-type.typedef-72.19">
+          <h3>9.97. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-72.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81135,7 +81135,7 @@ <h3>9.97. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
                       <br/>
                       <code>  /CallsBetweenPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-78.19)</code>
+                      <code>  (typedef-72.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81205,8 +81205,8 @@ <h3>9.97. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.18">
-          <h3>9.98. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-78.18)</code>
+        <div class="sect2" id="local-type.typedef-72.18">
+          <h3>9.98. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-72.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81226,7 +81226,7 @@ <h3>9.98. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
                       <br/>
                       <code>  /SelectedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-78.18)</code>
+                      <code>  (typedef-72.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81268,8 +81268,8 @@ <h3>9.98. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.19">
-          <h3>9.99. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-78.19)</code>
+        <div class="sect2" id="local-type.typedef-72.19">
+          <h3>9.99. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-72.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81289,7 +81289,7 @@ <h3>9.99. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
                       <br/>
                       <code>  /CallsBetweenPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-78.19)</code>
+                      <code>  (typedef-72.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81359,8 +81359,8 @@ <h3>9.99. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.14">
-          <h3>9.100. The complex type <code>element[siri:ControlActionPermissions]#complexType (typedef-78.14)</code>
+        <div class="sect2" id="local-type.typedef-72.14">
+          <h3>9.100. The complex type <code>element[siri:ControlActionPermissions]#complexType (typedef-72.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81380,7 +81380,7 @@ <h3>9.100. The complex type <code>element[siri:ControlActionPermissions]#complex
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.14)</code>
+                      <code>  (typedef-72.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81454,8 +81454,8 @@ <h3>9.100. The complex type <code>element[siri:ControlActionPermissions]#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.2">
-          <h3>9.101. The complex type <code>group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-78.2)</code>
+        <div class="sect2" id="local-type.typedef-72.2">
+          <h3>9.101. The complex type <code>group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-72.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81475,7 +81475,7 @@ <h3>9.101. The complex type <code>group[siri:ControlActionPayloadGroup]/controlA
                       <br/>
                       <code>  /controlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-78.2)</code>
+                      <code>  (typedef-72.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81517,8 +81517,8 @@ <h3>9.101. The complex type <code>group[siri:ControlActionPayloadGroup]/controlA
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.3">
-          <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-78.3)</code>
+        <div class="sect2" id="local-type.typedef-72.3">
+          <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-72.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81538,7 +81538,7 @@ <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                       <br/>
                       <code>  /groupsOfControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-78.3)</code>
+                      <code>  (typedef-72.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81568,7 +81568,7 @@ <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.4" title="local-type: typedef-72.4">local-type: typedef-72.4</a>
                       </em>
                     </p>
                   </td>
@@ -81580,8 +81580,8 @@ <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.4">
-          <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-78.4)</code>
+        <div class="sect2" id="local-type.typedef-72.4">
+          <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-72.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81601,7 +81601,7 @@ <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-78.4)</code>
+                      <code>  (typedef-72.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81771,7 +81771,7 @@ <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.5" title="local-type: typedef-78.5">local-type: typedef-78.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.5" title="local-type: typedef-72.5">local-type: typedef-72.5</a>
                       </em>
                     </p>
                   </td>
@@ -81795,7 +81795,7 @@ <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.6" title="local-type: typedef-78.6">local-type: typedef-78.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.6" title="local-type: typedef-72.6">local-type: typedef-72.6</a>
                       </em>
                     </p>
                   </td>
@@ -81807,8 +81807,8 @@ <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.5">
-          <h3>9.104. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-78.5)</code>
+        <div class="sect2" id="local-type.typedef-72.5">
+          <h3>9.104. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-72.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81828,7 +81828,7 @@ <h3>9.104. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions/AddedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-78.5)</code>
+                      <code>  (typedef-72.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81870,8 +81870,8 @@ <h3>9.104. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.6">
-          <h3>9.105. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-78.6)</code>
+        <div class="sect2" id="local-type.typedef-72.6">
+          <h3>9.105. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-72.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81891,7 +81891,7 @@ <h3>9.105. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions/RemovedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-78.6)</code>
+                      <code>  (typedef-72.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81933,8 +81933,8 @@ <h3>9.105. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.7">
-          <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-78.7)</code>
+        <div class="sect2" id="local-type.typedef-72.7">
+          <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-72.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81954,7 +81954,7 @@ <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
                       <br/>
                       <code>  /revokedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-78.7)</code>
+                      <code>  (typedef-72.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81984,7 +81984,7 @@ <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.8" title="local-type: typedef-78.8">local-type: typedef-78.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.8" title="local-type: typedef-72.8">local-type: typedef-72.8</a>
                       </em>
                     </p>
                   </td>
@@ -81996,8 +81996,8 @@ <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.8">
-          <h3>9.107. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-78.8)</code>
+        <div class="sect2" id="local-type.typedef-72.8">
+          <h3>9.107. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-72.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82017,7 +82017,7 @@ <h3>9.107. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
                       <br/>
                       <code>  /revokedControlActions/RevokedControlAction #complexType</code>
                       <br/>
-                      <code>  (typedef-78.8)</code>
+                      <code>  (typedef-72.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82150,8 +82150,8 @@ <h3>9.107. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.9">
-          <h3>9.108. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-78.9)</code>
+        <div class="sect2" id="local-type.typedef-72.9">
+          <h3>9.108. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-72.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82171,7 +82171,7 @@ <h3>9.108. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMe
                       <br/>
                       <code>  /driverMessages #complexType</code>
                       <br/>
-                      <code>  (typedef-78.9)</code>
+                      <code>  (typedef-72.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82213,8 +82213,8 @@ <h3>9.108. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.10">
-          <h3>9.109. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-78.10)</code>
+        <div class="sect2" id="local-type.typedef-72.10">
+          <h3>9.109. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-72.10)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82234,7 +82234,7 @@ <h3>9.109. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleD
                       <br/>
                       <code>  /vehicleDetectings #complexType</code>
                       <br/>
-                      <code>  (typedef-78.10)</code>
+                      <code>  (typedef-72.10)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82276,8 +82276,8 @@ <h3>9.109. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleD
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.1">
-          <h3>9.110. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-78.1)</code>
+        <div class="sect2" id="local-type.typedef-72.1">
+          <h3>9.110. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-72.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82297,7 +82297,7 @@ <h3>9.110. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#comp
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-78.1)</code>
+                      <code>  (typedef-72.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82339,8 +82339,8 @@ <h3>9.110. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.1">
-          <h3>9.111. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-78.1)</code>
+        <div class="sect2" id="local-type.typedef-72.1">
+          <h3>9.111. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-72.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82360,7 +82360,7 @@ <h3>9.111. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#comp
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-78.1)</code>
+                      <code>  (typedef-72.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82402,8 +82402,8 @@ <h3>9.111. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.11">
-          <h3>9.112. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-78.11)</code>
+        <div class="sect2" id="local-type.typedef-72.11">
+          <h3>9.112. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-72.11)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82423,7 +82423,7 @@ <h3>9.112. The complex type <code>complexType[siri:ControlActionServiceCapabilit
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-78.11)</code>
+                      <code>  (typedef-72.11)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82555,8 +82555,8 @@ <h3>9.112. The complex type <code>complexType[siri:ControlActionServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.12">
-          <h3>9.113. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-78.12)</code>
+        <div class="sect2" id="local-type.typedef-72.12">
+          <h3>9.113. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-72.12)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82576,7 +82576,7 @@ <h3>9.113. The complex type <code>complexType[siri:ControlActionServiceCapabilit
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-78.12)</code>
+                      <code>  (typedef-72.12)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82794,8 +82794,8 @@ <h3>9.113. The complex type <code>complexType[siri:ControlActionServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.13">
-          <h3>9.114. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-78.13)</code>
+        <div class="sect2" id="local-type.typedef-72.13">
+          <h3>9.114. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-72.13)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82815,7 +82815,7 @@ <h3>9.114. The complex type <code>complexType[siri:ControlActionServiceCapabilit
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-78.13)</code>
+                      <code>  (typedef-72.13)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82852,8 +82852,8 @@ <h3>9.114. The complex type <code>complexType[siri:ControlActionServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-39.1">
-          <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-39.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82873,7 +82873,7 @@ <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-39.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82941,8 +82941,8 @@ <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.2">
-          <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-68.2)</code>
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82962,7 +82962,7 @@ <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-68.2)</code>
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83047,8 +83047,8 @@ <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.1">
-          <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typedef-68.1)</code>
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83068,7 +83068,7 @@ <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-68.1)</code>
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83153,8 +83153,8 @@ <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.15">
-          <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/SituationDescription#complexType (typedef-78.15)</code>
+        <div class="sect2" id="local-type.typedef-72.15">
+          <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/SituationDescription#complexType (typedef-72.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83174,7 +83174,7 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
                       <br/>
                       <code>  /SituationDescription #complexType</code>
                       <br/>
-                      <code>  (typedef-78.15)</code>
+                      <code>  (typedef-72.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83325,7 +83325,7 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.14" title="local-type: typedef-47.14">local-type: typedef-47.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
                       </em>
                     </p>
                   </td>
@@ -83346,7 +83346,7 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.16" title="local-type: typedef-47.16">local-type: typedef-47.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
                       </em>
                     </p>
                   </td>
@@ -83358,8 +83358,8 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.14">
-          <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-47.14)</code>
+        <div class="sect2" id="local-type.typedef-34.14">
+          <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83379,7 +83379,7 @@ <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-47.14)</code>
+                      <code>  (typedef-34.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83409,7 +83409,7 @@ <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.15" title="local-type: typedef-47.15">local-type: typedef-47.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
                       </em>
                     </p>
                   </td>
@@ -83421,8 +83421,8 @@ <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.15">
-          <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-47.15)</code>
+        <div class="sect2" id="local-type.typedef-34.15">
+          <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83442,7 +83442,7 @@ <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-47.15)</code>
+                      <code>  (typedef-34.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83557,8 +83557,8 @@ <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.16">
-          <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-47.16)</code>
+        <div class="sect2" id="local-type.typedef-34.16">
+          <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83578,7 +83578,7 @@ <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-47.16)</code>
+                      <code>  (typedef-34.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83620,8 +83620,8 @@ <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.16">
-          <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/MessageContents#complexType (typedef-78.16)</code>
+        <div class="sect2" id="local-type.typedef-72.16">
+          <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/MessageContents#complexType (typedef-72.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83641,7 +83641,7 @@ <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/Messa
                       <br/>
                       <code>  /MessageContents #complexType</code>
                       <br/>
-                      <code>  (typedef-78.16)</code>
+                      <code>  (typedef-72.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83683,8 +83683,8 @@ <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/Messa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.17">
-          <h3>9.123. The complex type <code>complexType[siri:DriverMessageStructure]/DriverScope#complexType (typedef-78.17)</code>
+        <div class="sect2" id="local-type.typedef-72.17">
+          <h3>9.123. The complex type <code>complexType[siri:DriverMessageStructure]/DriverScope#complexType (typedef-72.17)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83704,7 +83704,7 @@ <h3>9.123. The complex type <code>complexType[siri:DriverMessageStructure]/Drive
                       <br/>
                       <code>  /DriverScope #complexType</code>
                       <br/>
-                      <code>  (typedef-78.17)</code>
+                      <code>  (typedef-72.17)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -86197,7 +86197,7 @@ <h3>10.29. The group <code>siri:SiriDiscoveryIndexGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-76.1" title="local-type: typedef-76.1">local-type: typedef-76.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
                       </em>
                     </p>
                   </td>
@@ -86259,7 +86259,7 @@ <h3>10.29. The group <code>siri:SiriDiscoveryIndexGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-76.2" title="local-type: typedef-76.2">local-type: typedef-76.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -87027,7 +87027,7 @@ <h3>10.31. The group <code>siri:SiriReferenceDiscoveryRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-76.1" title="local-type: typedef-76.1">local-type: typedef-76.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
                       </em>
                     </p>
                   </td>
@@ -87089,7 +87089,7 @@ <h3>10.31. The group <code>siri:SiriReferenceDiscoveryRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-76.2" title="local-type: typedef-76.2">local-type: typedef-76.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -92109,8 +92109,8 @@ <h3>10.50. The complex type <code>siri:VehicleFeaturesRequestStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.2">
-          <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-76.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -92130,7 +92130,7 @@ <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -92348,8 +92348,8 @@ <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.1">
-          <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-76.1)</code>
+        <div class="sect2" id="local-type.typedef-86.1">
+          <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -92369,7 +92369,7 @@ <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (t
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.1)</code>
+                      <code>  (typedef-86.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -92759,8 +92759,8 @@ <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (t
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.1">
-          <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-76.1)</code>
+        <div class="sect2" id="local-type.typedef-86.1">
+          <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -92780,7 +92780,7 @@ <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (t
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.1)</code>
+                      <code>  (typedef-86.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -93170,8 +93170,8 @@ <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (t
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.2">
-          <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-76.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -93191,7 +93191,7 @@ <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -93409,8 +93409,8 @@ <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.1">
-          <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-76.1)</code>
+        <div class="sect2" id="local-type.typedef-86.1">
+          <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -93430,7 +93430,7 @@ <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (t
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.1)</code>
+                      <code>  (typedef-86.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -93820,8 +93820,8 @@ <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (t
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.2">
-          <h3>10.56. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-76.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>10.56. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -93841,7 +93841,7 @@ <h3>10.56. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -94894,7 +94894,7 @@ <h3>11.13. The group <code>siri:EstimatedTimetableTopicGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.1" title="local-type: typedef-79.1">local-type: typedef-79.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-76.1" title="local-type: typedef-76.1">local-type: typedef-76.1</a>
                       </em>
                     </p>
                   </td>
@@ -95387,7 +95387,7 @@ <h3>11.15. The complex type <code>siri:EstimatedTimetableCapabilitiesResponseStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.4" title="local-type: typedef-79.4">local-type: typedef-79.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-76.4" title="local-type: typedef-76.4">local-type: typedef-76.4</a>
                       </em>
                     </p>
                   </td>
@@ -96301,7 +96301,7 @@ <h3>11.19. The complex type <code>siri:EstimatedTimetableRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.1" title="local-type: typedef-79.1">local-type: typedef-79.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-76.1" title="local-type: typedef-76.1">local-type: typedef-76.1</a>
                       </em>
                     </p>
                   </td>
@@ -96634,7 +96634,7 @@ <h3>11.20. The complex type <code>siri:EstimatedTimetableServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.2" title="local-type: typedef-79.2">local-type: typedef-79.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-76.2" title="local-type: typedef-76.2">local-type: typedef-76.2</a>
                       </em>
                     </p>
                   </td>
@@ -96658,7 +96658,7 @@ <h3>11.20. The complex type <code>siri:EstimatedTimetableServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.3" title="local-type: typedef-79.3">local-type: typedef-79.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-76.3" title="local-type: typedef-76.3">local-type: typedef-76.3</a>
                       </em>
                     </p>
                   </td>
@@ -97174,8 +97174,8 @@ <h3>11.22. The complex type <code>siri:EstimatedVersionFrameStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.4">
-          <h3>11.23. The complex type <code>element[siri:EstimatedTimetablePermissions]#complexType (typedef-79.4)</code>
+        <div class="sect2" id="local-type.typedef-76.4">
+          <h3>11.23. The complex type <code>element[siri:EstimatedTimetablePermissions]#complexType (typedef-76.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -97195,7 +97195,7 @@ <h3>11.23. The complex type <code>element[siri:EstimatedTimetablePermissions]#co
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-79.4)</code>
+                      <code>  (typedef-76.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -97269,8 +97269,8 @@ <h3>11.23. The complex type <code>element[siri:EstimatedTimetablePermissions]#co
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.1">
-          <h3>11.24. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines#complexType (typedef-79.1)</code>
+        <div class="sect2" id="local-type.typedef-76.1">
+          <h3>11.24. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines#complexType (typedef-76.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -97290,7 +97290,7 @@ <h3>11.24. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-79.1)</code>
+                      <code>  (typedef-76.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -97332,8 +97332,8 @@ <h3>11.24. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.4">
-          <h3>11.25. The complex type <code>element[siri:EstimatedTimetablePermissions]#complexType (typedef-79.4)</code>
+        <div class="sect2" id="local-type.typedef-76.4">
+          <h3>11.25. The complex type <code>element[siri:EstimatedTimetablePermissions]#complexType (typedef-76.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -97353,7 +97353,7 @@ <h3>11.25. The complex type <code>element[siri:EstimatedTimetablePermissions]#co
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-79.4)</code>
+                      <code>  (typedef-76.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -97427,8 +97427,8 @@ <h3>11.25. The complex type <code>element[siri:EstimatedTimetablePermissions]#co
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.1">
-          <h3>11.26. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines#complexType (typedef-79.1)</code>
+        <div class="sect2" id="local-type.typedef-76.1">
+          <h3>11.26. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines#complexType (typedef-76.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -97448,7 +97448,7 @@ <h3>11.26. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-79.1)</code>
+                      <code>  (typedef-76.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -97490,8 +97490,8 @@ <h3>11.26. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.2">
-          <h3>11.27. The complex type <code>complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-79.2)</code>
+        <div class="sect2" id="local-type.typedef-76.2">
+          <h3>11.27. The complex type <code>complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-76.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -97511,7 +97511,7 @@ <h3>11.27. The complex type <code>complexType[siri:EstimatedTimetableServiceCapa
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-79.2)</code>
+                      <code>  (typedef-76.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -97701,8 +97701,8 @@ <h3>11.27. The complex type <code>complexType[siri:EstimatedTimetableServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.3">
-          <h3>11.28. The complex type <code>complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-79.3)</code>
+        <div class="sect2" id="local-type.typedef-76.3">
+          <h3>11.28. The complex type <code>complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-76.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -97722,7 +97722,7 @@ <h3>11.28. The complex type <code>complexType[siri:EstimatedTimetableServiceCapa
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-79.3)</code>
+                      <code>  (typedef-76.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -101085,7 +101085,7 @@ <h3>12.22. The complex type <code>siri:FacilityMonitoringServicePermissionStruct
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -101119,7 +101119,7 @@ <h3>12.22. The complex type <code>siri:FacilityMonitoringServicePermissionStruct
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.2" title="local-type: typedef-68.2">local-type: typedef-68.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
                       </em>
                     </p>
                   </td>
@@ -101148,7 +101148,7 @@ <h3>12.22. The complex type <code>siri:FacilityMonitoringServicePermissionStruct
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
                       </em>
                     </p>
                   </td>
@@ -102276,8 +102276,8 @@ <h3>12.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-39.1">
-          <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-39.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -102297,7 +102297,7 @@ <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-39.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -102365,8 +102365,8 @@ <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.2">
-          <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-68.2)</code>
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -102386,7 +102386,7 @@ <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-68.2)</code>
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -102471,8 +102471,8 @@ <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.1">
-          <h3>12.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-68.1)</code>
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>12.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -102492,7 +102492,7 @@ <h3>12.32. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-68.1)</code>
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -103671,7 +103671,7 @@ <h3>13.17. The complex type <code>siri:GeneralMessageCapabilitiesResponseStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-75.2" title="local-type: typedef-75.2">local-type: typedef-75.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-84.2" title="local-type: typedef-84.2">local-type: typedef-84.2</a>
                       </em>
                     </p>
                   </td>
@@ -104614,7 +104614,7 @@ <h3>13.22. The complex type <code>siri:GeneralMessageServiceCapabilitiesStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-75.1" title="local-type: typedef-75.1">local-type: typedef-75.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-84.1" title="local-type: typedef-84.1">local-type: typedef-84.1</a>
                       </em>
                     </p>
                   </td>
@@ -104796,7 +104796,7 @@ <h3>13.23. The complex type <code>siri:GeneralMessageServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -104829,7 +104829,7 @@ <h3>13.23. The complex type <code>siri:GeneralMessageServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-75.3" title="local-type: typedef-75.3">local-type: typedef-75.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-84.3" title="local-type: typedef-84.3">local-type: typedef-84.3</a>
                       </em>
                     </p>
                   </td>
@@ -105655,8 +105655,8 @@ <h3>13.28. The complex type <code>siri:InfoMessageStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.2">
-          <h3>13.29. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-75.2)</code>
+        <div class="sect2" id="local-type.typedef-84.2">
+          <h3>13.29. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-84.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -105676,7 +105676,7 @@ <h3>13.29. The complex type <code>element[siri:GeneralMessagePermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-75.2)</code>
+                      <code>  (typedef-84.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -105750,8 +105750,8 @@ <h3>13.29. The complex type <code>element[siri:GeneralMessagePermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.2">
-          <h3>13.30. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-75.2)</code>
+        <div class="sect2" id="local-type.typedef-84.2">
+          <h3>13.30. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-84.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -105771,7 +105771,7 @@ <h3>13.30. The complex type <code>element[siri:GeneralMessagePermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-75.2)</code>
+                      <code>  (typedef-84.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -105845,8 +105845,8 @@ <h3>13.30. The complex type <code>element[siri:GeneralMessagePermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.1">
-          <h3>13.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-75.1)</code>
+        <div class="sect2" id="local-type.typedef-84.1">
+          <h3>13.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-84.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -105866,7 +105866,7 @@ <h3>13.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabili
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-75.1)</code>
+                      <code>  (typedef-84.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -105932,8 +105932,8 @@ <h3>13.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabili
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-39.1">
-          <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-39.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -105953,7 +105953,7 @@ <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-39.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -106021,8 +106021,8 @@ <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.3">
-          <h3>13.33. The complex type <code>complexType[siri:GeneralMessageServicePermissionStructure]/InfoChannelPermissions#complexType (typedef-75.3)</code>
+        <div class="sect2" id="local-type.typedef-84.3">
+          <h3>13.33. The complex type <code>complexType[siri:GeneralMessageServicePermissionStructure]/InfoChannelPermissions#complexType (typedef-84.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -106042,7 +106042,7 @@ <h3>13.33. The complex type <code>complexType[siri:GeneralMessageServicePermissi
                       <br/>
                       <code>  /InfoChannelPermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-75.3)</code>
+                      <code>  (typedef-84.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -110248,7 +110248,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-53.6" title="local-type: typedef-53.6">local-type: typedef-53.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.6" title="local-type: typedef-28.6">local-type: typedef-28.6</a>
                       </em>
                     </p>
                   </td>
@@ -110269,7 +110269,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-53.7" title="local-type: typedef-53.7">local-type: typedef-53.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.7" title="local-type: typedef-28.7">local-type: typedef-28.7</a>
                       </em>
                     </p>
                   </td>
@@ -110293,7 +110293,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.2" title="local-type: typedef-54.2">local-type: typedef-54.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
                       </em>
                     </p>
                   </td>
@@ -110314,7 +110314,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.3" title="local-type: typedef-54.3">local-type: typedef-54.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
                       </em>
                     </p>
                   </td>
@@ -110335,7 +110335,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.4" title="local-type: typedef-54.4">local-type: typedef-54.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
                       </em>
                     </p>
                   </td>
@@ -110363,7 +110363,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-63.1" title="local-type: typedef-63.1">local-type: typedef-63.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-21.1" title="local-type: typedef-21.1">local-type: typedef-21.1</a>
                       </em>
                     </p>
                   </td>
@@ -111078,7 +111078,7 @@ <h3>14.32. The complex type <code>siri:RemovedDatedVehicleJourneyStructure</code
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-63.2" title="local-type: typedef-63.2">local-type: typedef-63.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-21.2" title="local-type: typedef-21.2">local-type: typedef-21.2</a>
                       </em>
                     </p>
                   </td>
@@ -113113,8 +113113,8 @@ <h3>14.36. The complex type <code>siri:ToServiceJourneyInterchangeStructure</cod
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-53.6">
-          <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-53.6)</code>
+        <div class="sect2" id="local-type.typedef-28.6">
+          <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113134,7 +113134,7 @@ <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-53.6)</code>
+                      <code>  (typedef-28.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113176,8 +113176,8 @@ <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-53.7">
-          <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-53.7)</code>
+        <div class="sect2" id="local-type.typedef-28.7">
+          <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113197,7 +113197,7 @@ <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-53.7)</code>
+                      <code>  (typedef-28.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113239,8 +113239,8 @@ <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.2">
-          <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-54.2)</code>
+        <div class="sect2" id="local-type.typedef-18.2">
+          <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113260,7 +113260,7 @@ <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-54.2)</code>
+                      <code>  (typedef-18.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113347,8 +113347,8 @@ <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.3">
-          <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-54.3)</code>
+        <div class="sect2" id="local-type.typedef-18.3">
+          <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113368,7 +113368,7 @@ <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-54.3)</code>
+                      <code>  (typedef-18.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113455,8 +113455,8 @@ <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.4">
-          <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-54.4)</code>
+        <div class="sect2" id="local-type.typedef-18.4">
+          <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113476,7 +113476,7 @@ <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-54.4)</code>
+                      <code>  (typedef-18.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113563,8 +113563,8 @@ <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-63.1">
-          <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]/DatedCalls#complexType (typedef-63.1)</code>
+        <div class="sect2" id="local-type.typedef-21.1">
+          <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]/DatedCalls#complexType (typedef-21.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113584,7 +113584,7 @@ <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]
                       <br/>
                       <code>  /DatedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-63.1)</code>
+                      <code>  (typedef-21.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113627,8 +113627,8 @@ <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-63.2">
-          <h3>14.43. The complex type <code>complexType[siri:RemovedDatedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-63.2)</code>
+        <div class="sect2" id="local-type.typedef-21.2">
+          <h3>14.43. The complex type <code>complexType[siri:RemovedDatedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-21.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113648,7 +113648,7 @@ <h3>14.43. The complex type <code>complexType[siri:RemovedDatedVehicleJourneyStr
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-63.2)</code>
+                      <code>  (typedef-21.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -119107,7 +119107,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-53.4" title="local-type: typedef-53.4">local-type: typedef-53.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.4" title="local-type: typedef-28.4">local-type: typedef-28.4</a>
                       </em>
                     </p>
                   </td>
@@ -119128,7 +119128,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-53.5" title="local-type: typedef-53.5">local-type: typedef-53.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.5" title="local-type: typedef-28.5">local-type: typedef-28.5</a>
                       </em>
                     </p>
                   </td>
@@ -119152,7 +119152,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.2" title="local-type: typedef-54.2">local-type: typedef-54.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
                       </em>
                     </p>
                   </td>
@@ -119173,7 +119173,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.3" title="local-type: typedef-54.3">local-type: typedef-54.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
                       </em>
                     </p>
                   </td>
@@ -119194,7 +119194,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.4" title="local-type: typedef-54.4">local-type: typedef-54.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
                       </em>
                     </p>
                   </td>
@@ -119218,7 +119218,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-69.1" title="local-type: typedef-69.1">local-type: typedef-69.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-36.1" title="local-type: typedef-36.1">local-type: typedef-36.1</a>
                       </em>
                     </p>
                   </td>
@@ -119242,7 +119242,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-69.2" title="local-type: typedef-69.2">local-type: typedef-69.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-36.2" title="local-type: typedef-36.2">local-type: typedef-36.2</a>
                       </em>
                     </p>
                   </td>
@@ -120624,8 +120624,8 @@ <h3>15.15. The complex type <code>siri:WillWaitStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-53.4">
-          <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-53.4)</code>
+        <div class="sect2" id="local-type.typedef-28.4">
+          <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120645,7 +120645,7 @@ <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-53.4)</code>
+                      <code>  (typedef-28.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -120687,8 +120687,8 @@ <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-53.5">
-          <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-53.5)</code>
+        <div class="sect2" id="local-type.typedef-28.5">
+          <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120708,7 +120708,7 @@ <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-53.5)</code>
+                      <code>  (typedef-28.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -120750,8 +120750,8 @@ <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.2">
-          <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-54.2)</code>
+        <div class="sect2" id="local-type.typedef-18.2">
+          <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120771,7 +120771,7 @@ <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-54.2)</code>
+                      <code>  (typedef-18.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -120858,8 +120858,8 @@ <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.3">
-          <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-54.3)</code>
+        <div class="sect2" id="local-type.typedef-18.3">
+          <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120879,7 +120879,7 @@ <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-54.3)</code>
+                      <code>  (typedef-18.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -120966,8 +120966,8 @@ <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.4">
-          <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-54.4)</code>
+        <div class="sect2" id="local-type.typedef-18.4">
+          <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120987,7 +120987,7 @@ <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-54.4)</code>
+                      <code>  (typedef-18.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -121074,8 +121074,8 @@ <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-69.1">
-          <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/RecordedCalls#complexType (typedef-69.1)</code>
+        <div class="sect2" id="local-type.typedef-36.1">
+          <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/RecordedCalls#complexType (typedef-36.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -121095,7 +121095,7 @@ <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStruct
                       <br/>
                       <code>  /RecordedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-69.1)</code>
+                      <code>  (typedef-36.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -121138,8 +121138,8 @@ <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStruct
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-69.2">
-          <h3>15.22. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/EstimatedCalls#complexType (typedef-69.2)</code>
+        <div class="sect2" id="local-type.typedef-36.2">
+          <h3>15.22. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/EstimatedCalls#complexType (typedef-36.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -121159,7 +121159,7 @@ <h3>15.22. The complex type <code>complexType[siri:EstimatedVehicleJourneyStruct
                       <br/>
                       <code>  /EstimatedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-69.2)</code>
+                      <code>  (typedef-36.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -126321,7 +126321,7 @@ <h3>17.15. The group <code>siri:FacilityAccessibilityGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.2" title="local-type: typedef-52.2">local-type: typedef-52.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.2" title="local-type: typedef-22.2">local-type: typedef-22.2</a>
                       </em>
                     </p>
                   </td>
@@ -126342,7 +126342,7 @@ <h3>17.15. The group <code>siri:FacilityAccessibilityGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.3" title="local-type: typedef-52.3">local-type: typedef-52.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.3" title="local-type: typedef-22.3">local-type: typedef-22.3</a>
                       </em>
                     </p>
                   </td>
@@ -127039,7 +127039,7 @@ <h3>17.19. The complex type <code>siri:EquipmentAvailabilityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.6" title="local-type: typedef-52.6">local-type: typedef-52.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.6" title="local-type: typedef-22.6">local-type: typedef-22.6</a>
                       </em>
                     </p>
                   </td>
@@ -127323,7 +127323,7 @@ <h3>17.21. The complex type <code>siri:FacilityConditionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.5" title="local-type: typedef-52.5">local-type: typedef-52.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.5" title="local-type: typedef-22.5">local-type: typedef-22.5</a>
                       </em>
                     </p>
                   </td>
@@ -128258,7 +128258,7 @@ <h3>17.25. The complex type <code>siri:FacilityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.1" title="local-type: typedef-52.1">local-type: typedef-52.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.1" title="local-type: typedef-22.1">local-type: typedef-22.1</a>
                       </em>
                     </p>
                   </td>
@@ -128378,7 +128378,7 @@ <h3>17.25. The complex type <code>siri:FacilityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.2" title="local-type: typedef-52.2">local-type: typedef-52.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.2" title="local-type: typedef-22.2">local-type: typedef-22.2</a>
                       </em>
                     </p>
                   </td>
@@ -128399,7 +128399,7 @@ <h3>17.25. The complex type <code>siri:FacilityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.3" title="local-type: typedef-52.3">local-type: typedef-52.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.3" title="local-type: typedef-22.3">local-type: typedef-22.3</a>
                       </em>
                     </p>
                   </td>
@@ -128810,7 +128810,7 @@ <h3>17.27. The complex type <code>siri:MonitoredCountingStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.4" title="local-type: typedef-52.4">local-type: typedef-52.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.4" title="local-type: typedef-22.4">local-type: typedef-22.4</a>
                       </em>
                     </p>
                   </td>
@@ -129317,8 +129317,8 @@ <h3>17.31. The complex type <code>siri:TypeOfVehicleFuelStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.2">
-          <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-52.2)</code>
+        <div class="sect2" id="local-type.typedef-22.2">
+          <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-22.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129338,7 +129338,7 @@ <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
                       <br/>
                       <code>  /Limitations #complexType</code>
                       <br/>
-                      <code>  (typedef-52.2)</code>
+                      <code>  (typedef-22.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129494,8 +129494,8 @@ <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.3">
-          <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-52.3)</code>
+        <div class="sect2" id="local-type.typedef-22.3">
+          <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-22.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129515,7 +129515,7 @@ <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
                       <br/>
                       <code>  /Suitabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-52.3)</code>
+                      <code>  (typedef-22.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129557,8 +129557,8 @@ <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.6">
-          <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructure]/EquipmentFeatures#complexType (typedef-52.6)</code>
+        <div class="sect2" id="local-type.typedef-22.6">
+          <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructure]/EquipmentFeatures#complexType (typedef-22.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129578,7 +129578,7 @@ <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructur
                       <br/>
                       <code>  /EquipmentFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-52.6)</code>
+                      <code>  (typedef-22.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129620,8 +129620,8 @@ <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructur
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.5">
-          <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/MonitoredCounting#complexType (typedef-52.5)</code>
+        <div class="sect2" id="local-type.typedef-22.5">
+          <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/MonitoredCounting#complexType (typedef-22.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129641,7 +129641,7 @@ <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/M
                       <br/>
                       <code>  /MonitoredCounting #complexType</code>
                       <br/>
-                      <code>  (typedef-52.5)</code>
+                      <code>  (typedef-22.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129897,7 +129897,7 @@ <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/M
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.4" title="local-type: typedef-52.4">local-type: typedef-52.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.4" title="local-type: typedef-22.4">local-type: typedef-22.4</a>
                       </em>
                     </p>
                   </td>
@@ -129934,8 +129934,8 @@ <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/M
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.4">
-          <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-52.4)</code>
+        <div class="sect2" id="local-type.typedef-22.4">
+          <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-22.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129955,7 +129955,7 @@ <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/C
                       <br/>
                       <code>  /CountedItemsIdList #complexType</code>
                       <br/>
-                      <code>  (typedef-52.4)</code>
+                      <code>  (typedef-22.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129998,8 +129998,8 @@ <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/C
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.1">
-          <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#complexType (typedef-52.1)</code>
+        <div class="sect2" id="local-type.typedef-22.1">
+          <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#complexType (typedef-22.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -130019,7 +130019,7 @@ <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#c
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-52.1)</code>
+                      <code>  (typedef-22.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -130061,8 +130061,8 @@ <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.2">
-          <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-52.2)</code>
+        <div class="sect2" id="local-type.typedef-22.2">
+          <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-22.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -130082,7 +130082,7 @@ <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
                       <br/>
                       <code>  /Limitations #complexType</code>
                       <br/>
-                      <code>  (typedef-52.2)</code>
+                      <code>  (typedef-22.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -130238,8 +130238,8 @@ <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.3">
-          <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-52.3)</code>
+        <div class="sect2" id="local-type.typedef-22.3">
+          <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-22.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -130259,7 +130259,7 @@ <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
                       <br/>
                       <code>  /Suitabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-52.3)</code>
+                      <code>  (typedef-22.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -130301,8 +130301,8 @@ <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.4">
-          <h3>17.40. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-52.4)</code>
+        <div class="sect2" id="local-type.typedef-22.4">
+          <h3>17.40. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-22.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -130322,7 +130322,7 @@ <h3>17.40. The complex type <code>complexType[siri:MonitoredCountingStructure]/C
                       <br/>
                       <code>  /CountedItemsIdList #complexType</code>
                       <br/>
-                      <code>  (typedef-52.4)</code>
+                      <code>  (typedef-22.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -131790,12 +131790,12 @@ <h3>20.1. Simple type definitions</h3>
               <tbody>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-6.1" class="tableblock">
+                    <p id="local-type.typedef-71.1" class="tableblock">
                       <code>attribute[lang]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-6.1)</code>
+                      <code>  (typedef-71.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -135452,7 +135452,7 @@ <h3>20.65. The group <code>siri:JourneyFormationGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.2" title="local-type: typedef-54.2">local-type: typedef-54.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
                       </em>
                     </p>
                   </td>
@@ -135473,7 +135473,7 @@ <h3>20.65. The group <code>siri:JourneyFormationGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.3" title="local-type: typedef-54.3">local-type: typedef-54.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
                       </em>
                     </p>
                   </td>
@@ -135494,7 +135494,7 @@ <h3>20.65. The group <code>siri:JourneyFormationGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.4" title="local-type: typedef-54.4">local-type: typedef-54.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
                       </em>
                     </p>
                   </td>
@@ -135712,7 +135712,7 @@ <h3>20.67. The group <code>siri:JourneyRelationInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.1" title="local-type: typedef-54.1">local-type: typedef-54.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.1" title="local-type: typedef-18.1">local-type: typedef-18.1</a>
                       </em>
                     </p>
                   </td>
@@ -139290,7 +139290,7 @@ <h3>20.83. The group <code>siri:TrainGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.5" title="local-type: typedef-54.5">local-type: typedef-54.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.5" title="local-type: typedef-18.5">local-type: typedef-18.5</a>
                       </em>
                     </p>
                   </td>
@@ -139671,7 +139671,7 @@ <h3>20.84. The group <code>siri:TrainInCompoundTrainGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.7" title="local-type: typedef-54.7">local-type: typedef-54.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.7" title="local-type: typedef-18.7">local-type: typedef-18.7</a>
                       </em>
                     </p>
                   </td>
@@ -140824,7 +140824,7 @@ <h3>20.90. The group <code>siri:VehicleTypeGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.9" title="local-type: typedef-54.9">local-type: typedef-54.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
                       </em>
                     </p>
                   </td>
@@ -141002,7 +141002,7 @@ <h3>20.90. The group <code>siri:VehicleTypeGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.8" title="local-type: typedef-54.8">local-type: typedef-54.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.8" title="local-type: typedef-18.8">local-type: typedef-18.8</a>
                       </em>
                     </p>
                   </td>
@@ -141139,7 +141139,7 @@ <h3>20.91. The group <code>siri:VehicleTypePropertiesGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.9" title="local-type: typedef-54.9">local-type: typedef-54.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
                       </em>
                     </p>
                   </td>
@@ -141789,7 +141789,7 @@ <h3>20.94. The complex type <code>siri:CompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.9" title="local-type: typedef-54.9">local-type: typedef-54.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
                       </em>
                     </p>
                   </td>
@@ -141967,7 +141967,7 @@ <h3>20.94. The complex type <code>siri:CompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.8" title="local-type: typedef-54.8">local-type: typedef-54.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.8" title="local-type: typedef-18.8">local-type: typedef-18.8</a>
                       </em>
                     </p>
                   </td>
@@ -141991,7 +141991,7 @@ <h3>20.94. The complex type <code>siri:CompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.6" title="local-type: typedef-54.6">local-type: typedef-54.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.6" title="local-type: typedef-18.6">local-type: typedef-18.6</a>
                       </em>
                     </p>
                   </td>
@@ -143152,7 +143152,7 @@ <h3>20.102. The complex type <code>siri:JourneyRelationStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.1" title="local-type: typedef-54.1">local-type: typedef-54.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.1" title="local-type: typedef-18.1">local-type: typedef-18.1</a>
                       </em>
                     </p>
                   </td>
@@ -146171,7 +146171,7 @@ <h3>20.113. The complex type <code>siri:RelatedJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.1" title="local-type: typedef-54.1">local-type: typedef-54.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.1" title="local-type: typedef-18.1">local-type: typedef-18.1</a>
                       </em>
                     </p>
                   </td>
@@ -147562,7 +147562,7 @@ <h3>20.119. The complex type <code>siri:TrainElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.9" title="local-type: typedef-54.9">local-type: typedef-54.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
                       </em>
                     </p>
                   </td>
@@ -147740,7 +147740,7 @@ <h3>20.119. The complex type <code>siri:TrainElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.8" title="local-type: typedef-54.8">local-type: typedef-54.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.8" title="local-type: typedef-18.8">local-type: typedef-18.8</a>
                       </em>
                     </p>
                   </td>
@@ -148173,7 +148173,7 @@ <h3>20.120. The complex type <code>siri:TrainInCompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.7" title="local-type: typedef-54.7">local-type: typedef-54.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.7" title="local-type: typedef-18.7">local-type: typedef-18.7</a>
                       </em>
                     </p>
                   </td>
@@ -148421,7 +148421,7 @@ <h3>20.121. The complex type <code>siri:TrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.9" title="local-type: typedef-54.9">local-type: typedef-54.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
                       </em>
                     </p>
                   </td>
@@ -148599,7 +148599,7 @@ <h3>20.121. The complex type <code>siri:TrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.8" title="local-type: typedef-54.8">local-type: typedef-54.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.8" title="local-type: typedef-18.8">local-type: typedef-18.8</a>
                       </em>
                     </p>
                   </td>
@@ -148665,7 +148665,7 @@ <h3>20.121. The complex type <code>siri:TrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.5" title="local-type: typedef-54.5">local-type: typedef-54.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.5" title="local-type: typedef-18.5">local-type: typedef-18.5</a>
                       </em>
                     </p>
                   </td>
@@ -149519,8 +149519,8 @@ <h3>20.125. The complex type <code>siri:ViaNameStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.2">
-          <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-54.2)</code>
+        <div class="sect2" id="local-type.typedef-18.2">
+          <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149540,7 +149540,7 @@ <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/TrainElemen
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-54.2)</code>
+                      <code>  (typedef-18.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -149627,8 +149627,8 @@ <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/TrainElemen
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.3">
-          <h3>20.127. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-54.3)</code>
+        <div class="sect2" id="local-type.typedef-18.3">
+          <h3>20.127. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149648,7 +149648,7 @@ <h3>20.127. The complex type <code>group[siri:JourneyFormationGroup]/Trains#comp
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-54.3)</code>
+                      <code>  (typedef-18.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -149735,8 +149735,8 @@ <h3>20.127. The complex type <code>group[siri:JourneyFormationGroup]/Trains#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.4">
-          <h3>20.128. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-54.4)</code>
+        <div class="sect2" id="local-type.typedef-18.4">
+          <h3>20.128. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149756,7 +149756,7 @@ <h3>20.128. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTra
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-54.4)</code>
+                      <code>  (typedef-18.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -149843,8 +149843,8 @@ <h3>20.128. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTra
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.1">
-          <h3>20.129. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-54.1)</code>
+        <div class="sect2" id="local-type.typedef-18.1">
+          <h3>20.129. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-18.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149864,7 +149864,7 @@ <h3>20.129. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-54.1)</code>
+                      <code>  (typedef-18.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -149906,8 +149906,8 @@ <h3>20.129. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.5">
-          <h3>20.130. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-54.5)</code>
+        <div class="sect2" id="local-type.typedef-18.5">
+          <h3>20.130. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-18.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149927,7 +149927,7 @@ <h3>20.130. The complex type <code>group[siri:TrainGroup]/TrainComponents#comple
                       <br/>
                       <code>  /TrainComponents #complexType</code>
                       <br/>
-                      <code>  (typedef-54.5)</code>
+                      <code>  (typedef-18.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150014,8 +150014,8 @@ <h3>20.130. The complex type <code>group[siri:TrainGroup]/TrainComponents#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.7">
-          <h3>20.131. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-54.7)</code>
+        <div class="sect2" id="local-type.typedef-18.7">
+          <h3>20.131. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-18.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150035,7 +150035,7 @@ <h3>20.131. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
                       <br/>
                       <code>  /Passages #complexType</code>
                       <br/>
-                      <code>  (typedef-54.7)</code>
+                      <code>  (typedef-18.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150077,8 +150077,8 @@ <h3>20.131. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.9">
-          <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-54.9)</code>
+        <div class="sect2" id="local-type.typedef-18.9">
+          <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150098,7 +150098,7 @@ <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-54.9)</code>
+                      <code>  (typedef-18.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150140,8 +150140,8 @@ <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.8">
-          <h3>20.133. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-54.8)</code>
+        <div class="sect2" id="local-type.typedef-18.8">
+          <h3>20.133. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150161,7 +150161,7 @@ <h3>20.133. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-54.8)</code>
+                      <code>  (typedef-18.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150281,8 +150281,8 @@ <h3>20.133. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.9">
-          <h3>20.134. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-54.9)</code>
+        <div class="sect2" id="local-type.typedef-18.9">
+          <h3>20.134. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150302,7 +150302,7 @@ <h3>20.134. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-54.9)</code>
+                      <code>  (typedef-18.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150344,8 +150344,8 @@ <h3>20.134. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.9">
-          <h3>20.135. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-54.9)</code>
+        <div class="sect2" id="local-type.typedef-18.9">
+          <h3>20.135. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150365,7 +150365,7 @@ <h3>20.135. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-54.9)</code>
+                      <code>  (typedef-18.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150407,8 +150407,8 @@ <h3>20.135. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.8">
-          <h3>20.136. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-54.8)</code>
+        <div class="sect2" id="local-type.typedef-18.8">
+          <h3>20.136. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150428,7 +150428,7 @@ <h3>20.136. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-54.8)</code>
+                      <code>  (typedef-18.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150548,8 +150548,8 @@ <h3>20.136. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.6">
-          <h3>20.137. The complex type <code>complexType[siri:CompoundTrainStructure]/TrainsInCompoundTrain#complexType (typedef-54.6)</code>
+        <div class="sect2" id="local-type.typedef-18.6">
+          <h3>20.137. The complex type <code>complexType[siri:CompoundTrainStructure]/TrainsInCompoundTrain#complexType (typedef-18.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150569,7 +150569,7 @@ <h3>20.137. The complex type <code>complexType[siri:CompoundTrainStructure]/Trai
                       <br/>
                       <code>  /TrainsInCompoundTrain #complexType</code>
                       <br/>
-                      <code>  (typedef-54.6)</code>
+                      <code>  (typedef-18.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150656,8 +150656,8 @@ <h3>20.137. The complex type <code>complexType[siri:CompoundTrainStructure]/Trai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.1">
-          <h3>20.138. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-54.1)</code>
+        <div class="sect2" id="local-type.typedef-18.1">
+          <h3>20.138. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-18.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150677,7 +150677,7 @@ <h3>20.138. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-54.1)</code>
+                      <code>  (typedef-18.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150719,8 +150719,8 @@ <h3>20.138. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.1">
-          <h3>20.139. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-54.1)</code>
+        <div class="sect2" id="local-type.typedef-18.1">
+          <h3>20.139. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-18.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150740,7 +150740,7 @@ <h3>20.139. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-54.1)</code>
+                      <code>  (typedef-18.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150782,8 +150782,8 @@ <h3>20.139. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.9">
-          <h3>20.140. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-54.9)</code>
+        <div class="sect2" id="local-type.typedef-18.9">
+          <h3>20.140. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150803,7 +150803,7 @@ <h3>20.140. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-54.9)</code>
+                      <code>  (typedef-18.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150845,8 +150845,8 @@ <h3>20.140. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.8">
-          <h3>20.141. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-54.8)</code>
+        <div class="sect2" id="local-type.typedef-18.8">
+          <h3>20.141. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150866,7 +150866,7 @@ <h3>20.141. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-54.8)</code>
+                      <code>  (typedef-18.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150986,8 +150986,8 @@ <h3>20.141. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.7">
-          <h3>20.142. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-54.7)</code>
+        <div class="sect2" id="local-type.typedef-18.7">
+          <h3>20.142. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-18.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151007,7 +151007,7 @@ <h3>20.142. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
                       <br/>
                       <code>  /Passages #complexType</code>
                       <br/>
-                      <code>  (typedef-54.7)</code>
+                      <code>  (typedef-18.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -151049,8 +151049,8 @@ <h3>20.142. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.9">
-          <h3>20.143. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-54.9)</code>
+        <div class="sect2" id="local-type.typedef-18.9">
+          <h3>20.143. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151070,7 +151070,7 @@ <h3>20.143. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-54.9)</code>
+                      <code>  (typedef-18.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -151112,8 +151112,8 @@ <h3>20.143. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.8">
-          <h3>20.144. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-54.8)</code>
+        <div class="sect2" id="local-type.typedef-18.8">
+          <h3>20.144. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151133,7 +151133,7 @@ <h3>20.144. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-54.8)</code>
+                      <code>  (typedef-18.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -151253,8 +151253,8 @@ <h3>20.144. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.5">
-          <h3>20.145. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-54.5)</code>
+        <div class="sect2" id="local-type.typedef-18.5">
+          <h3>20.145. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-18.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151274,7 +151274,7 @@ <h3>20.145. The complex type <code>group[siri:TrainGroup]/TrainComponents#comple
                       <br/>
                       <code>  /TrainComponents #complexType</code>
                       <br/>
-                      <code>  (typedef-54.5)</code>
+                      <code>  (typedef-18.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -156431,7 +156431,7 @@ <h3>22.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -156465,7 +156465,7 @@ <h3>22.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.2" title="local-type: typedef-68.2">local-type: typedef-68.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
                       </em>
                     </p>
                   </td>
@@ -156494,7 +156494,7 @@ <h3>22.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
                       </em>
                     </p>
                   </td>
@@ -156523,7 +156523,7 @@ <h3>22.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.3" title="local-type: typedef-68.3">local-type: typedef-68.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.3" title="local-type: typedef-27.3">local-type: typedef-27.3</a>
                       </em>
                     </p>
                   </td>
@@ -157075,8 +157075,8 @@ <h3>22.30. The complex type <code>siri:StopMonitorPermissionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.3">
-          <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-68.3)</code>
+        <div class="sect2" id="local-type.typedef-27.3">
+          <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-27.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157096,7 +157096,7 @@ <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-68.3)</code>
+                      <code>  (typedef-27.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157181,8 +157181,8 @@ <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.1">
-          <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-68.1)</code>
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157202,7 +157202,7 @@ <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-68.1)</code>
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157287,8 +157287,8 @@ <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.2">
-          <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-68.2)</code>
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157308,7 +157308,7 @@ <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-68.2)</code>
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157393,8 +157393,8 @@ <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-39.1">
-          <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-39.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157414,7 +157414,7 @@ <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-39.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157482,8 +157482,8 @@ <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.2">
-          <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-68.2)</code>
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157503,7 +157503,7 @@ <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-68.2)</code>
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157588,8 +157588,8 @@ <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.1">
-          <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typedef-68.1)</code>
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157609,7 +157609,7 @@ <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-68.1)</code>
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157694,8 +157694,8 @@ <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.3">
-          <h3>22.37. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-68.3)</code>
+        <div class="sect2" id="local-type.typedef-27.3">
+          <h3>22.37. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-27.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157715,7 +157715,7 @@ <h3>22.37. The complex type <code>element[siri:ConnectionLinkPermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-68.3)</code>
+                      <code>  (typedef-27.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -163928,7 +163928,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-53.6" title="local-type: typedef-53.6">local-type: typedef-53.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.6" title="local-type: typedef-28.6">local-type: typedef-28.6</a>
                       </em>
                     </p>
                   </td>
@@ -163949,7 +163949,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-53.7" title="local-type: typedef-53.7">local-type: typedef-53.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.7" title="local-type: typedef-28.7">local-type: typedef-28.7</a>
                       </em>
                     </p>
                   </td>
@@ -163973,7 +163973,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.2" title="local-type: typedef-54.2">local-type: typedef-54.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
                       </em>
                     </p>
                   </td>
@@ -163994,7 +163994,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.3" title="local-type: typedef-54.3">local-type: typedef-54.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
                       </em>
                     </p>
                   </td>
@@ -164015,7 +164015,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.4" title="local-type: typedef-54.4">local-type: typedef-54.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
                       </em>
                     </p>
                   </td>
@@ -166738,7 +166738,7 @@ <h3>24.12. The group <code>siri:ServicePointsGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-53.1" title="local-type: typedef-53.1">local-type: typedef-53.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.1" title="local-type: typedef-28.1">local-type: typedef-28.1</a>
                       </em>
                     </p>
                   </td>
@@ -166759,7 +166759,7 @@ <h3>24.12. The group <code>siri:ServicePointsGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-53.2" title="local-type: typedef-53.2">local-type: typedef-53.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.2" title="local-type: typedef-28.2">local-type: typedef-28.2</a>
                       </em>
                     </p>
                   </td>
@@ -166780,7 +166780,7 @@ <h3>24.12. The group <code>siri:ServicePointsGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-53.3" title="local-type: typedef-53.3">local-type: typedef-53.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.3" title="local-type: typedef-28.3">local-type: typedef-28.3</a>
                       </em>
                     </p>
                   </td>
@@ -167885,7 +167885,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-53.4" title="local-type: typedef-53.4">local-type: typedef-53.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.4" title="local-type: typedef-28.4">local-type: typedef-28.4</a>
                       </em>
                     </p>
                   </td>
@@ -167906,7 +167906,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-53.5" title="local-type: typedef-53.5">local-type: typedef-53.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.5" title="local-type: typedef-28.5">local-type: typedef-28.5</a>
                       </em>
                     </p>
                   </td>
@@ -167930,7 +167930,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.2" title="local-type: typedef-54.2">local-type: typedef-54.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
                       </em>
                     </p>
                   </td>
@@ -167951,7 +167951,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.3" title="local-type: typedef-54.3">local-type: typedef-54.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
                       </em>
                     </p>
                   </td>
@@ -167972,7 +167972,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.4" title="local-type: typedef-54.4">local-type: typedef-54.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
                       </em>
                     </p>
                   </td>
@@ -171315,7 +171315,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-53.4" title="local-type: typedef-53.4">local-type: typedef-53.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.4" title="local-type: typedef-28.4">local-type: typedef-28.4</a>
                       </em>
                     </p>
                   </td>
@@ -171336,7 +171336,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-53.5" title="local-type: typedef-53.5">local-type: typedef-53.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.5" title="local-type: typedef-28.5">local-type: typedef-28.5</a>
                       </em>
                     </p>
                   </td>
@@ -171360,7 +171360,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.2" title="local-type: typedef-54.2">local-type: typedef-54.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
                       </em>
                     </p>
                   </td>
@@ -171381,7 +171381,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.3" title="local-type: typedef-54.3">local-type: typedef-54.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
                       </em>
                     </p>
                   </td>
@@ -171402,7 +171402,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.4" title="local-type: typedef-54.4">local-type: typedef-54.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
                       </em>
                     </p>
                   </td>
@@ -172064,8 +172064,8 @@ <h3>24.22. The complex type <code>siri:TrainBlockPartStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-53.6">
-          <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-53.6)</code>
+        <div class="sect2" id="local-type.typedef-28.6">
+          <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172085,7 +172085,7 @@ <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-53.6)</code>
+                      <code>  (typedef-28.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172127,8 +172127,8 @@ <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-53.7">
-          <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-53.7)</code>
+        <div class="sect2" id="local-type.typedef-28.7">
+          <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172148,7 +172148,7 @@ <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-53.7)</code>
+                      <code>  (typedef-28.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172190,8 +172190,8 @@ <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.2">
-          <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-54.2)</code>
+        <div class="sect2" id="local-type.typedef-18.2">
+          <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172211,7 +172211,7 @@ <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-54.2)</code>
+                      <code>  (typedef-18.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172298,8 +172298,8 @@ <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.3">
-          <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-54.3)</code>
+        <div class="sect2" id="local-type.typedef-18.3">
+          <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172319,7 +172319,7 @@ <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-54.3)</code>
+                      <code>  (typedef-18.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172406,8 +172406,8 @@ <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.4">
-          <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-54.4)</code>
+        <div class="sect2" id="local-type.typedef-18.4">
+          <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172427,7 +172427,7 @@ <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-54.4)</code>
+                      <code>  (typedef-18.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172514,8 +172514,8 @@ <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-53.1">
-          <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexType (typedef-53.1)</code>
+        <div class="sect2" id="local-type.typedef-28.1">
+          <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexType (typedef-28.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172535,7 +172535,7 @@ <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexT
                       <br/>
                       <code>  /Origin #complexType</code>
                       <br/>
-                      <code>  (typedef-53.1)</code>
+                      <code>  (typedef-28.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172599,8 +172599,8 @@ <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-53.2">
-          <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType (typedef-53.2)</code>
+        <div class="sect2" id="local-type.typedef-28.2">
+          <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType (typedef-28.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172620,7 +172620,7 @@ <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType
                       <br/>
                       <code>  /Via #complexType</code>
                       <br/>
-                      <code>  (typedef-53.2)</code>
+                      <code>  (typedef-28.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172707,8 +172707,8 @@ <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-53.3">
-          <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#complexType (typedef-53.3)</code>
+        <div class="sect2" id="local-type.typedef-28.3">
+          <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#complexType (typedef-28.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172728,7 +172728,7 @@ <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#com
                       <br/>
                       <code>  /Destination #complexType</code>
                       <br/>
-                      <code>  (typedef-53.3)</code>
+                      <code>  (typedef-28.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172792,8 +172792,8 @@ <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#com
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-53.4">
-          <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-53.4)</code>
+        <div class="sect2" id="local-type.typedef-28.4">
+          <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172813,7 +172813,7 @@ <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-53.4)</code>
+                      <code>  (typedef-28.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172855,8 +172855,8 @@ <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-53.5">
-          <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-53.5)</code>
+        <div class="sect2" id="local-type.typedef-28.5">
+          <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172876,7 +172876,7 @@ <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-53.5)</code>
+                      <code>  (typedef-28.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172918,8 +172918,8 @@ <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.2">
-          <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-54.2)</code>
+        <div class="sect2" id="local-type.typedef-18.2">
+          <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172939,7 +172939,7 @@ <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-54.2)</code>
+                      <code>  (typedef-18.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173026,8 +173026,8 @@ <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.3">
-          <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-54.3)</code>
+        <div class="sect2" id="local-type.typedef-18.3">
+          <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173047,7 +173047,7 @@ <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-54.3)</code>
+                      <code>  (typedef-18.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173134,8 +173134,8 @@ <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.4">
-          <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-54.4)</code>
+        <div class="sect2" id="local-type.typedef-18.4">
+          <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173155,7 +173155,7 @@ <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-54.4)</code>
+                      <code>  (typedef-18.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173242,8 +173242,8 @@ <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-53.4">
-          <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-53.4)</code>
+        <div class="sect2" id="local-type.typedef-28.4">
+          <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173263,7 +173263,7 @@ <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-53.4)</code>
+                      <code>  (typedef-28.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173305,8 +173305,8 @@ <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-53.5">
-          <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-53.5)</code>
+        <div class="sect2" id="local-type.typedef-28.5">
+          <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173326,7 +173326,7 @@ <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-53.5)</code>
+                      <code>  (typedef-28.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173368,8 +173368,8 @@ <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.2">
-          <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-54.2)</code>
+        <div class="sect2" id="local-type.typedef-18.2">
+          <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173389,7 +173389,7 @@ <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-54.2)</code>
+                      <code>  (typedef-18.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173476,8 +173476,8 @@ <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.3">
-          <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-54.3)</code>
+        <div class="sect2" id="local-type.typedef-18.3">
+          <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173497,7 +173497,7 @@ <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-54.3)</code>
+                      <code>  (typedef-18.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173584,8 +173584,8 @@ <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.4">
-          <h3>24.40. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-54.4)</code>
+        <div class="sect2" id="local-type.typedef-18.4">
+          <h3>24.40. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173605,7 +173605,7 @@ <h3>24.40. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-54.4)</code>
+                      <code>  (typedef-18.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -178315,12 +178315,12 @@ <h3>27.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-47.3" class="tableblock">
+                    <p id="local-type.typedef-34.3" class="tableblock">
                       <code>group[siri:ClassifierGroup]</code>
                       <br/>
                       <code>  /ScopeType #simpleType</code>
                       <br/>
-                      <code>  (typedef-47.3)</code>
+                      <code>  (typedef-34.3)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -178501,12 +178501,12 @@ <h3>27.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-47.1" class="tableblock">
+                    <p id="local-type.typedef-34.1" class="tableblock">
                       <code>group[siri:StatusGroup]</code>
                       <br/>
                       <code>  /Verification #simpleType</code>
                       <br/>
-                      <code>  (typedef-47.1)</code>
+                      <code>  (typedef-34.1)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -178567,12 +178567,12 @@ <h3>27.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-6.1" class="tableblock">
+                    <p id="local-type.typedef-71.1" class="tableblock">
                       <code>attribute[lang]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-6.1)</code>
+                      <code>  (typedef-71.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -179200,7 +179200,7 @@ <h3>27.16. The group <code>siri:ClassifierGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-47.3" title="local-type: typedef-47.3">local-type: typedef-47.3</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
                       </em>
                     </p>
                   </td>
@@ -179284,7 +179284,7 @@ <h3>27.16. The group <code>siri:ClassifierGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.4" title="local-type: typedef-47.4">local-type: typedef-47.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
                       </em>
                     </p>
                   </td>
@@ -180050,7 +180050,7 @@ <h3>27.22. The group <code>siri:DescriptionGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.14" title="local-type: typedef-47.14">local-type: typedef-47.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
                       </em>
                     </p>
                   </td>
@@ -180071,7 +180071,7 @@ <h3>27.22. The group <code>siri:DescriptionGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.16" title="local-type: typedef-47.16">local-type: typedef-47.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
                       </em>
                     </p>
                   </td>
@@ -180224,7 +180224,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-47.1" title="local-type: typedef-47.1">local-type: typedef-47.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
                       </em>
                     </p>
                   </td>
@@ -180383,7 +180383,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.2" title="local-type: typedef-47.2">local-type: typedef-47.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
                       </em>
                     </p>
                   </td>
@@ -180931,7 +180931,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-47.3" title="local-type: typedef-47.3">local-type: typedef-47.3</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
                       </em>
                     </p>
                   </td>
@@ -181015,7 +181015,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.4" title="local-type: typedef-47.4">local-type: typedef-47.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
                       </em>
                     </p>
                   </td>
@@ -181164,7 +181164,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.14" title="local-type: typedef-47.14">local-type: typedef-47.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
                       </em>
                     </p>
                   </td>
@@ -181185,7 +181185,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.16" title="local-type: typedef-47.16">local-type: typedef-47.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
                       </em>
                     </p>
                   </td>
@@ -181871,7 +181871,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-47.1" title="local-type: typedef-47.1">local-type: typedef-47.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
                       </em>
                     </p>
                   </td>
@@ -182030,7 +182030,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.2" title="local-type: typedef-47.2">local-type: typedef-47.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
                       </em>
                     </p>
                   </td>
@@ -182578,7 +182578,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-47.3" title="local-type: typedef-47.3">local-type: typedef-47.3</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
                       </em>
                     </p>
                   </td>
@@ -182662,7 +182662,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.4" title="local-type: typedef-47.4">local-type: typedef-47.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
                       </em>
                     </p>
                   </td>
@@ -182811,7 +182811,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.14" title="local-type: typedef-47.14">local-type: typedef-47.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
                       </em>
                     </p>
                   </td>
@@ -182832,7 +182832,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.16" title="local-type: typedef-47.16">local-type: typedef-47.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
                       </em>
                     </p>
                   </td>
@@ -183195,7 +183195,7 @@ <h3>27.30. The group <code>siri:StatusGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-47.1" title="local-type: typedef-47.1">local-type: typedef-47.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
                       </em>
                     </p>
                   </td>
@@ -183385,7 +183385,7 @@ <h3>27.31. The group <code>siri:TemporalGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.2" title="local-type: typedef-47.2">local-type: typedef-47.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
                       </em>
                     </p>
                   </td>
@@ -183885,7 +183885,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.6" title="local-type: typedef-47.6">local-type: typedef-47.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.6" title="local-type: typedef-34.6">local-type: typedef-34.6</a>
                       </em>
                     </p>
                   </td>
@@ -183909,7 +183909,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.7" title="local-type: typedef-47.7">local-type: typedef-47.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.7" title="local-type: typedef-34.7">local-type: typedef-34.7</a>
                       </em>
                     </p>
                   </td>
@@ -183933,7 +183933,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.9" title="local-type: typedef-47.9">local-type: typedef-47.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.9" title="local-type: typedef-34.9">local-type: typedef-34.9</a>
                       </em>
                     </p>
                   </td>
@@ -183957,7 +183957,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.10" title="local-type: typedef-47.10">local-type: typedef-47.10</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.10" title="local-type: typedef-34.10">local-type: typedef-34.10</a>
                       </em>
                     </p>
                   </td>
@@ -183981,7 +183981,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.11" title="local-type: typedef-47.11">local-type: typedef-47.11</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.11" title="local-type: typedef-34.11">local-type: typedef-34.11</a>
                       </em>
                     </p>
                   </td>
@@ -184005,7 +184005,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.12" title="local-type: typedef-47.12">local-type: typedef-47.12</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.12" title="local-type: typedef-34.12">local-type: typedef-34.12</a>
                       </em>
                     </p>
                   </td>
@@ -184029,7 +184029,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.13" title="local-type: typedef-47.13">local-type: typedef-47.13</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.13" title="local-type: typedef-34.13">local-type: typedef-34.13</a>
                       </em>
                     </p>
                   </td>
@@ -185577,7 +185577,7 @@ <h3>27.46. The complex type <code>siri:PtConsequenceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.17" title="local-type: typedef-47.17">local-type: typedef-47.17</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.17" title="local-type: typedef-34.17">local-type: typedef-34.17</a>
                       </em>
                     </p>
                   </td>
@@ -186074,7 +186074,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-47.1" title="local-type: typedef-47.1">local-type: typedef-47.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
                       </em>
                     </p>
                   </td>
@@ -186233,7 +186233,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.2" title="local-type: typedef-47.2">local-type: typedef-47.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
                       </em>
                     </p>
                   </td>
@@ -186781,7 +186781,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-47.3" title="local-type: typedef-47.3">local-type: typedef-47.3</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
                       </em>
                     </p>
                   </td>
@@ -186865,7 +186865,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.4" title="local-type: typedef-47.4">local-type: typedef-47.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
                       </em>
                     </p>
                   </td>
@@ -187014,7 +187014,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.14" title="local-type: typedef-47.14">local-type: typedef-47.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
                       </em>
                     </p>
                   </td>
@@ -187035,7 +187035,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.16" title="local-type: typedef-47.16">local-type: typedef-47.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
                       </em>
                     </p>
                   </td>
@@ -187757,7 +187757,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-47.1" title="local-type: typedef-47.1">local-type: typedef-47.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
                       </em>
                     </p>
                   </td>
@@ -187916,7 +187916,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.2" title="local-type: typedef-47.2">local-type: typedef-47.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
                       </em>
                     </p>
                   </td>
@@ -188464,7 +188464,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-47.3" title="local-type: typedef-47.3">local-type: typedef-47.3</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
                       </em>
                     </p>
                   </td>
@@ -188548,7 +188548,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.4" title="local-type: typedef-47.4">local-type: typedef-47.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
                       </em>
                     </p>
                   </td>
@@ -188697,7 +188697,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.14" title="local-type: typedef-47.14">local-type: typedef-47.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
                       </em>
                     </p>
                   </td>
@@ -188718,7 +188718,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.16" title="local-type: typedef-47.16">local-type: typedef-47.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
                       </em>
                     </p>
                   </td>
@@ -189503,8 +189503,8 @@ <h3>27.52. The complex type <code>siri:SituationSourceStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.4">
-          <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-47.4)</code>
+        <div class="sect2" id="local-type.typedef-34.4">
+          <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -189524,7 +189524,7 @@ <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-47.4)</code>
+                      <code>  (typedef-34.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -189554,7 +189554,7 @@ <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.5" title="local-type: typedef-47.5">local-type: typedef-47.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
                       </em>
                     </p>
                   </td>
@@ -189566,8 +189566,8 @@ <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.5">
-          <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-47.5)</code>
+        <div class="sect2" id="local-type.typedef-34.5">
+          <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -189587,7 +189587,7 @@ <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-47.5)</code>
+                      <code>  (typedef-34.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190016,8 +190016,8 @@ <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.14">
-          <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-47.14)</code>
+        <div class="sect2" id="local-type.typedef-34.14">
+          <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190037,7 +190037,7 @@ <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-47.14)</code>
+                      <code>  (typedef-34.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190067,7 +190067,7 @@ <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.15" title="local-type: typedef-47.15">local-type: typedef-47.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
                       </em>
                     </p>
                   </td>
@@ -190079,8 +190079,8 @@ <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.15">
-          <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-47.15)</code>
+        <div class="sect2" id="local-type.typedef-34.15">
+          <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190100,7 +190100,7 @@ <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-47.15)</code>
+                      <code>  (typedef-34.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190215,8 +190215,8 @@ <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.16">
-          <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-47.16)</code>
+        <div class="sect2" id="local-type.typedef-34.16">
+          <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190236,7 +190236,7 @@ <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-47.16)</code>
+                      <code>  (typedef-34.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190278,8 +190278,8 @@ <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.2">
-          <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-47.2)</code>
+        <div class="sect2" id="local-type.typedef-34.2">
+          <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190299,7 +190299,7 @@ <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-47.2)</code>
+                      <code>  (typedef-34.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190343,8 +190343,8 @@ <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.4">
-          <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-47.4)</code>
+        <div class="sect2" id="local-type.typedef-34.4">
+          <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190364,7 +190364,7 @@ <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-47.4)</code>
+                      <code>  (typedef-34.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190394,7 +190394,7 @@ <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.5" title="local-type: typedef-47.5">local-type: typedef-47.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
                       </em>
                     </p>
                   </td>
@@ -190406,8 +190406,8 @@ <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.5">
-          <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-47.5)</code>
+        <div class="sect2" id="local-type.typedef-34.5">
+          <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190427,7 +190427,7 @@ <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-47.5)</code>
+                      <code>  (typedef-34.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190856,8 +190856,8 @@ <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.14">
-          <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-47.14)</code>
+        <div class="sect2" id="local-type.typedef-34.14">
+          <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190877,7 +190877,7 @@ <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-47.14)</code>
+                      <code>  (typedef-34.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190907,7 +190907,7 @@ <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.15" title="local-type: typedef-47.15">local-type: typedef-47.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
                       </em>
                     </p>
                   </td>
@@ -190919,8 +190919,8 @@ <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.15">
-          <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-47.15)</code>
+        <div class="sect2" id="local-type.typedef-34.15">
+          <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190940,7 +190940,7 @@ <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-47.15)</code>
+                      <code>  (typedef-34.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191055,8 +191055,8 @@ <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.16">
-          <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-47.16)</code>
+        <div class="sect2" id="local-type.typedef-34.16">
+          <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191076,7 +191076,7 @@ <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-47.16)</code>
+                      <code>  (typedef-34.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191118,8 +191118,8 @@ <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.2">
-          <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-47.2)</code>
+        <div class="sect2" id="local-type.typedef-34.2">
+          <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191139,7 +191139,7 @@ <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-47.2)</code>
+                      <code>  (typedef-34.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191183,8 +191183,8 @@ <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.4">
-          <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-47.4)</code>
+        <div class="sect2" id="local-type.typedef-34.4">
+          <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191204,7 +191204,7 @@ <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-47.4)</code>
+                      <code>  (typedef-34.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191234,7 +191234,7 @@ <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.5" title="local-type: typedef-47.5">local-type: typedef-47.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
                       </em>
                     </p>
                   </td>
@@ -191246,8 +191246,8 @@ <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.5">
-          <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-47.5)</code>
+        <div class="sect2" id="local-type.typedef-34.5">
+          <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191267,7 +191267,7 @@ <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-47.5)</code>
+                      <code>  (typedef-34.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191696,8 +191696,8 @@ <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.14">
-          <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-47.14)</code>
+        <div class="sect2" id="local-type.typedef-34.14">
+          <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191717,7 +191717,7 @@ <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-47.14)</code>
+                      <code>  (typedef-34.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191747,7 +191747,7 @@ <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.15" title="local-type: typedef-47.15">local-type: typedef-47.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
                       </em>
                     </p>
                   </td>
@@ -191759,8 +191759,8 @@ <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.15">
-          <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-47.15)</code>
+        <div class="sect2" id="local-type.typedef-34.15">
+          <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191780,7 +191780,7 @@ <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-47.15)</code>
+                      <code>  (typedef-34.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191895,8 +191895,8 @@ <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.16">
-          <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-47.16)</code>
+        <div class="sect2" id="local-type.typedef-34.16">
+          <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191916,7 +191916,7 @@ <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-47.16)</code>
+                      <code>  (typedef-34.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191958,8 +191958,8 @@ <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.2">
-          <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-47.2)</code>
+        <div class="sect2" id="local-type.typedef-34.2">
+          <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191979,7 +191979,7 @@ <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-47.2)</code>
+                      <code>  (typedef-34.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192023,8 +192023,8 @@ <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.6">
-          <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operators#complexType (typedef-47.6)</code>
+        <div class="sect2" id="local-type.typedef-34.6">
+          <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operators#complexType (typedef-34.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192044,7 +192044,7 @@ <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operat
                       <br/>
                       <code>  /Operators #complexType</code>
                       <br/>
-                      <code>  (typedef-47.6)</code>
+                      <code>  (typedef-34.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192130,8 +192130,8 @@ <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operat
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.7">
-          <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks#complexType (typedef-47.7)</code>
+        <div class="sect2" id="local-type.typedef-34.7">
+          <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks#complexType (typedef-34.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192151,7 +192151,7 @@ <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
                       <br/>
                       <code>  /Networks #complexType</code>
                       <br/>
-                      <code>  (typedef-47.7)</code>
+                      <code>  (typedef-34.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192181,7 +192181,7 @@ <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.8" title="local-type: typedef-47.8">local-type: typedef-47.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.8" title="local-type: typedef-34.8">local-type: typedef-34.8</a>
                       </em>
                     </p>
                   </td>
@@ -192193,8 +192193,8 @@ <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.8">
-          <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks/AffectedNetwork#complexType (typedef-47.8)</code>
+        <div class="sect2" id="local-type.typedef-34.8">
+          <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks/AffectedNetwork#complexType (typedef-34.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192214,7 +192214,7 @@ <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
                       <br/>
                       <code>  /Networks/AffectedNetwork #complexType</code>
                       <br/>
-                      <code>  (typedef-47.8)</code>
+                      <code>  (typedef-34.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192809,8 +192809,8 @@ <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.9">
-          <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPoints#complexType (typedef-47.9)</code>
+        <div class="sect2" id="local-type.typedef-34.9">
+          <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPoints#complexType (typedef-34.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192830,7 +192830,7 @@ <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPo
                       <br/>
                       <code>  /StopPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-47.9)</code>
+                      <code>  (typedef-34.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192872,8 +192872,8 @@ <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPo
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.10">
-          <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPlaces#complexType (typedef-47.10)</code>
+        <div class="sect2" id="local-type.typedef-34.10">
+          <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPlaces#complexType (typedef-34.10)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192893,7 +192893,7 @@ <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPl
                       <br/>
                       <code>  /StopPlaces #complexType</code>
                       <br/>
-                      <code>  (typedef-47.10)</code>
+                      <code>  (typedef-34.10)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192935,8 +192935,8 @@ <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.11">
-          <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places#complexType (typedef-47.11)</code>
+        <div class="sect2" id="local-type.typedef-34.11">
+          <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places#complexType (typedef-34.11)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192956,7 +192956,7 @@ <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places
                       <br/>
                       <code>  /Places #complexType</code>
                       <br/>
-                      <code>  (typedef-47.11)</code>
+                      <code>  (typedef-34.11)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192998,8 +192998,8 @@ <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.12">
-          <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/VehicleJourneys#complexType (typedef-47.12)</code>
+        <div class="sect2" id="local-type.typedef-34.12">
+          <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/VehicleJourneys#complexType (typedef-34.12)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193019,7 +193019,7 @@ <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
                       <br/>
                       <code>  /VehicleJourneys #complexType</code>
                       <br/>
-                      <code>  (typedef-47.12)</code>
+                      <code>  (typedef-34.12)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193061,8 +193061,8 @@ <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.13">
-          <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicles#complexType (typedef-47.13)</code>
+        <div class="sect2" id="local-type.typedef-34.13">
+          <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicles#complexType (typedef-34.13)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193082,7 +193082,7 @@ <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
                       <br/>
                       <code>  /Vehicles #complexType</code>
                       <br/>
-                      <code>  (typedef-47.13)</code>
+                      <code>  (typedef-34.13)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193124,8 +193124,8 @@ <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.17">
-          <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suitabilities#complexType (typedef-47.17)</code>
+        <div class="sect2" id="local-type.typedef-34.17">
+          <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suitabilities#complexType (typedef-34.17)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193145,7 +193145,7 @@ <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suita
                       <br/>
                       <code>  /Suitabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-47.17)</code>
+                      <code>  (typedef-34.17)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193187,8 +193187,8 @@ <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suita
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.2">
-          <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-47.2)</code>
+        <div class="sect2" id="local-type.typedef-34.2">
+          <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193208,7 +193208,7 @@ <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-47.2)</code>
+                      <code>  (typedef-34.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193252,8 +193252,8 @@ <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.4">
-          <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-47.4)</code>
+        <div class="sect2" id="local-type.typedef-34.4">
+          <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193273,7 +193273,7 @@ <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-47.4)</code>
+                      <code>  (typedef-34.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193303,7 +193303,7 @@ <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.5" title="local-type: typedef-47.5">local-type: typedef-47.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
                       </em>
                     </p>
                   </td>
@@ -193315,8 +193315,8 @@ <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.5">
-          <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-47.5)</code>
+        <div class="sect2" id="local-type.typedef-34.5">
+          <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193336,7 +193336,7 @@ <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-47.5)</code>
+                      <code>  (typedef-34.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193765,8 +193765,8 @@ <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.14">
-          <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-47.14)</code>
+        <div class="sect2" id="local-type.typedef-34.14">
+          <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193786,7 +193786,7 @@ <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-47.14)</code>
+                      <code>  (typedef-34.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193816,7 +193816,7 @@ <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.15" title="local-type: typedef-47.15">local-type: typedef-47.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
                       </em>
                     </p>
                   </td>
@@ -193828,8 +193828,8 @@ <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.15">
-          <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-47.15)</code>
+        <div class="sect2" id="local-type.typedef-34.15">
+          <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193849,7 +193849,7 @@ <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-47.15)</code>
+                      <code>  (typedef-34.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193964,8 +193964,8 @@ <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.16">
-          <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-47.16)</code>
+        <div class="sect2" id="local-type.typedef-34.16">
+          <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193985,7 +193985,7 @@ <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-47.16)</code>
+                      <code>  (typedef-34.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194027,8 +194027,8 @@ <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.2">
-          <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-47.2)</code>
+        <div class="sect2" id="local-type.typedef-34.2">
+          <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194048,7 +194048,7 @@ <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-47.2)</code>
+                      <code>  (typedef-34.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194092,8 +194092,8 @@ <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.4">
-          <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-47.4)</code>
+        <div class="sect2" id="local-type.typedef-34.4">
+          <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194113,7 +194113,7 @@ <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-47.4)</code>
+                      <code>  (typedef-34.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194143,7 +194143,7 @@ <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.5" title="local-type: typedef-47.5">local-type: typedef-47.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
                       </em>
                     </p>
                   </td>
@@ -194155,8 +194155,8 @@ <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.5">
-          <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-47.5)</code>
+        <div class="sect2" id="local-type.typedef-34.5">
+          <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194176,7 +194176,7 @@ <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-47.5)</code>
+                      <code>  (typedef-34.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194605,8 +194605,8 @@ <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.14">
-          <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-47.14)</code>
+        <div class="sect2" id="local-type.typedef-34.14">
+          <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194626,7 +194626,7 @@ <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-47.14)</code>
+                      <code>  (typedef-34.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194656,7 +194656,7 @@ <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-47.15" title="local-type: typedef-47.15">local-type: typedef-47.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
                       </em>
                     </p>
                   </td>
@@ -194668,8 +194668,8 @@ <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.15">
-          <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-47.15)</code>
+        <div class="sect2" id="local-type.typedef-34.15">
+          <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194689,7 +194689,7 @@ <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-47.15)</code>
+                      <code>  (typedef-34.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194804,8 +194804,8 @@ <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-47.16">
-          <h3>27.91. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-47.16)</code>
+        <div class="sect2" id="local-type.typedef-34.16">
+          <h3>27.91. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194825,7 +194825,7 @@ <h3>27.91. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-47.16)</code>
+                      <code>  (typedef-34.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -195664,7 +195664,7 @@ <h3>28.15. The group <code>siri:ActionsGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-62.3" title="local-type: typedef-62.3">local-type: typedef-62.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.3" title="local-type: typedef-23.3">local-type: typedef-23.3</a>
                       </em>
                     </p>
                   </td>
@@ -195904,7 +195904,7 @@ <h3>28.16. The complex type <code>siri:ActionDataStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-62.2" title="local-type: typedef-62.2">local-type: typedef-62.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.2" title="local-type: typedef-23.2">local-type: typedef-23.2</a>
                       </em>
                     </p>
                   </td>
@@ -196070,7 +196070,7 @@ <h3>28.17. The complex type <code>siri:ActionsStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-62.3" title="local-type: typedef-62.3">local-type: typedef-62.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.3" title="local-type: typedef-23.3">local-type: typedef-23.3</a>
                       </em>
                     </p>
                   </td>
@@ -196768,7 +196768,7 @@ <h3>28.22. The complex type <code>siri:NotifyByEmailActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-62.1" title="local-type: typedef-62.1">local-type: typedef-62.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
                       </em>
                     </p>
                   </td>
@@ -197003,7 +197003,7 @@ <h3>28.23. The complex type <code>siri:NotifyByPagerActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-62.1" title="local-type: typedef-62.1">local-type: typedef-62.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
                       </em>
                     </p>
                   </td>
@@ -197259,7 +197259,7 @@ <h3>28.24. The complex type <code>siri:NotifyBySmsActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-62.1" title="local-type: typedef-62.1">local-type: typedef-62.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
                       </em>
                     </p>
                   </td>
@@ -197517,7 +197517,7 @@ <h3>28.25. The complex type <code>siri:NotifyUserActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-62.1" title="local-type: typedef-62.1">local-type: typedef-62.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
                       </em>
                     </p>
                   </td>
@@ -198253,7 +198253,7 @@ <h3>28.28. The complex type <code>siri:PublishingActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-62.4" title="local-type: typedef-62.4">local-type: typedef-62.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.4" title="local-type: typedef-23.4">local-type: typedef-23.4</a>
                       </em>
                     </p>
                   </td>
@@ -198464,7 +198464,7 @@ <h3>28.29. The complex type <code>siri:PublishToAlertsActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-62.1" title="local-type: typedef-62.1">local-type: typedef-62.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
                       </em>
                     </p>
                   </td>
@@ -199607,7 +199607,7 @@ <h3>28.34. The complex type <code>siri:PushedActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-62.1" title="local-type: typedef-62.1">local-type: typedef-62.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
                       </em>
                     </p>
                   </td>
@@ -200157,7 +200157,7 @@ <h3>28.40. The complex type <code>siri:TextualContentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-62.3" title="local-type: typedef-62.3">local-type: typedef-62.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.3" title="local-type: typedef-23.3">local-type: typedef-23.3</a>
                       </em>
                     </p>
                   </td>
@@ -200501,8 +200501,8 @@ <h3>28.40. The complex type <code>siri:TextualContentStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.3">
-          <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typedef-62.3)</code>
+        <div class="sect2" id="local-type.typedef-23.3">
+          <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typedef-23.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -200522,7 +200522,7 @@ <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typede
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-62.3)</code>
+                      <code>  (typedef-23.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -200663,8 +200663,8 @@ <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typede
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.3">
-          <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typedef-62.3)</code>
+        <div class="sect2" id="local-type.typedef-23.3">
+          <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typedef-23.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -200684,7 +200684,7 @@ <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typede
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-62.3)</code>
+                      <code>  (typedef-23.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -200825,8 +200825,8 @@ <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typede
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.2">
-          <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishAtScope#complexType (typedef-62.2)</code>
+        <div class="sect2" id="local-type.typedef-23.2">
+          <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishAtScope#complexType (typedef-23.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -200846,7 +200846,7 @@ <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishA
                       <br/>
                       <code>  /PublishAtScope #complexType</code>
                       <br/>
-                      <code>  (typedef-62.2)</code>
+                      <code>  (typedef-23.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -200913,8 +200913,8 @@ <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishA
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.3">
-          <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typedef-62.3)</code>
+        <div class="sect2" id="local-type.typedef-23.3">
+          <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typedef-23.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -200934,7 +200934,7 @@ <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typede
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-62.3)</code>
+                      <code>  (typedef-23.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201075,8 +201075,8 @@ <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typede
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.1">
-          <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-62.1)</code>
+        <div class="sect2" id="local-type.typedef-23.1">
+          <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201096,7 +201096,7 @@ <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-62.1)</code>
+                      <code>  (typedef-23.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201135,8 +201135,8 @@ <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.1">
-          <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-62.1)</code>
+        <div class="sect2" id="local-type.typedef-23.1">
+          <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201156,7 +201156,7 @@ <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-62.1)</code>
+                      <code>  (typedef-23.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201195,8 +201195,8 @@ <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.1">
-          <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-62.1)</code>
+        <div class="sect2" id="local-type.typedef-23.1">
+          <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201216,7 +201216,7 @@ <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-62.1)</code>
+                      <code>  (typedef-23.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201255,8 +201255,8 @@ <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.1">
-          <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-62.1)</code>
+        <div class="sect2" id="local-type.typedef-23.1">
+          <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201276,7 +201276,7 @@ <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-62.1)</code>
+                      <code>  (typedef-23.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201315,8 +201315,8 @@ <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.4">
-          <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/PublishAtScope#complexType (typedef-62.4)</code>
+        <div class="sect2" id="local-type.typedef-23.4">
+          <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/PublishAtScope#complexType (typedef-23.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201336,7 +201336,7 @@ <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/Pu
                       <br/>
                       <code>  /PublishAtScope #complexType</code>
                       <br/>
-                      <code>  (typedef-62.4)</code>
+                      <code>  (typedef-23.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201403,8 +201403,8 @@ <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/Pu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.1">
-          <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-62.1)</code>
+        <div class="sect2" id="local-type.typedef-23.1">
+          <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201424,7 +201424,7 @@ <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-62.1)</code>
+                      <code>  (typedef-23.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201463,8 +201463,8 @@ <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.1">
-          <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-62.1)</code>
+        <div class="sect2" id="local-type.typedef-23.1">
+          <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201484,7 +201484,7 @@ <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-62.1)</code>
+                      <code>  (typedef-23.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201523,8 +201523,8 @@ <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.3">
-          <h3>28.52. The complex type <code>element[siri:ManualAction]#complexType (typedef-62.3)</code>
+        <div class="sect2" id="local-type.typedef-23.3">
+          <h3>28.52. The complex type <code>element[siri:ManualAction]#complexType (typedef-23.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201544,7 +201544,7 @@ <h3>28.52. The complex type <code>element[siri:ManualAction]#complexType (typede
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-62.3)</code>
+                      <code>  (typedef-23.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -203436,7 +203436,7 @@ <h3>29.16. The complex type <code>siri:AffectedCallStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.1" title="local-type: typedef-51.1">local-type: typedef-51.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.1" title="local-type: typedef-29.1">local-type: typedef-29.1</a>
                       </em>
                     </p>
                   </td>
@@ -203460,7 +203460,7 @@ <h3>29.16. The complex type <code>siri:AffectedCallStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.2" title="local-type: typedef-51.2">local-type: typedef-51.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.2" title="local-type: typedef-29.2">local-type: typedef-29.2</a>
                       </em>
                     </p>
                   </td>
@@ -204066,7 +204066,7 @@ <h3>29.16. The complex type <code>siri:AffectedCallStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.16" title="local-type: typedef-51.16">local-type: typedef-51.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.16" title="local-type: typedef-29.16">local-type: typedef-29.16</a>
                       </em>
                     </p>
                   </td>
@@ -205024,7 +205024,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.4" title="local-type: typedef-51.4">local-type: typedef-51.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.4" title="local-type: typedef-29.4">local-type: typedef-29.4</a>
                       </em>
                     </p>
                   </td>
@@ -205048,7 +205048,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.5" title="local-type: typedef-51.5">local-type: typedef-51.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.5" title="local-type: typedef-29.5">local-type: typedef-29.5</a>
                       </em>
                     </p>
                   </td>
@@ -205072,7 +205072,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.6" title="local-type: typedef-51.6">local-type: typedef-51.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.6" title="local-type: typedef-29.6">local-type: typedef-29.6</a>
                       </em>
                     </p>
                   </td>
@@ -205096,7 +205096,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.7" title="local-type: typedef-51.7">local-type: typedef-51.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.7" title="local-type: typedef-29.7">local-type: typedef-29.7</a>
                       </em>
                     </p>
                   </td>
@@ -205322,7 +205322,7 @@ <h3>29.22. The complex type <code>siri:AffectedModesStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.3" title="local-type: typedef-51.3">local-type: typedef-51.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.3" title="local-type: typedef-29.3">local-type: typedef-29.3</a>
                       </em>
                     </p>
                   </td>
@@ -206598,7 +206598,7 @@ <h3>29.27. The complex type <code>siri:AffectedRouteStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.9" title="local-type: typedef-51.9">local-type: typedef-51.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.9" title="local-type: typedef-29.9">local-type: typedef-29.9</a>
                       </em>
                     </p>
                   </td>
@@ -206622,7 +206622,7 @@ <h3>29.27. The complex type <code>siri:AffectedRouteStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.10" title="local-type: typedef-51.10">local-type: typedef-51.10</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.10" title="local-type: typedef-29.10">local-type: typedef-29.10</a>
                       </em>
                     </p>
                   </td>
@@ -206646,7 +206646,7 @@ <h3>29.27. The complex type <code>siri:AffectedRouteStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.11" title="local-type: typedef-51.11">local-type: typedef-51.11</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.11" title="local-type: typedef-29.11">local-type: typedef-29.11</a>
                       </em>
                     </p>
                   </td>
@@ -206769,7 +206769,7 @@ <h3>29.28. The complex type <code>siri:AffectedSectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.8" title="local-type: typedef-51.8">local-type: typedef-51.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.8" title="local-type: typedef-29.8">local-type: typedef-29.8</a>
                       </em>
                     </p>
                   </td>
@@ -207125,7 +207125,7 @@ <h3>29.29. The complex type <code>siri:AffectedStopPlaceComponentStructure</code
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.21" title="local-type: typedef-51.21">local-type: typedef-51.21</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.21" title="local-type: typedef-29.21">local-type: typedef-29.21</a>
                       </em>
                     </p>
                   </td>
@@ -207392,7 +207392,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.18" title="local-type: typedef-51.18">local-type: typedef-51.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.18" title="local-type: typedef-29.18">local-type: typedef-29.18</a>
                       </em>
                     </p>
                   </td>
@@ -207416,7 +207416,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.19" title="local-type: typedef-51.19">local-type: typedef-51.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.19" title="local-type: typedef-29.19">local-type: typedef-29.19</a>
                       </em>
                     </p>
                   </td>
@@ -207440,7 +207440,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.20" title="local-type: typedef-51.20">local-type: typedef-51.20</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.20" title="local-type: typedef-29.20">local-type: typedef-29.20</a>
                       </em>
                     </p>
                   </td>
@@ -207469,7 +207469,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.17" title="local-type: typedef-51.17">local-type: typedef-51.17</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.17" title="local-type: typedef-29.17">local-type: typedef-29.17</a>
                       </em>
                     </p>
                   </td>
@@ -207686,7 +207686,7 @@ <h3>29.32. The complex type <code>siri:AffectedStopPlaceWithoutLineStructure</co
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.18" title="local-type: typedef-51.18">local-type: typedef-51.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.18" title="local-type: typedef-29.18">local-type: typedef-29.18</a>
                       </em>
                     </p>
                   </td>
@@ -207710,7 +207710,7 @@ <h3>29.32. The complex type <code>siri:AffectedStopPlaceWithoutLineStructure</co
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.19" title="local-type: typedef-51.19">local-type: typedef-51.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.19" title="local-type: typedef-29.19">local-type: typedef-29.19</a>
                       </em>
                     </p>
                   </td>
@@ -207734,7 +207734,7 @@ <h3>29.32. The complex type <code>siri:AffectedStopPlaceWithoutLineStructure</co
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.20" title="local-type: typedef-51.20">local-type: typedef-51.20</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.20" title="local-type: typedef-29.20">local-type: typedef-29.20</a>
                       </em>
                     </p>
                   </td>
@@ -208086,7 +208086,7 @@ <h3>29.33. The complex type <code>siri:AffectedStopPointStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.1" title="local-type: typedef-51.1">local-type: typedef-51.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.1" title="local-type: typedef-29.1">local-type: typedef-29.1</a>
                       </em>
                     </p>
                   </td>
@@ -208115,7 +208115,7 @@ <h3>29.33. The complex type <code>siri:AffectedStopPointStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.2" title="local-type: typedef-51.2">local-type: typedef-51.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.2" title="local-type: typedef-29.2">local-type: typedef-29.2</a>
                       </em>
                     </p>
                   </td>
@@ -208485,7 +208485,7 @@ <h3>29.34. The complex type <code>siri:AffectedStopPointWithoutLineStructure</co
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.1" title="local-type: typedef-51.1">local-type: typedef-51.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.1" title="local-type: typedef-29.1">local-type: typedef-29.1</a>
                       </em>
                     </p>
                   </td>
@@ -208829,7 +208829,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.12" title="local-type: typedef-51.12">local-type: typedef-51.12</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.12" title="local-type: typedef-29.12">local-type: typedef-29.12</a>
                       </em>
                     </p>
                   </td>
@@ -208853,7 +208853,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.13" title="local-type: typedef-51.13">local-type: typedef-51.13</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.13" title="local-type: typedef-29.13">local-type: typedef-29.13</a>
                       </em>
                     </p>
                   </td>
@@ -209092,7 +209092,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.14" title="local-type: typedef-51.14">local-type: typedef-51.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.14" title="local-type: typedef-29.14">local-type: typedef-29.14</a>
                       </em>
                     </p>
                   </td>
@@ -209116,7 +209116,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-51.15" title="local-type: typedef-51.15">local-type: typedef-51.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.15" title="local-type: typedef-29.15">local-type: typedef-29.15</a>
                       </em>
                     </p>
                   </td>
@@ -210336,8 +210336,8 @@ <h3>29.43. The complex type <code>siri:ZoneRefStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.1">
-          <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-51.1)</code>
+        <div class="sect2" id="local-type.typedef-29.1">
+          <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-29.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210357,7 +210357,7 @@ <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
                       <br/>
                       <code>  /ConnectionLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-51.1)</code>
+                      <code>  (typedef-29.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210399,8 +210399,8 @@ <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.2">
-          <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-51.2)</code>
+        <div class="sect2" id="local-type.typedef-29.2">
+          <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-29.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210420,7 +210420,7 @@ <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-51.2)</code>
+                      <code>  (typedef-29.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210462,8 +210462,8 @@ <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.16">
-          <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/AffectedInterchanges#complexType (typedef-51.16)</code>
+        <div class="sect2" id="local-type.typedef-29.16">
+          <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/AffectedInterchanges#complexType (typedef-29.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210483,7 +210483,7 @@ <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/Affect
                       <br/>
                       <code>  /AffectedInterchanges #complexType</code>
                       <br/>
-                      <code>  (typedef-51.16)</code>
+                      <code>  (typedef-29.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210521,8 +210521,8 @@ <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/Affect
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.4">
-          <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes#complexType (typedef-51.4)</code>
+        <div class="sect2" id="local-type.typedef-29.4">
+          <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes#complexType (typedef-29.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210542,7 +210542,7 @@ <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes
                       <br/>
                       <code>  /Routes #complexType</code>
                       <br/>
-                      <code>  (typedef-51.4)</code>
+                      <code>  (typedef-29.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210584,8 +210584,8 @@ <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.5">
-          <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sections#complexType (typedef-51.5)</code>
+        <div class="sect2" id="local-type.typedef-29.5">
+          <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sections#complexType (typedef-29.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210605,7 +210605,7 @@ <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sectio
                       <br/>
                       <code>  /Sections #complexType</code>
                       <br/>
-                      <code>  (typedef-51.5)</code>
+                      <code>  (typedef-29.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210647,8 +210647,8 @@ <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sectio
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.6">
-          <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPoints#complexType (typedef-51.6)</code>
+        <div class="sect2" id="local-type.typedef-29.6">
+          <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPoints#complexType (typedef-29.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210668,7 +210668,7 @@ <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPo
                       <br/>
                       <code>  /StopPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-51.6)</code>
+                      <code>  (typedef-29.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210710,8 +210710,8 @@ <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPo
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.7">
-          <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPlaces#complexType (typedef-51.7)</code>
+        <div class="sect2" id="local-type.typedef-29.7">
+          <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPlaces#complexType (typedef-29.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210731,7 +210731,7 @@ <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPl
                       <br/>
                       <code>  /StopPlaces #complexType</code>
                       <br/>
-                      <code>  (typedef-51.7)</code>
+                      <code>  (typedef-29.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210773,8 +210773,8 @@ <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.3">
-          <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#complexType (typedef-51.3)</code>
+        <div class="sect2" id="local-type.typedef-29.3">
+          <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#complexType (typedef-29.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210794,7 +210794,7 @@ <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#
                       <br/>
                       <code>  /Mode #complexType</code>
                       <br/>
-                      <code>  (typedef-51.3)</code>
+                      <code>  (typedef-29.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211123,8 +211123,8 @@ <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.9">
-          <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Sections#complexType (typedef-51.9)</code>
+        <div class="sect2" id="local-type.typedef-29.9">
+          <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Sections#complexType (typedef-29.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211144,7 +211144,7 @@ <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Secti
                       <br/>
                       <code>  /Sections #complexType</code>
                       <br/>
-                      <code>  (typedef-51.9)</code>
+                      <code>  (typedef-29.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211186,8 +211186,8 @@ <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Secti
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.10">
-          <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopPoints#complexType (typedef-51.10)</code>
+        <div class="sect2" id="local-type.typedef-29.10">
+          <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopPoints#complexType (typedef-29.10)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211207,7 +211207,7 @@ <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopP
                       <br/>
                       <code>  /StopPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-51.10)</code>
+                      <code>  (typedef-29.10)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211296,8 +211296,8 @@ <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.11">
-          <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/RouteLinks#complexType (typedef-51.11)</code>
+        <div class="sect2" id="local-type.typedef-29.11">
+          <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/RouteLinks#complexType (typedef-29.11)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211317,7 +211317,7 @@ <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/Route
                       <br/>
                       <code>  /RouteLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-51.11)</code>
+                      <code>  (typedef-29.11)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211359,8 +211359,8 @@ <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/Route
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.8">
-          <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/IndirectSectionRef#complexType (typedef-51.8)</code>
+        <div class="sect2" id="local-type.typedef-29.8">
+          <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/IndirectSectionRef#complexType (typedef-29.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211380,7 +211380,7 @@ <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/Ind
                       <br/>
                       <code>  /IndirectSectionRef #complexType</code>
                       <br/>
-                      <code>  (typedef-51.8)</code>
+                      <code>  (typedef-29.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211706,8 +211706,8 @@ <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/Ind
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.21">
-          <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStructure]/AffectedFacilities#complexType (typedef-51.21)</code>
+        <div class="sect2" id="local-type.typedef-29.21">
+          <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStructure]/AffectedFacilities#complexType (typedef-29.21)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211727,7 +211727,7 @@ <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStr
                       <br/>
                       <code>  /AffectedFacilities #complexType</code>
                       <br/>
-                      <code>  (typedef-51.21)</code>
+                      <code>  (typedef-29.21)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211769,8 +211769,8 @@ <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStr
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.18">
-          <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-51.18)</code>
+        <div class="sect2" id="local-type.typedef-29.18">
+          <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-29.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211790,7 +211790,7 @@ <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedFacilities #complexType</code>
                       <br/>
-                      <code>  (typedef-51.18)</code>
+                      <code>  (typedef-29.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211832,8 +211832,8 @@ <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.19">
-          <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-51.19)</code>
+        <div class="sect2" id="local-type.typedef-29.19">
+          <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-29.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211853,7 +211853,7 @@ <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedComponents #complexType</code>
                       <br/>
-                      <code>  (typedef-51.19)</code>
+                      <code>  (typedef-29.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211891,8 +211891,8 @@ <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.20">
-          <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-51.20)</code>
+        <div class="sect2" id="local-type.typedef-29.20">
+          <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-29.20)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211912,7 +211912,7 @@ <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedNavigationPaths #complexType</code>
                       <br/>
-                      <code>  (typedef-51.20)</code>
+                      <code>  (typedef-29.20)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211954,8 +211954,8 @@ <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.17">
-          <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/Lines#complexType (typedef-51.17)</code>
+        <div class="sect2" id="local-type.typedef-29.17">
+          <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/Lines#complexType (typedef-29.17)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211975,7 +211975,7 @@ <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/L
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-51.17)</code>
+                      <code>  (typedef-29.17)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212017,8 +212017,8 @@ <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/L
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.18">
-          <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-51.18)</code>
+        <div class="sect2" id="local-type.typedef-29.18">
+          <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-29.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212038,7 +212038,7 @@ <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedFacilities #complexType</code>
                       <br/>
-                      <code>  (typedef-51.18)</code>
+                      <code>  (typedef-29.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212080,8 +212080,8 @@ <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.19">
-          <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-51.19)</code>
+        <div class="sect2" id="local-type.typedef-29.19">
+          <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-29.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212101,7 +212101,7 @@ <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedComponents #complexType</code>
                       <br/>
-                      <code>  (typedef-51.19)</code>
+                      <code>  (typedef-29.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212139,8 +212139,8 @@ <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.20">
-          <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-51.20)</code>
+        <div class="sect2" id="local-type.typedef-29.20">
+          <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-29.20)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212160,7 +212160,7 @@ <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedNavigationPaths #complexType</code>
                       <br/>
-                      <code>  (typedef-51.20)</code>
+                      <code>  (typedef-29.20)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212202,8 +212202,8 @@ <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.1">
-          <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-51.1)</code>
+        <div class="sect2" id="local-type.typedef-29.1">
+          <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-29.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212223,7 +212223,7 @@ <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
                       <br/>
                       <code>  /ConnectionLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-51.1)</code>
+                      <code>  (typedef-29.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212265,8 +212265,8 @@ <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.2">
-          <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-51.2)</code>
+        <div class="sect2" id="local-type.typedef-29.2">
+          <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-29.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212286,7 +212286,7 @@ <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-51.2)</code>
+                      <code>  (typedef-29.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212328,8 +212328,8 @@ <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.1">
-          <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-51.1)</code>
+        <div class="sect2" id="local-type.typedef-29.1">
+          <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-29.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212349,7 +212349,7 @@ <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
                       <br/>
                       <code>  /ConnectionLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-51.1)</code>
+                      <code>  (typedef-29.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212391,8 +212391,8 @@ <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.12">
-          <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-51.12)</code>
+        <div class="sect2" id="local-type.typedef-29.12">
+          <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-29.12)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212412,7 +212412,7 @@ <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-51.12)</code>
+                      <code>  (typedef-29.12)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212454,8 +212454,8 @@ <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.13">
-          <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/JourneyParts#complexType (typedef-51.13)</code>
+        <div class="sect2" id="local-type.typedef-29.13">
+          <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/JourneyParts#complexType (typedef-29.13)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212475,7 +212475,7 @@ <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-51.13)</code>
+                      <code>  (typedef-29.13)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212517,8 +212517,8 @@ <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.14">
-          <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Calls#complexType (typedef-51.14)</code>
+        <div class="sect2" id="local-type.typedef-29.14">
+          <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Calls#complexType (typedef-29.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212538,7 +212538,7 @@ <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
                       <br/>
                       <code>  /Calls #complexType</code>
                       <br/>
-                      <code>  (typedef-51.14)</code>
+                      <code>  (typedef-29.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212580,8 +212580,8 @@ <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-51.15">
-          <h3>29.70. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Facilities#complexType (typedef-51.15)</code>
+        <div class="sect2" id="local-type.typedef-29.15">
+          <h3>29.70. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Facilities#complexType (typedef-29.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212601,7 +212601,7 @@ <h3>29.70. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-51.15)</code>
+                      <code>  (typedef-29.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -213266,12 +213266,12 @@ <h3>30.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-55.2" class="tableblock">
+                    <p id="local-type.typedef-39.2" class="tableblock">
                       <code>element[siri:Predictability]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-55.2)</code>
+                      <code>  (typedef-39.2)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -213316,12 +213316,12 @@ <h3>30.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-55.1" class="tableblock">
+                    <p id="local-type.typedef-39.1" class="tableblock">
                       <code>element[siri:VerificationStatus]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-55.1)</code>
+                      <code>  (typedef-39.1)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -223116,7 +223116,7 @@ <h3>39.4. The complex type <code>siri:AnnotatedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-25.1" title="local-type: typedef-25.1">local-type: typedef-25.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-69.1" title="local-type: typedef-69.1">local-type: typedef-69.1</a>
                       </em>
                     </p>
                   </td>
@@ -223140,7 +223140,7 @@ <h3>39.4. The complex type <code>siri:AnnotatedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-25.2" title="local-type: typedef-25.2">local-type: typedef-25.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-69.2" title="local-type: typedef-69.2">local-type: typedef-69.2</a>
                       </em>
                     </p>
                   </td>
@@ -223284,7 +223284,7 @@ <h3>39.5. The complex type <code>siri:RouteDirectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-25.3" title="local-type: typedef-25.3">local-type: typedef-25.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-69.3" title="local-type: typedef-69.3">local-type: typedef-69.3</a>
                       </em>
                     </p>
                   </td>
@@ -223494,7 +223494,7 @@ <h3>39.6. The complex type <code>siri:StopPointInPatternStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-67.1" title="local-type: typedef-67.1">local-type: typedef-67.1</a>
                       </em>
                     </p>
                   </td>
@@ -223518,7 +223518,7 @@ <h3>39.6. The complex type <code>siri:StopPointInPatternStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-67.2" title="local-type: typedef-67.2">local-type: typedef-67.2</a>
                       </em>
                     </p>
                   </td>
@@ -223682,8 +223682,8 @@ <h3>39.6. The complex type <code>siri:StopPointInPatternStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-25.1">
-          <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destinations#complexType (typedef-25.1)</code>
+        <div class="sect2" id="local-type.typedef-69.1">
+          <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destinations#complexType (typedef-69.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -223703,7 +223703,7 @@ <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destin
                       <br/>
                       <code>  /Destinations #complexType</code>
                       <br/>
-                      <code>  (typedef-25.1)</code>
+                      <code>  (typedef-69.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -223746,8 +223746,8 @@ <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destin
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-25.2">
-          <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Directions#complexType (typedef-25.2)</code>
+        <div class="sect2" id="local-type.typedef-69.2">
+          <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Directions#complexType (typedef-69.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -223767,7 +223767,7 @@ <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Direct
                       <br/>
                       <code>  /Directions #complexType</code>
                       <br/>
-                      <code>  (typedef-25.2)</code>
+                      <code>  (typedef-69.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -223809,8 +223809,8 @@ <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Direct
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-25.3">
-          <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns#complexType (typedef-25.3)</code>
+        <div class="sect2" id="local-type.typedef-69.3">
+          <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns#complexType (typedef-69.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -223830,7 +223830,7 @@ <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/Journ
                       <br/>
                       <code>  /JourneyPatterns #complexType</code>
                       <br/>
-                      <code>  (typedef-25.3)</code>
+                      <code>  (typedef-69.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -223860,7 +223860,7 @@ <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/Journ
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-25.4" title="local-type: typedef-25.4">local-type: typedef-25.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-69.4" title="local-type: typedef-69.4">local-type: typedef-69.4</a>
                       </em>
                     </p>
                   </td>
@@ -223872,8 +223872,8 @@ <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/Journ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-25.4">
-          <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern#complexType (typedef-25.4)</code>
+        <div class="sect2" id="local-type.typedef-69.4">
+          <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern#complexType (typedef-69.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -223893,7 +223893,7 @@ <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
                       <br/>
                       <code>  /JourneyPatterns/JourneyPattern #complexType</code>
                       <br/>
-                      <code>  (typedef-25.4)</code>
+                      <code>  (typedef-69.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -223968,7 +223968,7 @@ <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-25.5" title="local-type: typedef-25.5">local-type: typedef-25.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-69.5" title="local-type: typedef-69.5">local-type: typedef-69.5</a>
                       </em>
                     </p>
                   </td>
@@ -223980,8 +223980,8 @@ <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-25.5">
-          <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern/StopsInPattern#complexType (typedef-25.5)</code>
+        <div class="sect2" id="local-type.typedef-69.5">
+          <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern/StopsInPattern#complexType (typedef-69.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224001,7 +224001,7 @@ <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
                       <br/>
                       <code>  /JourneyPatterns/JourneyPattern/StopsInPattern #complexType</code>
                       <br/>
-                      <code>  (typedef-25.5)</code>
+                      <code>  (typedef-69.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -224043,8 +224043,8 @@ <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.1">
-          <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-27.1)</code>
+        <div class="sect2" id="local-type.typedef-67.1">
+          <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-67.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224064,7 +224064,7 @@ <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-27.1)</code>
+                      <code>  (typedef-67.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -224150,8 +224150,8 @@ <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.2">
-          <h3>39.13. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-27.2)</code>
+        <div class="sect2" id="local-type.typedef-67.2">
+          <h3>39.13. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-67.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224171,7 +224171,7 @@ <h3>39.13. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-27.2)</code>
+                      <code>  (typedef-67.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -224459,7 +224459,7 @@ <h3>40.2. The complex type <code>siri:AnnotatedStopPointStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-67.1" title="local-type: typedef-67.1">local-type: typedef-67.1</a>
                       </em>
                     </p>
                   </td>
@@ -224483,7 +224483,7 @@ <h3>40.2. The complex type <code>siri:AnnotatedStopPointStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-67.2" title="local-type: typedef-67.2">local-type: typedef-67.2</a>
                       </em>
                     </p>
                   </td>
@@ -224542,8 +224542,8 @@ <h3>40.2. The complex type <code>siri:AnnotatedStopPointStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.1">
-          <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-27.1)</code>
+        <div class="sect2" id="local-type.typedef-67.1">
+          <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-67.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224563,7 +224563,7 @@ <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/F
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-27.1)</code>
+                      <code>  (typedef-67.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -224649,8 +224649,8 @@ <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/F
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.2">
-          <h3>40.4. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-27.2)</code>
+        <div class="sect2" id="local-type.typedef-67.2">
+          <h3>40.4. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-67.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224670,7 +224670,7 @@ <h3>40.4. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/L
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-27.2)</code>
+                      <code>  (typedef-67.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -225794,7 +225794,7 @@ <h3>41.12. The group <code>siri:ProductionTimetableTopicGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.1" title="local-type: typedef-82.1">local-type: typedef-82.1</a>
                       </em>
                     </p>
                   </td>
@@ -225944,7 +225944,7 @@ <h3>41.13. The group <code>siri:SiriProductionTimetableIndexGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
                       </em>
                     </p>
                   </td>
@@ -225996,7 +225996,7 @@ <h3>41.13. The group <code>siri:SiriProductionTimetableIndexGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.3" title="local-type: typedef-74.3">local-type: typedef-74.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
                       </em>
                     </p>
                   </td>
@@ -227056,7 +227056,7 @@ <h3>41.15. The complex type <code>siri:ProductionTimetableCapabilitiesResponseSt
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.7" title="local-type: typedef-74.7">local-type: typedef-74.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.7" title="local-type: typedef-82.7">local-type: typedef-82.7</a>
                       </em>
                     </p>
                   </td>
@@ -227966,7 +227966,7 @@ <h3>41.19. The complex type <code>siri:ProductionTimetableRequestStructure</code
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.1" title="local-type: typedef-82.1">local-type: typedef-82.1</a>
                       </em>
                     </p>
                   </td>
@@ -228297,7 +228297,7 @@ <h3>41.20. The complex type <code>siri:ProductionTimetableServiceCapabilitiesStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.4" title="local-type: typedef-74.4">local-type: typedef-74.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
                       </em>
                     </p>
                   </td>
@@ -228321,7 +228321,7 @@ <h3>41.20. The complex type <code>siri:ProductionTimetableServiceCapabilitiesStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.5" title="local-type: typedef-74.5">local-type: typedef-74.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.5" title="local-type: typedef-82.5">local-type: typedef-82.5</a>
                       </em>
                     </p>
                   </td>
@@ -228345,7 +228345,7 @@ <h3>41.20. The complex type <code>siri:ProductionTimetableServiceCapabilitiesStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.6" title="local-type: typedef-74.6">local-type: typedef-74.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.6" title="local-type: typedef-82.6">local-type: typedef-82.6</a>
                       </em>
                     </p>
                   </td>
@@ -228717,8 +228717,8 @@ <h3>41.22. The complex type <code>siri:TimetableValidityPeriod</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.3">
-          <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-74.3)</code>
+        <div class="sect2" id="local-type.typedef-82.3">
+          <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-82.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -228738,7 +228738,7 @@ <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-74.3)</code>
+                      <code>  (typedef-82.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -228888,8 +228888,8 @@ <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.7">
-          <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-74.7)</code>
+        <div class="sect2" id="local-type.typedef-82.7">
+          <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-82.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -228909,7 +228909,7 @@ <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#c
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-74.7)</code>
+                      <code>  (typedef-82.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -228984,8 +228984,8 @@ <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.2">
-          <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-74.2)</code>
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229005,7 +229005,7 @@ <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-74.2)</code>
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229202,8 +229202,8 @@ <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.1">
-          <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-74.1)</code>
+        <div class="sect2" id="local-type.typedef-82.1">
+          <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-82.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229223,7 +229223,7 @@ <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-74.1)</code>
+                      <code>  (typedef-82.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229265,8 +229265,8 @@ <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.2">
-          <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-74.2)</code>
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229286,7 +229286,7 @@ <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-74.2)</code>
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229483,8 +229483,8 @@ <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.3">
-          <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-74.3)</code>
+        <div class="sect2" id="local-type.typedef-82.3">
+          <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-82.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229504,7 +229504,7 @@ <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-74.3)</code>
+                      <code>  (typedef-82.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229654,8 +229654,8 @@ <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.7">
-          <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-74.7)</code>
+        <div class="sect2" id="local-type.typedef-82.7">
+          <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-82.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229675,7 +229675,7 @@ <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#c
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-74.7)</code>
+                      <code>  (typedef-82.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229750,8 +229750,8 @@ <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.1">
-          <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-74.1)</code>
+        <div class="sect2" id="local-type.typedef-82.1">
+          <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-82.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229771,7 +229771,7 @@ <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-74.1)</code>
+                      <code>  (typedef-82.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229813,8 +229813,8 @@ <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.4">
-          <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-74.4)</code>
+        <div class="sect2" id="local-type.typedef-82.4">
+          <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-82.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229834,7 +229834,7 @@ <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCap
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-74.4)</code>
+                      <code>  (typedef-82.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -230031,8 +230031,8 @@ <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCap
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.5">
-          <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-74.5)</code>
+        <div class="sect2" id="local-type.typedef-82.5">
+          <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-82.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -230052,7 +230052,7 @@ <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCap
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-74.5)</code>
+                      <code>  (typedef-82.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -230196,8 +230196,8 @@ <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCap
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.6">
-          <h3>41.33. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/SubscriptionPolicy#complexType (typedef-74.6)</code>
+        <div class="sect2" id="local-type.typedef-82.6">
+          <h3>41.33. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/SubscriptionPolicy#complexType (typedef-82.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -230217,7 +230217,7 @@ <h3>41.33. The complex type <code>complexType[siri:ProductionTimetableServiceCap
                       <br/>
                       <code>  /SubscriptionPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-74.6)</code>
+                      <code>  (typedef-82.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -230932,7 +230932,7 @@ <h3>42.11. The group <code>siri:SituationExchangePayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.3" title="local-type: typedef-77.3">local-type: typedef-77.3</a>
                       </em>
                     </p>
                   </td>
@@ -231798,7 +231798,7 @@ <h3>42.14. The group <code>siri:SituationExchangeTopicGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
                       </em>
                     </p>
                   </td>
@@ -232111,7 +232111,7 @@ <h3>42.14. The group <code>siri:SituationExchangeTopicGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.1" title="local-type: typedef-82.1">local-type: typedef-82.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.1" title="local-type: typedef-77.1">local-type: typedef-77.1</a>
                       </em>
                     </p>
                   </td>
@@ -232485,7 +232485,7 @@ <h3>42.17. The group <code>siri:SituationNetworkFilterGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
                       </em>
                     </p>
                   </td>
@@ -233650,7 +233650,7 @@ <h3>42.26. The complex type <code>siri:SituationExchangeCapabilitiesResponseStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.8" title="local-type: typedef-82.8">local-type: typedef-82.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.8" title="local-type: typedef-77.8">local-type: typedef-77.8</a>
                       </em>
                     </p>
                   </td>
@@ -234158,7 +234158,7 @@ <h3>42.28. The complex type <code>siri:SituationExchangeDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.3" title="local-type: typedef-77.3">local-type: typedef-77.3</a>
                       </em>
                     </p>
                   </td>
@@ -234993,7 +234993,7 @@ <h3>42.29. The complex type <code>siri:SituationExchangeRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
                       </em>
                     </p>
                   </td>
@@ -235306,7 +235306,7 @@ <h3>42.29. The complex type <code>siri:SituationExchangeRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.1" title="local-type: typedef-82.1">local-type: typedef-82.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.1" title="local-type: typedef-77.1">local-type: typedef-77.1</a>
                       </em>
                     </p>
                   </td>
@@ -235531,7 +235531,7 @@ <h3>42.30. The complex type <code>siri:SituationExchangeServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.4" title="local-type: typedef-77.4">local-type: typedef-77.4</a>
                       </em>
                     </p>
                   </td>
@@ -235555,7 +235555,7 @@ <h3>42.30. The complex type <code>siri:SituationExchangeServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.5" title="local-type: typedef-82.5">local-type: typedef-82.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.5" title="local-type: typedef-77.5">local-type: typedef-77.5</a>
                       </em>
                     </p>
                   </td>
@@ -235603,7 +235603,7 @@ <h3>42.30. The complex type <code>siri:SituationExchangeServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.6" title="local-type: typedef-82.6">local-type: typedef-82.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.6" title="local-type: typedef-77.6">local-type: typedef-77.6</a>
                       </em>
                     </p>
                   </td>
@@ -235627,7 +235627,7 @@ <h3>42.30. The complex type <code>siri:SituationExchangeServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.7" title="local-type: typedef-82.7">local-type: typedef-82.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.7" title="local-type: typedef-77.7">local-type: typedef-77.7</a>
                       </em>
                     </p>
                   </td>
@@ -235786,7 +235786,7 @@ <h3>42.31. The complex type <code>siri:SituationExchangeServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -235820,7 +235820,7 @@ <h3>42.31. The complex type <code>siri:SituationExchangeServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.2" title="local-type: typedef-68.2">local-type: typedef-68.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
                       </em>
                     </p>
                   </td>
@@ -235849,7 +235849,7 @@ <h3>42.31. The complex type <code>siri:SituationExchangeServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
                       </em>
                     </p>
                   </td>
@@ -236105,8 +236105,8 @@ <h3>42.32. The complex type <code>siri:SituationExchangeSubscriptionStructure</c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.8">
-          <h3>42.33. The complex type <code>element[siri:SituationExchangePermissions]#complexType (typedef-82.8)</code>
+        <div class="sect2" id="local-type.typedef-77.8">
+          <h3>42.33. The complex type <code>element[siri:SituationExchangePermissions]#complexType (typedef-77.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236126,7 +236126,7 @@ <h3>42.33. The complex type <code>element[siri:SituationExchangePermissions]#com
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.8)</code>
+                      <code>  (typedef-77.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236200,8 +236200,8 @@ <h3>42.33. The complex type <code>element[siri:SituationExchangePermissions]#com
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.3">
-          <h3>42.34. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situations#complexType (typedef-82.3)</code>
+        <div class="sect2" id="local-type.typedef-77.3">
+          <h3>42.34. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situations#complexType (typedef-77.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236221,7 +236221,7 @@ <h3>42.34. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situ
                       <br/>
                       <code>  /Situations #complexType</code>
                       <br/>
-                      <code>  (typedef-82.3)</code>
+                      <code>  (typedef-77.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236284,8 +236284,8 @@ <h3>42.34. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.2">
-          <h3>42.35. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-82.2)</code>
+        <div class="sect2" id="local-type.typedef-77.2">
+          <h3>42.35. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-77.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236305,7 +236305,7 @@ <h3>42.35. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-82.2)</code>
+                      <code>  (typedef-77.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236347,8 +236347,8 @@ <h3>42.35. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.1">
-          <h3>42.36. The complex type <code>group[siri:SituationExchangeTopicGroup]/SituationRoadFilter#complexType (typedef-82.1)</code>
+        <div class="sect2" id="local-type.typedef-77.1">
+          <h3>42.36. The complex type <code>group[siri:SituationExchangeTopicGroup]/SituationRoadFilter#complexType (typedef-77.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236368,7 +236368,7 @@ <h3>42.36. The complex type <code>group[siri:SituationExchangeTopicGroup]/Situat
                       <br/>
                       <code>  /SituationRoadFilter #complexType</code>
                       <br/>
-                      <code>  (typedef-82.1)</code>
+                      <code>  (typedef-77.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236410,8 +236410,8 @@ <h3>42.36. The complex type <code>group[siri:SituationExchangeTopicGroup]/Situat
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.2">
-          <h3>42.37. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-82.2)</code>
+        <div class="sect2" id="local-type.typedef-77.2">
+          <h3>42.37. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-77.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236431,7 +236431,7 @@ <h3>42.37. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-82.2)</code>
+                      <code>  (typedef-77.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236473,8 +236473,8 @@ <h3>42.37. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.8">
-          <h3>42.38. The complex type <code>element[siri:SituationExchangePermissions]#complexType (typedef-82.8)</code>
+        <div class="sect2" id="local-type.typedef-77.8">
+          <h3>42.38. The complex type <code>element[siri:SituationExchangePermissions]#complexType (typedef-77.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236494,7 +236494,7 @@ <h3>42.38. The complex type <code>element[siri:SituationExchangePermissions]#com
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.8)</code>
+                      <code>  (typedef-77.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236568,8 +236568,8 @@ <h3>42.38. The complex type <code>element[siri:SituationExchangePermissions]#com
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.3">
-          <h3>42.39. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situations#complexType (typedef-82.3)</code>
+        <div class="sect2" id="local-type.typedef-77.3">
+          <h3>42.39. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situations#complexType (typedef-77.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236589,7 +236589,7 @@ <h3>42.39. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situ
                       <br/>
                       <code>  /Situations #complexType</code>
                       <br/>
-                      <code>  (typedef-82.3)</code>
+                      <code>  (typedef-77.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236652,8 +236652,8 @@ <h3>42.39. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.2">
-          <h3>42.40. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-82.2)</code>
+        <div class="sect2" id="local-type.typedef-77.2">
+          <h3>42.40. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-77.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236673,7 +236673,7 @@ <h3>42.40. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-82.2)</code>
+                      <code>  (typedef-77.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236715,8 +236715,8 @@ <h3>42.40. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.1">
-          <h3>42.41. The complex type <code>group[siri:SituationExchangeTopicGroup]/SituationRoadFilter#complexType (typedef-82.1)</code>
+        <div class="sect2" id="local-type.typedef-77.1">
+          <h3>42.41. The complex type <code>group[siri:SituationExchangeTopicGroup]/SituationRoadFilter#complexType (typedef-77.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236736,7 +236736,7 @@ <h3>42.41. The complex type <code>group[siri:SituationExchangeTopicGroup]/Situat
                       <br/>
                       <code>  /SituationRoadFilter #complexType</code>
                       <br/>
-                      <code>  (typedef-82.1)</code>
+                      <code>  (typedef-77.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236778,8 +236778,8 @@ <h3>42.41. The complex type <code>group[siri:SituationExchangeTopicGroup]/Situat
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.4">
-          <h3>42.42. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-82.4)</code>
+        <div class="sect2" id="local-type.typedef-77.4">
+          <h3>42.42. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-77.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236799,7 +236799,7 @@ <h3>42.42. The complex type <code>complexType[siri:SituationExchangeServiceCapab
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-82.4)</code>
+                      <code>  (typedef-77.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -237148,8 +237148,8 @@ <h3>42.42. The complex type <code>complexType[siri:SituationExchangeServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.5">
-          <h3>42.43. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-82.5)</code>
+        <div class="sect2" id="local-type.typedef-77.5">
+          <h3>42.43. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-77.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -237169,7 +237169,7 @@ <h3>42.43. The complex type <code>complexType[siri:SituationExchangeServiceCapab
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-82.5)</code>
+                      <code>  (typedef-77.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -237341,8 +237341,8 @@ <h3>42.43. The complex type <code>complexType[siri:SituationExchangeServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.6">
-          <h3>42.44. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/AccessControl#complexType (typedef-82.6)</code>
+        <div class="sect2" id="local-type.typedef-77.6">
+          <h3>42.44. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/AccessControl#complexType (typedef-77.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -237362,7 +237362,7 @@ <h3>42.44. The complex type <code>complexType[siri:SituationExchangeServiceCapab
                       <br/>
                       <code>  /AccessControl #complexType</code>
                       <br/>
-                      <code>  (typedef-82.6)</code>
+                      <code>  (typedef-77.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -237463,8 +237463,8 @@ <h3>42.44. The complex type <code>complexType[siri:SituationExchangeServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.7">
-          <h3>42.45. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-82.7)</code>
+        <div class="sect2" id="local-type.typedef-77.7">
+          <h3>42.45. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-77.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -237484,7 +237484,7 @@ <h3>42.45. The complex type <code>complexType[siri:SituationExchangeServiceCapab
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-82.7)</code>
+                      <code>  (typedef-77.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -237498,8 +237498,8 @@ <h3>42.45. The complex type <code>complexType[siri:SituationExchangeServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-39.1">
-          <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-39.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -237519,7 +237519,7 @@ <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-39.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -237587,8 +237587,8 @@ <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.2">
-          <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-68.2)</code>
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -237608,7 +237608,7 @@ <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-68.2)</code>
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -237693,8 +237693,8 @@ <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.1">
-          <h3>42.48. The complex type <code>element[siri:LinePermissions]#complexType (typedef-68.1)</code>
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>42.48. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -237714,7 +237714,7 @@ <h3>42.48. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-68.1)</code>
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -239249,7 +239249,7 @@ <h3>43.23. The group <code>siri:StopMonitoringRequestPolicyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-84.1" title="local-type: typedef-84.1">local-type: typedef-84.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.1" title="local-type: typedef-80.1">local-type: typedef-80.1</a>
                       </em>
                     </p>
                   </td>
@@ -241802,7 +241802,7 @@ <h3>43.35. The complex type <code>siri:StopMonitoringCapabilitiesResponseStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-84.5" title="local-type: typedef-84.5">local-type: typedef-84.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.5" title="local-type: typedef-80.5">local-type: typedef-80.5</a>
                       </em>
                     </p>
                   </td>
@@ -243134,7 +243134,7 @@ <h3>43.39. The complex type <code>siri:StopMonitoringFilterStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-84.1" title="local-type: typedef-84.1">local-type: typedef-84.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.1" title="local-type: typedef-80.1">local-type: typedef-80.1</a>
                       </em>
                     </p>
                   </td>
@@ -243813,7 +243813,7 @@ <h3>43.41. The complex type <code>siri:StopMonitoringRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-84.1" title="local-type: typedef-84.1">local-type: typedef-84.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.1" title="local-type: typedef-80.1">local-type: typedef-80.1</a>
                       </em>
                     </p>
                   </td>
@@ -243953,7 +243953,7 @@ <h3>43.42. The complex type <code>siri:StopMonitoringServiceCapabilitiesStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-84.2" title="local-type: typedef-84.2">local-type: typedef-84.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.2" title="local-type: typedef-80.2">local-type: typedef-80.2</a>
                       </em>
                     </p>
                   </td>
@@ -243977,7 +243977,7 @@ <h3>43.42. The complex type <code>siri:StopMonitoringServiceCapabilitiesStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-84.3" title="local-type: typedef-84.3">local-type: typedef-84.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.3" title="local-type: typedef-80.3">local-type: typedef-80.3</a>
                       </em>
                     </p>
                   </td>
@@ -244049,7 +244049,7 @@ <h3>43.42. The complex type <code>siri:StopMonitoringServiceCapabilitiesStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-84.4" title="local-type: typedef-84.4">local-type: typedef-84.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.4" title="local-type: typedef-80.4">local-type: typedef-80.4</a>
                       </em>
                     </p>
                   </td>
@@ -244183,7 +244183,7 @@ <h3>43.43. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -244217,7 +244217,7 @@ <h3>43.43. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.2" title="local-type: typedef-68.2">local-type: typedef-68.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
                       </em>
                     </p>
                   </td>
@@ -244246,7 +244246,7 @@ <h3>43.43. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
                       </em>
                     </p>
                   </td>
@@ -244274,7 +244274,7 @@ <h3>43.43. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-84.6" title="local-type: typedef-84.6">local-type: typedef-84.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.6" title="local-type: typedef-80.6">local-type: typedef-80.6</a>
                       </em>
                     </p>
                   </td>
@@ -244977,8 +244977,8 @@ <h3>43.46. The complex type <code>siri:StopNoticeStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.5">
-          <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-84.5)</code>
+        <div class="sect2" id="local-type.typedef-80.5">
+          <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-80.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -244998,7 +244998,7 @@ <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-84.5)</code>
+                      <code>  (typedef-80.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245072,8 +245072,8 @@ <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.1">
-          <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-84.1)</code>
+        <div class="sect2" id="local-type.typedef-80.1">
+          <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245093,7 +245093,7 @@ <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-84.1)</code>
+                      <code>  (typedef-80.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245153,8 +245153,8 @@ <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.5">
-          <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-84.5)</code>
+        <div class="sect2" id="local-type.typedef-80.5">
+          <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-80.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245174,7 +245174,7 @@ <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-84.5)</code>
+                      <code>  (typedef-80.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245248,8 +245248,8 @@ <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.1">
-          <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-84.1)</code>
+        <div class="sect2" id="local-type.typedef-80.1">
+          <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245269,7 +245269,7 @@ <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-84.1)</code>
+                      <code>  (typedef-80.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245329,8 +245329,8 @@ <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.1">
-          <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-84.1)</code>
+        <div class="sect2" id="local-type.typedef-80.1">
+          <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245350,7 +245350,7 @@ <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-84.1)</code>
+                      <code>  (typedef-80.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245410,8 +245410,8 @@ <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.2">
-          <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-84.2)</code>
+        <div class="sect2" id="local-type.typedef-80.2">
+          <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-80.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245431,7 +245431,7 @@ <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-84.2)</code>
+                      <code>  (typedef-80.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245624,8 +245624,8 @@ <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.3">
-          <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-84.3)</code>
+        <div class="sect2" id="local-type.typedef-80.3">
+          <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-80.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245645,7 +245645,7 @@ <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-84.3)</code>
+                      <code>  (typedef-80.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245985,8 +245985,8 @@ <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.4">
-          <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-84.4)</code>
+        <div class="sect2" id="local-type.typedef-80.4">
+          <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-80.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246006,7 +246006,7 @@ <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-84.4)</code>
+                      <code>  (typedef-80.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -246066,8 +246066,8 @@ <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-39.1">
-          <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-39.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246087,7 +246087,7 @@ <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-39.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -246155,8 +246155,8 @@ <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.2">
-          <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-68.2)</code>
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246176,7 +246176,7 @@ <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-68.2)</code>
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -246261,8 +246261,8 @@ <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.1">
-          <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typedef-68.1)</code>
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246282,7 +246282,7 @@ <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-68.1)</code>
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -246367,8 +246367,8 @@ <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.6">
-          <h3>43.58. The complex type <code>complexType[siri:StopMonitoringServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-84.6)</code>
+        <div class="sect2" id="local-type.typedef-80.6">
+          <h3>43.58. The complex type <code>complexType[siri:StopMonitoringServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-80.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246388,7 +246388,7 @@ <h3>43.58. The complex type <code>complexType[siri:StopMonitoringServicePermissi
                       <br/>
                       <code>  /StopMonitorPermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-84.6)</code>
+                      <code>  (typedef-80.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -247532,7 +247532,7 @@ <h3>44.13. The complex type <code>siri:StopTimetableCapabilitiesResponseStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.3" title="local-type: typedef-72.3">local-type: typedef-72.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-75.3" title="local-type: typedef-75.3">local-type: typedef-75.3</a>
                       </em>
                     </p>
                   </td>
@@ -248676,7 +248676,7 @@ <h3>44.18. The complex type <code>siri:StopTimetableServiceCapabilitiesStructure
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-75.1" title="local-type: typedef-75.1">local-type: typedef-75.1</a>
                       </em>
                     </p>
                   </td>
@@ -248724,7 +248724,7 @@ <h3>44.18. The complex type <code>siri:StopTimetableServiceCapabilitiesStructure
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-75.2" title="local-type: typedef-75.2">local-type: typedef-75.2</a>
                       </em>
                     </p>
                   </td>
@@ -248883,7 +248883,7 @@ <h3>44.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -248917,7 +248917,7 @@ <h3>44.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.2" title="local-type: typedef-68.2">local-type: typedef-68.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
                       </em>
                     </p>
                   </td>
@@ -248946,7 +248946,7 @@ <h3>44.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
                       </em>
                     </p>
                   </td>
@@ -248974,7 +248974,7 @@ <h3>44.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.4" title="local-type: typedef-72.4">local-type: typedef-72.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-75.4" title="local-type: typedef-75.4">local-type: typedef-75.4</a>
                       </em>
                     </p>
                   </td>
@@ -249930,8 +249930,8 @@ <h3>44.22. The complex type <code>siri:TimetabledStopVisitStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.3">
-          <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-72.3)</code>
+        <div class="sect2" id="local-type.typedef-75.3">
+          <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-75.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -249951,7 +249951,7 @@ <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complex
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-72.3)</code>
+                      <code>  (typedef-75.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250025,8 +250025,8 @@ <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.3">
-          <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-72.3)</code>
+        <div class="sect2" id="local-type.typedef-75.3">
+          <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-75.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250046,7 +250046,7 @@ <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complex
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-72.3)</code>
+                      <code>  (typedef-75.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250120,8 +250120,8 @@ <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.1">
-          <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-72.1)</code>
+        <div class="sect2" id="local-type.typedef-75.1">
+          <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-75.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250141,7 +250141,7 @@ <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-72.1)</code>
+                      <code>  (typedef-75.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250235,8 +250235,8 @@ <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.2">
-          <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/AccessControl#complexType (typedef-72.2)</code>
+        <div class="sect2" id="local-type.typedef-75.2">
+          <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/AccessControl#complexType (typedef-75.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250256,7 +250256,7 @@ <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
                       <br/>
                       <code>  /AccessControl #complexType</code>
                       <br/>
-                      <code>  (typedef-72.2)</code>
+                      <code>  (typedef-75.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250381,8 +250381,8 @@ <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-39.1">
-          <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-39.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250402,7 +250402,7 @@ <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-39.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250470,8 +250470,8 @@ <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.2">
-          <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-68.2)</code>
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250491,7 +250491,7 @@ <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-68.2)</code>
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250576,8 +250576,8 @@ <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.1">
-          <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typedef-68.1)</code>
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250597,7 +250597,7 @@ <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-68.1)</code>
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250682,8 +250682,8 @@ <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.4">
-          <h3>44.30. The complex type <code>complexType[siri:StopTimetableServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-72.4)</code>
+        <div class="sect2" id="local-type.typedef-75.4">
+          <h3>44.30. The complex type <code>complexType[siri:StopTimetableServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-75.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250703,7 +250703,7 @@ <h3>44.30. The complex type <code>complexType[siri:StopTimetableServicePermissio
                       <br/>
                       <code>  /StopMonitorPermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.4)</code>
+                      <code>  (typedef-75.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -252104,7 +252104,7 @@ <h3>47.2. The complex type <code>siri:AbstractPermissionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -252232,8 +252232,8 @@ <h3>47.4. The complex type <code>siri:CapabilityAccessControlStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-39.1">
-          <h3>47.5. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-39.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>47.5. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -252253,7 +252253,7 @@ <h3>47.5. The complex type <code>complexType[siri:AbstractPermissionStructure]/G
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-39.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -252516,12 +252516,12 @@ <h3>48.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-6.1" class="tableblock">
+                    <p id="local-type.typedef-71.1" class="tableblock">
                       <code>attribute[lang]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-6.1)</code>
+                      <code>  (typedef-71.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -254795,7 +254795,7 @@ <h3>50.14. The group <code>siri:VehicleMonitoringRequestPolicyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.1" title="local-type: typedef-77.1">local-type: typedef-77.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.1" title="local-type: typedef-79.1">local-type: typedef-79.1</a>
                       </em>
                     </p>
                   </td>
@@ -255918,7 +255918,7 @@ <h3>50.19. The complex type <code>siri:VehicleActivityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.2" title="local-type: typedef-79.2">local-type: typedef-79.2</a>
                       </em>
                     </p>
                   </td>
@@ -256232,7 +256232,7 @@ <h3>50.20. The complex type <code>siri:VehicleMonitoringCapabilitiesResponseStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.7" title="local-type: typedef-77.7">local-type: typedef-77.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.7" title="local-type: typedef-79.7">local-type: typedef-79.7</a>
                       </em>
                     </p>
                   </td>
@@ -257372,7 +257372,7 @@ <h3>50.25. The complex type <code>siri:VehicleMonitoringRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.1" title="local-type: typedef-77.1">local-type: typedef-77.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.1" title="local-type: typedef-79.1">local-type: typedef-79.1</a>
                       </em>
                     </p>
                   </td>
@@ -257532,7 +257532,7 @@ <h3>50.26. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.3" title="local-type: typedef-77.3">local-type: typedef-77.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.3" title="local-type: typedef-79.3">local-type: typedef-79.3</a>
                       </em>
                     </p>
                   </td>
@@ -257556,7 +257556,7 @@ <h3>50.26. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.4" title="local-type: typedef-77.4">local-type: typedef-77.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.4" title="local-type: typedef-79.4">local-type: typedef-79.4</a>
                       </em>
                     </p>
                   </td>
@@ -257604,7 +257604,7 @@ <h3>50.26. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.5" title="local-type: typedef-77.5">local-type: typedef-77.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.5" title="local-type: typedef-79.5">local-type: typedef-79.5</a>
                       </em>
                     </p>
                   </td>
@@ -257628,7 +257628,7 @@ <h3>50.26. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.6" title="local-type: typedef-77.6">local-type: typedef-77.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.6" title="local-type: typedef-79.6">local-type: typedef-79.6</a>
                       </em>
                     </p>
                   </td>
@@ -257787,7 +257787,7 @@ <h3>50.27. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-39.1" title="local-type: typedef-39.1">local-type: typedef-39.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -257821,7 +257821,7 @@ <h3>50.27. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.2" title="local-type: typedef-68.2">local-type: typedef-68.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
                       </em>
                     </p>
                   </td>
@@ -257850,7 +257850,7 @@ <h3>50.27. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
                       </em>
                     </p>
                   </td>
@@ -257878,7 +257878,7 @@ <h3>50.27. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.8" title="local-type: typedef-77.8">local-type: typedef-77.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.8" title="local-type: typedef-79.8">local-type: typedef-79.8</a>
                       </em>
                     </p>
                   </td>
@@ -258291,8 +258291,8 @@ <h3>50.29. The complex type <code>siri:VehicleMonitorPermissionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.7">
-          <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-77.7)</code>
+        <div class="sect2" id="local-type.typedef-79.7">
+          <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-79.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -258312,7 +258312,7 @@ <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-77.7)</code>
+                      <code>  (typedef-79.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -258386,8 +258386,8 @@ <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.1">
-          <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-77.1)</code>
+        <div class="sect2" id="local-type.typedef-79.1">
+          <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-79.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -258407,7 +258407,7 @@ <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-77.1)</code>
+                      <code>  (typedef-79.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -258467,8 +258467,8 @@ <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.2">
-          <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/MonitoredVehicleJourney#complexType (typedef-77.2)</code>
+        <div class="sect2" id="local-type.typedef-79.2">
+          <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/MonitoredVehicleJourney#complexType (typedef-79.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -258488,7 +258488,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                       <br/>
                       <code>  /MonitoredVehicleJourney #complexType</code>
                       <br/>
-                      <code>  (typedef-77.2)</code>
+                      <code>  (typedef-79.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -259955,7 +259955,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-53.4" title="local-type: typedef-53.4">local-type: typedef-53.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.4" title="local-type: typedef-28.4">local-type: typedef-28.4</a>
                       </em>
                     </p>
                   </td>
@@ -259976,7 +259976,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-53.5" title="local-type: typedef-53.5">local-type: typedef-53.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.5" title="local-type: typedef-28.5">local-type: typedef-28.5</a>
                       </em>
                     </p>
                   </td>
@@ -260000,7 +260000,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.2" title="local-type: typedef-54.2">local-type: typedef-54.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
                       </em>
                     </p>
                   </td>
@@ -260021,7 +260021,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.3" title="local-type: typedef-54.3">local-type: typedef-54.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
                       </em>
                     </p>
                   </td>
@@ -260042,7 +260042,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-54.4" title="local-type: typedef-54.4">local-type: typedef-54.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
                       </em>
                     </p>
                   </td>
@@ -260140,8 +260140,8 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-53.4">
-          <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-53.4)</code>
+        <div class="sect2" id="local-type.typedef-28.4">
+          <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260161,7 +260161,7 @@ <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-53.4)</code>
+                      <code>  (typedef-28.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260203,8 +260203,8 @@ <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-53.5">
-          <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-53.5)</code>
+        <div class="sect2" id="local-type.typedef-28.5">
+          <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260224,7 +260224,7 @@ <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-53.5)</code>
+                      <code>  (typedef-28.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260266,8 +260266,8 @@ <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.2">
-          <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-54.2)</code>
+        <div class="sect2" id="local-type.typedef-18.2">
+          <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260287,7 +260287,7 @@ <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-54.2)</code>
+                      <code>  (typedef-18.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260374,8 +260374,8 @@ <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.3">
-          <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-54.3)</code>
+        <div class="sect2" id="local-type.typedef-18.3">
+          <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260395,7 +260395,7 @@ <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-54.3)</code>
+                      <code>  (typedef-18.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260482,8 +260482,8 @@ <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.4">
-          <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-54.4)</code>
+        <div class="sect2" id="local-type.typedef-18.4">
+          <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260503,7 +260503,7 @@ <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-54.4)</code>
+                      <code>  (typedef-18.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260590,8 +260590,8 @@ <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.7">
-          <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-77.7)</code>
+        <div class="sect2" id="local-type.typedef-79.7">
+          <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-79.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260611,7 +260611,7 @@ <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-77.7)</code>
+                      <code>  (typedef-79.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260685,8 +260685,8 @@ <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.1">
-          <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-77.1)</code>
+        <div class="sect2" id="local-type.typedef-79.1">
+          <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-79.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260706,7 +260706,7 @@ <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-77.1)</code>
+                      <code>  (typedef-79.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260766,8 +260766,8 @@ <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.3">
-          <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-77.3)</code>
+        <div class="sect2" id="local-type.typedef-79.3">
+          <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-79.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260787,7 +260787,7 @@ <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-77.3)</code>
+                      <code>  (typedef-79.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260929,8 +260929,8 @@ <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.4">
-          <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-77.4)</code>
+        <div class="sect2" id="local-type.typedef-79.4">
+          <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-79.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260950,7 +260950,7 @@ <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-77.4)</code>
+                      <code>  (typedef-79.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261224,8 +261224,8 @@ <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.5">
-          <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-77.5)</code>
+        <div class="sect2" id="local-type.typedef-79.5">
+          <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-79.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261245,7 +261245,7 @@ <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
                       <br/>
                       <code>  /AccessControl #complexType</code>
                       <br/>
-                      <code>  (typedef-77.5)</code>
+                      <code>  (typedef-79.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261369,8 +261369,8 @@ <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.6">
-          <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-77.6)</code>
+        <div class="sect2" id="local-type.typedef-79.6">
+          <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-79.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261390,7 +261390,7 @@ <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-77.6)</code>
+                      <code>  (typedef-79.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261450,8 +261450,8 @@ <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-39.1">
-          <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-39.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261471,7 +261471,7 @@ <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-39.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261539,8 +261539,8 @@ <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.2">
-          <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-68.2)</code>
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261560,7 +261560,7 @@ <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-68.2)</code>
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261645,8 +261645,8 @@ <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.1">
-          <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typedef-68.1)</code>
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261666,7 +261666,7 @@ <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-68.1)</code>
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261751,8 +261751,8 @@ <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.8">
-          <h3>50.47. The complex type <code>complexType[siri:VehicleMonitoringServicePermissionStructure]/VehicleMonitoringPermissions#complexType (typedef-77.8)</code>
+        <div class="sect2" id="local-type.typedef-79.8">
+          <h3>50.47. The complex type <code>complexType[siri:VehicleMonitoringServicePermissionStructure]/VehicleMonitoringPermissions#complexType (typedef-79.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261772,7 +261772,7 @@ <h3>50.47. The complex type <code>complexType[siri:VehicleMonitoringServicePermi
                       <br/>
                       <code>  /VehicleMonitoringPermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-77.8)</code>
+                      <code>  (typedef-79.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261955,7 +261955,7 @@ <h3>51.1. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -261986,7 +261986,7 @@ <h3>51.1. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-40.2" title="local-type: typedef-40.2">local-type: typedef-40.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-3.2" title="local-type: typedef-3.2">local-type: typedef-3.2</a>
                       </em>
                     </p>
                   </td>
@@ -262372,7 +262372,7 @@ <h3>51.1. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.4" title="local-type: typedef-85.4">local-type: typedef-85.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -262554,8 +262554,8 @@ <h3>51.1. The toplevel element <code>siri:Siri</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.1">
-          <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-80.1)</code>
+        <div class="sect2" id="local-type.typedef-81.1">
+          <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-81.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -262575,7 +262575,7 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-80.1)</
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-80.1)</code>
+                      <code>  (typedef-81.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -262653,7 +262653,7 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-80.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -262684,7 +262684,7 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-80.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-40.2" title="local-type: typedef-40.2">local-type: typedef-40.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-3.2" title="local-type: typedef-3.2">local-type: typedef-3.2</a>
                       </em>
                     </p>
                   </td>
@@ -263070,7 +263070,7 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-80.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.4" title="local-type: typedef-85.4">local-type: typedef-85.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -263252,8 +263252,8 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-80.1)</
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.2">
-          <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-85.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -263273,7 +263273,7 @@ <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -263507,8 +263507,8 @@ <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.2">
-          <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-40.2)</code>
+        <div class="sect2" id="local-type.typedef-3.2">
+          <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-3.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -263528,7 +263528,7 @@ <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-40.2)</code>
+                      <code>  (typedef-3.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -263836,8 +263836,8 @@ <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.4">
-          <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-85.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -263857,7 +263857,7 @@ <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -264101,7 +264101,7 @@ <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-44.1" title="local-type: typedef-44.1">local-type: typedef-44.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -264162,8 +264162,8 @@ <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-44.1">
-          <h3>51.6. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-44.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>51.6. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -264183,7 +264183,7 @@ <h3>51.6. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-44.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">