diff --git a/doc.zih.tu-dresden.de/docs/access/jupyterhub_for_teaching.md b/doc.zih.tu-dresden.de/docs/access/jupyterhub_for_teaching.md
index 89850258fe30f74f7f92d4028630d7444923ae7c..ab243e76cd0342444db9e23d49b356678a1638db 100644
--- a/doc.zih.tu-dresden.de/docs/access/jupyterhub_for_teaching.md
+++ b/doc.zih.tu-dresden.de/docs/access/jupyterhub_for_teaching.md
@@ -12,7 +12,7 @@ Please be aware of the following notes:
 - ZIH systems operate at a lower availability level than your usual Enterprise
 Cloud VM. There can always be downtimes, e.g. of the filesystems or the batch
 system.
-- Scheduled downtimes are announced by email. Please plan your courses
+- Scheduled downtimes are announced by e-mail. Please plan your courses
 accordingly.
 - Access to HPC resources is handled through projects. See your course as a
 project. Projects need to be registered beforehand (more info on the page
diff --git a/doc.zih.tu-dresden.de/docs/application/project_management.md b/doc.zih.tu-dresden.de/docs/application/project_management.md
index 1180357d44027102020d4a76f51dfb46b2571472..f0f35787749bcccce37346627ed7ac412920abec 100644
--- a/doc.zih.tu-dresden.de/docs/application/project_management.md
+++ b/doc.zih.tu-dresden.de/docs/application/project_management.md
@@ -35,7 +35,7 @@ login. For this purpose, it is possible to set a local password:
 {: align="center"}
 
 On the 'Missing Password' page, it is possible to reset the passwords of a 'non-ZIH-login'. For this
-you write your login, which usually corresponds to your email address, in the field and click on
+you write your login, which usually corresponds to your e-mail address, in the field and click on
 'reset. Within 10 minutes the system sends a signed e-mail from <hpcprojekte@zih.tu-dresden.de> to
 the registered e-mail address. this e-mail contains a link to reset the password.
 
diff --git a/doc.zih.tu-dresden.de/docs/application/project_request_form.md b/doc.zih.tu-dresden.de/docs/application/project_request_form.md
index 2eca87c72093b405362652c5d1276fc6099f21ca..abe7307709f18b48d12a35831a00ef4c8ec62187 100644
--- a/doc.zih.tu-dresden.de/docs/application/project_request_form.md
+++ b/doc.zih.tu-dresden.de/docs/application/project_request_form.md
@@ -109,7 +109,7 @@ just enter your e-mail address in the form.
 
 ![Login via E-Mail Callback][3]
 
-Click on the link in the mail.
+Click on the link in the e-mail.
 
 ![Callback Mail][4]
 
@@ -353,7 +353,7 @@ No matter which application you submit, the procedure is always identical.
 The final step is to complete the application process.
 The application is submitted to us and approved for review. Editing is no longer possible.
 
-In the next step you will receive an email with the data of the application
+In the next step you will receive an e-mail with the data of the application
 as a PDF. In it you will find a template for the confirmation of the commissioned research.
 
 ![Finalize][18]
diff --git a/doc.zih.tu-dresden.de/docs/contrib/content_rules.md b/doc.zih.tu-dresden.de/docs/contrib/content_rules.md
index 189365b7d5c898f2ce97ccabc9d0c2963e296dcd..1a325b90c7664e8dd6c15928d3d71769fdbbdcfe 100644
--- a/doc.zih.tu-dresden.de/docs/contrib/content_rules.md
+++ b/doc.zih.tu-dresden.de/docs/contrib/content_rules.md
@@ -33,7 +33,7 @@ These licenses also apply to your contributions.
 
 If you are in doubt, please contact us either via
 [GitLab Issue](https://gitlab.hrz.tu-chemnitz.de/zih/hpcsupport/hpc-compendium/-/issues)
-or via [Email](mailto:hpc-support@tu-dresden.de).
+or via [e-mail](mailto:hpc-support@tu-dresden.de).
 
 ## Quick Overview
 
@@ -326,9 +326,17 @@ highlighting. There is a complete list of supported
 #### Data Privacy and Generic Names
 
 Where possible, replace login, project name, and other private data with clearly recognizable
-placeholders. In particular, use the generic login `marie` and the project title `p_number_crunch`
-as placeholders at first. If you need a second login and a second project stick to `martin` and
-`p_long_computations`.
+placeholders. In particular, use the generic placeholders depicted in the following table.
+The table also holds a second placeholder, if, e.g., you need a second login to formulate an example.
+
+| Description | Placeholder | 2nd Placeholder |
+|---|---|
+| Username | Marie | Martin |
+| Login | `marie` | `martin` |
+| E-mail | marie@tu-dresden.de | martin@tu-dresden.de |
+| Project title | `p_number_crunch` | `p_long_computations` |
+| Workspace title | `number_crunch` | `long_computations` |
+{: summary="Generic placeholders", align="bottom"}
 
 ```console
 marie@login$ ls -l