diff --git a/doc.zih.tu-dresden.de/docs/software/papi.md b/doc.zih.tu-dresden.de/docs/software/papi.md
index 2de80b4e8a0f420a6b42cd01a3de027b5fb89be2..7460e3deef48bdf991e1b6fda36332cf0fc149b0 100644
--- a/doc.zih.tu-dresden.de/docs/software/papi.md
+++ b/doc.zih.tu-dresden.de/docs/software/papi.md
@@ -105,13 +105,14 @@ multiple events, please check which events can be measured concurrently using th
     The PAPI tools must be run on the compute node, using an interactive shell or job.
 
 !!! example "Example: Determine the events on the partition `romeo` from a login node"
+    Let us assume, that you are in project `p_marie`. Then, use the following commands:
 
     ```console
     marie@login$ module load PAPI
-    marie@login$ salloc -A <project> --partition=romeo
+    marie@login$ salloc --account=p_marie --partition=romeo
     [...]
-    marie@login$ srun papi_avail
-    marie@login$ srun papi_native_avail
+    marie@compute$ srun papi_avail
+    marie@compute$ srun papi_native_avail
     [...]
     # Exit with Ctrl+D
     ```
@@ -120,12 +121,13 @@ Instrument your application with either the high-level or low-level API. Load th
 compile your application against the  PAPI library.
 
 !!! example
+    Assuming that you are in project `p_marie`, use the following commands:
 
     ```console
     marie@login$ module load PAPI
     marie@login$ gcc app.c -o app -lpapi
-    marie@login$ salloc -A <project> --partition=romeo
-    marie@login$ srun ./app
+    marie@login$ salloc --account=p_marie --partition=romeo
+    marie@compute$ srun ./app
     [...]
     # Exit with Ctrl+D
     ```
diff --git a/doc.zih.tu-dresden.de/util/check-templated-code-snippets.py b/doc.zih.tu-dresden.de/util/check-templated-code-snippets.py
index 14470ed787f86c9267460aef53e590c8afd93336..51829691c01c3b214adb784e6fd5b033391e0e40 100755
--- a/doc.zih.tu-dresden.de/util/check-templated-code-snippets.py
+++ b/doc.zih.tu-dresden.de/util/check-templated-code-snippets.py
@@ -12,7 +12,8 @@ lines = []
 NORMAL_MODE = 0
 CODE_MODE = 1
 readMode = NORMAL_MODE
-pattern = re.compile(r"<[^<>']*>")
+#We need to avoid matches for "#include <iostream>", "<Ctrl+D>", "<-" (typically in R) and "<594>" (VampirServer)
+pattern = re.compile(r"(?<!#include )<(?!Ctrl\+)[^0-9 -][^<>']*>")
 with open(fileName) as f:
     lineNumber = 1
     for line in f: