Merge branch 'main' into release-v0.4

Author: lu-kas

README.md

@@ -50,6 +50,18 @@ In all data subfolders, FDS input files as well as a run script `case_run.sh` is
 
 The `case_download.sh` script inside the individual data subfolders can be used to download precomputed data.
 
+## Contribution
+
+### For external
+
+Please for the `development` branch and create a pull request based on that.
+
+### For internal
+
+**New section / content**: Create a feature branch of `development`. Once finished, merge it back and create a release branch with your changes that have to be pushed to `main`. Assign Lukas as reviewer for the pull request.
+
+**Typos / Fixes**: Push them directly to the `development` branch and then directly to `main`.
+
 ## License
 
 This work is licensed under a
@@ -59,4 +71,4 @@ This work is licensed under a
 
 [cc-by-sa]: http://creativecommons.org/licenses/by-sa/4.0/
 [cc-by-sa-image]: https://licensebuttons.net/l/by-sa/4.0/88x31.png
-[cc-by-sa-shield]: https://img.shields.io/badge/License-CC%20BY--SA%204.0-lightgrey.svg
+[cc-by-sa-shield]: https://img.shields.io/badge/License-CC%20BY--SA%204.0-lightgrey.svg

book/_toc.yml

@@ -56,4 +56,5 @@
 
     - file: content/tools/03_analysis/00_overview
       sections:
-        - file: content/tools/03_analysis/01_python
+        - file: content/tools/03_analysis/01_python
+

book/content/modelling/01_general/02_fse.md

@@ -32,7 +32,7 @@ In a prescriptive design, fire safety measures are carried out based on general
 
 However, this design approach has also some flows, like
 
-* descriptive designs are prone for individuality and complexicity
+* descriptive designs are prone for individuality and complexity
 * the application of *deemed-to-satisfy* strategies can be inappropriate, uneconomic or even impossible
 * under certain circumstances nonconformities to applicable regulations and standards are unavoidable
 * restrictions for international harmonisation and standardisation
@@ -43,7 +43,7 @@ An alternative to prescriptive designs is the application of performance based d
 
 **General Approach**
 
-In contrast to the static and general rules of a regulation, the performance based design follows the idea to create an equivalent level of safety by satisfying protection goals. This process allows the engineers to use multiple approaches, which do also include fire simulations, to iteratively design a safety concept. A scematic flow diagram is shown in {numref}`fig-performance-based-design`.
+In contrast to the static and general rules of a regulation, the performance based design follows the idea to create an equivalent level of safety by satisfying protection goals. This process allows the engineers to use multiple approaches, which do also include fire simulations, to iteratively design a safety concept. A schematic flow diagram is shown in {numref}`fig-performance-based-design`.
 
 :::{figure-md} fig-performance-based-design