IHE · ToddCooper · Jun 13, 2025 · Apr 11, 2025 · Jun 11, 2025 · Jun 11, 2025
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@ Each section shall contain a list of action items of the following format: `<bri
 
 ### Changes
 - Changed all references to IHE PCD TF 2019 to the newer 2024 version. Updated sections in document which were affected by the TF version change ([#340](https://github.com/IHE/DEV.SDPi/issues/340))
+- Removed transaction DEV-34 (Announce Network Departure) and updated references to future SDPi versions for maintainability ([#406](https://github.com/IHE/DEV.SDPi/issues/406))
 
 ## [2.1.2] - 2025-05-09
 
@@ -41,11 +42,11 @@ Each section shall contain a list of action items of the following format: `<bri
 - Updated SDPi Issue Management section ([#408](https://github.com/IHE/DEV.SDPi/issues/408))
 - Rephrased paragraph describing the SOMDS Smart App Platform Actor for clarity ([#379](https://github.com/IHE/DEV.SDPi/issues/379))
 - Modified transaction DEV-29 to add DescriptionModification and EpisodicOperationalState reports ([#403](https://github.com/IHE/DEV.SDPi/issues/403))
-- 
+
 ### Editorial Fixes
 - Corrected typos and grammar ([#363](https://github.com/IHE/DEV.SDPi/issues/363))
 - Changed order of subsections in 1:11.1, 1:12.1 and 1:13.1 ([365](https://github.com/IHE/DEV.SDPi/issues/365))
-- 
+
 ### Added
 - Content on how to deal with non-slewing time adjustments ([#203](https://github.com/IHE/DEV.SDPi/issues/203))
 - TF-2C for Security Management Appendix (basic, with little initial content)  ([#250](https://github.com/IHE/DEV.SDPi/issues/250))

diff --git a/asciidoc/plantuml/vol1-figure-sdpi-p-example-sequence-diagram.puml b/asciidoc/plantuml/vol1-figure-sdpi-p-example-sequence-diagram.puml
@@ -1,6 +1,6 @@
 @startuml
 
-!include plantuml/common_style.inc.puml
+!include ../plantuml/common_style.inc.puml
 
 !global $str_sdpi_p_somds_prov = "SOMDS Provider"
 !global $str_sdpi_p_somds_cons = "SOMDS Consumer"
@@ -41,9 +41,6 @@ group secured
     sdpi_somds_provider -->> sdpi_somds_consumer
 end
 
-group unsecured
-    sdpi_somds_provider ->> sdpi_somds_consumer: Announce Network Departure
-end
 |||
 
 @enduml
diff --git a/asciidoc/volume0/tf0-ch-b-transactions.adoc b/asciidoc/volume0/tf0-ch-b-transactions.adoc
@@ -82,11 +82,13 @@ include::../volume2/dev-30/tf2-dev-30-summary.adoc[]
 | Deferred to a future version of SDPi
 // include::../volume2/dev-33/tf2-dev-33-summary.adoc[]
 
-.^| [[vol0_transaction_summary_dev_34,DEV-34 Announce Network Departure]]
-[[transaction_number_dev_34,DEV-34]] DEV-34
-| [[transaction_name_announce_network_departure,Announce Network Departure]] Announce Network Departure
-|
-include::../volume2/dev-34/tf2-dev-34-summary.adoc[]
+//.^| [[vol0_transaction_summary_dev_34,DEV-34 Announce Network Departure]]
+//[[transaction_number_dev_34,DEV-34]] DEV-34
+//| [[transaction_name_announce_network_departure,Announce Network Departure]] Announce Network Departure
+//|
+//include::../volume2/dev-34/tf2-dev-34-summary.adoc[]
+.^| DEV-34 | _Reserved_ |
+//include::../volume2/dev-34/tf2-dev-34-summary.adoc[]
 .^| [[vol0_transaction_summary_dev_35,DEV-35 Establish Medical Data Exchange]]
 [[transaction_number_dev_35,DEV-35]] DEV-35
 | [[transaction_name_establish_medical_data_exchange,Establish Medical Data Exchange]] Establish Medical Data Exchange

diff --git a/asciidoc/volume1/tf1-ch-10-sdpi-p.adoc b/asciidoc/volume1/tf1-ch-10-sdpi-p.adoc
@@ -69,7 +69,7 @@ Note that “Consumer” is indicated for actors that receive but do not directl
 | ...
 | ...
 
-.13+| <<vol1_spec_sdpi_p_actor_somds_provider>>
+.12+| <<vol1_spec_sdpi_p_actor_somds_provider>>
 .^| <<transaction_name_announce_network_presence>>
 .^| Initiator
 .^| R
@@ -132,17 +132,17 @@ Note that “Consumer” is indicated for actors that receive but do not directl
 // <<vol2_clause_dev_33>>
 
 
-| <<transaction_name_announce_network_departure>>
-| Initiator
-| R
-| <<vol2_clause_dev_34>>
+//| <<transaction_name_announce_network_departure>>
+//| Initiator
+//| R
+//| <<vol2_clause_dev_34>>
 
 .^| <<transaction_name_update_network_presence>>
 .^| Initiator
 .^| O   ^(See^ ^Note^ ^2)^
 | <<vol2_clause_dev_46>>
 
-.13+| <<vol1_spec_sdpi_p_actor_somds_consumer>>
+.12+| <<vol1_spec_sdpi_p_actor_somds_consumer>>
 .^| <<transaction_name_announce_network_presence>>
 .^| _Receiver_  ^(See^ ^Note^ ^3)^
 .^| O
@@ -206,10 +206,10 @@ Note that “Consumer” is indicated for actors that receive but do not directl
 // <<vol2_clause_dev_33>>
 
 
-| <<transaction_name_announce_network_departure>>
-| _Receiver_  ^(See^ ^Note^ ^3)^
-| O
-| <<vol2_clause_dev_34>>
+//| <<transaction_name_announce_network_departure>>
+//| _Receiver_  ^(See^ ^Note^ ^3)^
+//| O
+//| <<vol2_clause_dev_34>>
 
 | <<transaction_name_retrieve_network_presence>>
 | Initiator
@@ -642,7 +642,7 @@ notes.
 ==== Managed Discovery Option
 [#vol1_spec_sdpi_p_option_discovery_proxy, reftext='Managed Discovery Option']
 
-The Discovery Proxy profile option provides an alternative means for <<vol1_spec_sdpi_p_actor_somds_consumer>> Actors to discover the <<vol1_spec_sdpi_p_actor_somds_provider>> Actors that are present on the network.  The default "ad hoc" approach using the <<vol2_clause_dev_23>>, <<vol2_clause_dev_24>> and <<vol2_clause_dev_34>> transactions, requires use of unsecured multicast messaging; however, some deployments do not support or allow this mode of discovery.
+The Discovery Proxy profile option provides an alternative means for <<vol1_spec_sdpi_p_actor_somds_consumer>> Actors to discover the <<vol1_spec_sdpi_p_actor_somds_provider>> Actors that are present on the network.  The default "ad hoc" approach using the <<vol2_clause_dev_23>> and <<vol2_clause_dev_24>> transactions, requires use of unsecured multicast messaging; however, some deployments do not support or allow this mode of discovery.
 The addition of a <<vol1_spec_sdpi_p_actor_discovery_proxy>> Actor enables a secure and non-multicast means for managing system discovery across the network.
 The <<vol1_spec_sdpi_p_actor_discovery_proxy>> Actor acts as a man-in-the-middle system, with <<vol1_spec_sdpi_p_actor_somds_provider>> Actors using the <<vol2_clause_dev_46>> transaction to provide endpoint metatdata and update their network presence or absence status.
 <<vol1_spec_sdpi_p_actor_somds_consumer>> Actors may then use the <<vol2_clause_dev_47>> transaction to determine available <<vol1_spec_sdpi_p_actor_somds_consumer>> systems and their endpoint metadata.
@@ -681,7 +681,7 @@ When the <<vol1_spec_sdpi_p_option_discovery_proxy>> is enabled for a <<vol1_spe
 
 NOTE:  When retrieving network presence metadata from a <<vol1_spec_sdpi_p_actor_discovery_proxy>> Actor, a <<term_discovery_scope>> may be specified as a filter to identify a specific subset of <<vol1_spec_sdpi_p_actor_somds_provider>> systems.
 
-NOTE:  A <<vol1_spec_sdpi_p_actor_somds_consumer>> may optionally use the <<vol2_clause_dev_47>> transaction to subscribe to all metadata updates from a set of <<vol1_spec_sdpi_p_actor_somds_consumer>> systems, essentially using the <<vol1_spec_sdpi_p_actor_discovery_proxy>> Actor as a pass through for <<vol1_spec_sdpi_p_actor_somds_provider>> <<vol2_clause_dev_23>> and <<vol2_clause_dev_34>> transactions.
+NOTE:  A <<vol1_spec_sdpi_p_actor_somds_consumer>> may optionally use the <<vol2_clause_dev_47>> transaction to subscribe to all metadata updates from a set of <<vol1_spec_sdpi_p_actor_somds_consumer>> systems, essentially using the <<vol1_spec_sdpi_p_actor_discovery_proxy>> Actor as a pass through for <<vol1_spec_sdpi_p_actor_somds_provider>> <<vol2_clause_dev_23>> transactions.
 ****
 
 .R1024

diff --git a/asciidoc/volume2/dev-34/tf2-ch-a-mdpws-dev-34.adoc b/asciidoc/volume2/dev-34/tf2-ch-a-mdpws-dev-34.adoc
@@ -2,8 +2,17 @@
 :var_uri_dpws_discovery: http://docs.oasis-open.org/ws-dd/dpws/1.1/os/wsdd-dpws-1.1-spec-os.html#_Toc228672091
 
 [#vol2_clause_appendix_mdpws_dev_34]
-==== MDPWS: Announce Network Departure [DEV-34]
+//==== MDPWS: Announce Network Departure [DEV-34]
+==== MDPWS: _Reserved_ [DEV-34]
 
+[%noheader]
+[%autowidth]
+[cols="1"]
+|===
+a| *{supplement_note}*: The former transaction Announce Network Departure [{var_transaction_id}] was withdrawn in SDPi 2.2. Therefore, it is marked as _Reserved_.
+|===
+
+////
 This section specifies the MDPWS data transmission for messages defined in <<vol2_clause_dev_34>>.
 
 ===== {var_label_dev_34_message_bye} Message
@@ -33,4 +42,5 @@ include::../dev-a-default-trigger-events.adoc[]
 `s12:Envelope/s12:Body/wsd:Bye/wsa:EndpointReference/wsa:Address`:: The <<vol1_spec_sdpi_p_actor_somds_provider>>'s <<payload_dev_34_provider_uid>> as URI.
 
 :var_expected_actions_ref: <<vol2_clause_dev_34_message_bye>>
-include::../dev-a-default-expected-actions.adoc[]
+include::../dev-a-default-expected-actions.adoc[]
+////
diff --git a/asciidoc/volume2/dev-34/tf2-dev-34.adoc b/asciidoc/volume2/dev-34/tf2-dev-34.adoc
@@ -5,8 +5,16 @@
 
 //reset|+1|off
 [#vol2_clause_dev_34,sdpi_offset=34]
-=== Announce Network Departure [{var_transaction_id}]
+//=== Announce Network Departure [{var_transaction_id}]
+=== _Reserved_ [{var_transaction_id}]
 
+[%noheader]
+[%autowidth]
+[cols="1"]
+|===
+a| *{supplement_note}*: The former transaction Announce Network Departure [{var_transaction_id}] was withdrawn in SDPi 2.2. Therefore, it is marked as _Reserved_.
+|===
+////
 ==== Scope
 
 include::tf2-dev-34-summary.adoc[]
@@ -64,3 +72,4 @@ When a <<vol1_spec_sdpi_p_actor_somds_provider>> sends this message, there is no
 
 [#vol2_clause_dev_34_message_announce_network_departure_ses]
 include::../dev-x-default-ses-unsecured-mode.adoc[]
+////
diff --git a/asciidoc/volume3/tf3-ch-8.7.1-infusion-pump.adoc b/asciidoc/volume3/tf3-ch-8.7.1-infusion-pump.adoc
@@ -22,7 +22,7 @@
 [%autowidth]
 [cols="1"]
 |===
-a| *{supplement_note}*:  Content for this section will be extended in SDPi 1.x and subsequent versions.
+a| *{supplement_note}*:  Content for this section will be extended in a future version of SDPi.
 The initial content will reflect what is provided in SDPi {ihe_supplement_sdpi_revision_short} <<vol3_clause_device_physiological_monitor>>.
 |===
 

diff --git a/asciidoc/volume3/tf3-ch-8.7.2-ventilator.adoc b/asciidoc/volume3/tf3-ch-8.7.2-ventilator.adoc
@@ -19,6 +19,6 @@
 [%autowidth]
 [cols="1"]
 |===
-a| *{supplement_note}*:  Content for this section will be extended in SDPi 1.x and subsequent versions.
+a| *{supplement_note}*:  Content for this section will be extended in a future version of SDPi.
 The initial content will reflect what is provided in SDPi {ihe_supplement_sdpi_revision_short} <<vol3_clause_device_physiological_monitor>>.
 |===
diff --git a/asciidoc/volume3/tf3-ch-8.7.4-surgical.adoc b/asciidoc/volume3/tf3-ch-8.7.4-surgical.adoc
@@ -21,6 +21,6 @@
 [%autowidth]
 [cols="1"]
 |===
-a| *{supplement_note}*:  Content for this section will be extended in SDPi 1.x and subsequent versions.
+a| *{supplement_note}*:  Content for this section will be extended in a future version of SDPi.
 The initial content will reflect what is provided in SDPi {ihe_supplement_sdpi_revision_short} <<vol3_clause_device_physiological_monitor>>.
 |===