From 146148541375e5a2273126e12db02f29647429cd Mon Sep 17 00:00:00 2001
From: aschemmel-git <alexander.schemmel@bmw.de>
Date: Fri, 20 Feb 2026 11:23:51 +0100
Subject: [PATCH] Add deviations to Safety Plan Templates

Refers: #556
---
 .../docs/safety_mgt/module_safety_plan.rst    | 14 +++++++
 .../platform/safety_planning/index.rst        | 39 ++++++++++++++++---
 2 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/process/folder_templates/modules/module_name/docs/safety_mgt/module_safety_plan.rst b/process/folder_templates/modules/module_name/docs/safety_mgt/module_safety_plan.rst
index 3b82a877db..9e0ae29001 100644
--- a/process/folder_templates/modules/module_name/docs/safety_mgt/module_safety_plan.rst
+++ b/process/folder_templates/modules/module_name/docs/safety_mgt/module_safety_plan.rst
@@ -33,6 +33,8 @@ Module Safety Plan
     - Adjust ``status`` to be ``valid``
     - Adjust ``safety`` and ``tags`` according to your needs
 
+:note: The module safety plan shall be continuously maintained during the project.
+       Deviations to the module safety plan should be documented :ref:`here <module_name_safety_package_deviations>`
 
 Functional Safety Management Context
 ====================================
@@ -321,3 +323,15 @@ Component Architecture Status
    :columns: id;status;tags
    :colwidths: 25,25,25
    :sort: title
+
+.. _module_name_safety_package_deviations:
+
+Deviations from Module Safety Plan
+----------------------------------
+
+The following deviations from the module safety plan are present in the module safety package.
+These are deviations from planned processes execution and/or workproduct results,
+safety anomalies in the sense of known bugs in the software are reported in the release notes.
+
+<Describe here the deviations, whether they have an impact on module's safety functions,
+how these can be mitigated or argued and if and when a resolution is planned.>
diff --git a/process/folder_templates/platform/safety_planning/index.rst b/process/folder_templates/platform/safety_planning/index.rst
index f00f27e757..eaa69580ec 100644
--- a/process/folder_templates/platform/safety_planning/index.rst
+++ b/process/folder_templates/platform/safety_planning/index.rst
@@ -32,7 +32,8 @@ Safety Planning
     - Adjust ``safety``, ``security`` and ``tags`` according to your needs
 
 
-:note: The Safety Management Plan shall be continuously maintained during the project. Deviations to the platform plan should be documented here.
+:note: The platform safety plan shall be continuously maintained during the project.
+       Deviations to the platform safety plan should be documented :ref:`here <platform_safety_package_deviations>`
 
 
 Safety management / Platform Safety Plan
@@ -147,13 +148,39 @@ Functional Safety Quality Criteria
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Description of the functional safety quality criteria.
 
-Platform Safety Plan
-++++++++++++++++++++
+Platform Safety Plan / Package
+++++++++++++++++++++++++++++++
+
+Functional Safety/Security Management SW Platform Work Products
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+List of all relevant work products for the platform project relevant for both Functional Safety and Security Management.
+Including their status (which makes it cover also the "safety package").
 
-Functional Safety Management SW Platform Work Products
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Functional Safety Specific SW Platform Work Products
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+List of all relevant work products for the platform project relevant for Functional Safety.
+Including their status (which makes it cover also the "safety package").
+
+Platform Safety Plan - Feature Work Product Lists
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-List of all relevant Functional Safety Management work products for the platform project.
+<add here the link to all the platform's features WP lists>
 
 Platform Management Plan - Documents Status Chart
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+See <add here the section reference to the documentation management plan>
+
+.. _platform_safety_package_deviations:
+
+Deviations from Platform Safety Plan
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The following deviations from the platform safety plan are present in the platform safety package.
+These are deviations from planned processes execution and/or workproduct results,
+safety anomalies in the sense of known bugs in the software are reported in the release notes (of the platform's modules).
+
+<Describe here the deviations, whether they have an impact on platform safety functions,
+how these can be mitigated or argued and if and when a resolution is planned.>