improve some admonishment titles

improve merlin_quotas docu
Update RSM step2 image
2026-01-23 15:25:23 +01:00 · 2026-01-23 15:22:04 +01:00 · 2026-01-15 16:43:38 +01:00 · 2026-01-12 17:51:34 +01:00 · 2026-01-12 17:51:15 +01:00 · 2026-01-12 17:49:48 +01:00
4 changed files with 15 additions and 10 deletions
--- a/docs/images/ANSYS/merlin7/rsm-2-add_cluster.png
+++ b/docs/images/ANSYS/merlin7/rsm-2-add_cluster.png
--- a/docs/merlin6/introduction.md
+++ b/docs/merlin6/introduction.md
@@ -1,7 +1,8 @@
 # Introduction

-!!! note
-    Merlin6 is no longer accessible for new users! Please have a look at [Merlin 7](../merlin7/01-Quick-Start-Guide/introduction.md) instead.
+!!! failure "Deprecated"
+    Merlin6 is no longer accessible for new users! Please have a look at
+    [Merlin 7](../merlin7/01-Quick-Start-Guide/introduction.md) instead.

 ## Slurm clusters

@@ -10,7 +11,8 @@ Comprised the **`merlin6`** CPU cluster and the
 cluster (formally called [**`merlin5`**](../merlin5/cluster-introduction.md) is
 kept active with best effort support.

-From July 2019, **`merlin6`** becomes the **default Slurm cluster** and any job submitted from the login node will be submitted to that cluster if not.
+From July 2019, **`merlin6`** becomes the **default Slurm cluster** and any job
+submitted from the login node will be submitted to that cluster if not.

 * Users can keep submitting to the old *`merlin5`* computing nodes by using the option ``--cluster=merlin5``.
 * Users submitting to the **`gmerlin6`** GPU cluster need to specify the option ``--cluster=gmerlin6``.
@@ -18,6 +20,6 @@ From July 2019, **`merlin6`** becomes the **default Slurm cluster** and any job
 ### Slurm 'merlin6'

 **CPU nodes** are configured in a **Slurm** cluster, called **`merlin6`**, and
-this is the ***default Slurm cluster***. Hence, by default, if no Slurm cluster is
-specified (with the `--cluster` option), this will be the cluster to which the jobs
-will be sent.
+this is the ***default Slurm cluster***. Hence, by default, if no Slurm cluster
+is specified (with the `--cluster` option), this will be the cluster to which
+the jobs will be sent.
--- a/docs/merlin7/02-How-To-Use-Merlin/merlin_tools.md
+++ b/docs/merlin7/02-How-To-Use-Merlin/merlin_tools.md
@@ -93,7 +93,10 @@ be tracked. In theory any (or all available projects) can be tracked, but due to
 UNIX and Lustre permissions, accessing quotas information for a project you're not
 a member of **is not possible**.

+!!! tip "Updating the project config"
    If you are added/removed from a project, you can update this config file by
-calling `merlin_quotas genconf --force` (notice the `--force`, which will overwrite
-your existing config file) or by editing the file by hand (*not recommended*).
+    calling `merlin_quotas genconf --all-projects --force`. The
+    `--all-projects` will fully check your possible membership to all projects,
+    and the `--force` will overwrite your existing config file. You can also
+    edit the file by hand (*not recommended*).

--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -6,7 +6,7 @@ site_url: https://hpce.pages.psi.ch
 repo_name: "User Documentation Repository"
 repo_url: https://gitea.psi.ch/hpce/gitea-pages
 # TODO unsure if this works, branch needs to be changed from `mkdocs` to `main`
-edit_uri: _edit/mkdocs/docs/
+edit_uri: _edit/master/docs/

 # Copyright
 copyright: Copyright &copy; 2025 HPC and Emerging Technologies Group/CSD @ Paul Scherrer Institut
Author	SHA1	Message	Date
Hans-Nikolai Viessmann	6812bb6bad	improve some admonishment titles All checks were successful Build and deploy documentation / build-and-deploy-docs (push) Successful in 25s Details	2026-01-23 15:25:23 +01:00
Hans-Nikolai Viessmann	76c2b407f3	improve merlin_quotas docu All checks were successful Build and deploy documentation / build-and-deploy-docs (push) Successful in 22s Details	2026-01-23 15:22:04 +01:00
caubet_m	b79f937149	Update RSM step2 image All checks were successful Build and deploy documentation / build-and-deploy-docs (push) Successful in 21s Details	2026-01-15 16:43:38 +01:00
viessm_h	7aba2e0851	Merge pull request 'MkDocs migration' (#17 ) from mkdocs into master All checks were successful Build and deploy documentation / build-and-deploy-docs (push) Successful in 21s Details Reviewed-on: #17	2026-01-12 17:51:34 +01:00
Hans-Nikolai Viessmann	3d3eb50d10	final changes	2026-01-12 17:51:15 +01:00
Hans-Nikolai Viessmann	266846282e	add/rm final files	2026-01-12 17:49:48 +01:00
Hans-Nikolai Viessmann	ad1735a62f	minor improvements	2026-01-12 17:49:48 +01:00
Hans-Nikolai Viessmann	7add1a6e0b	add latest new section to frontpage We use a custom override template (jinja) to generate a suitable list of new items. Also added first text for announcing our new user docs	2026-01-12 17:49:48 +01:00
Hans-Nikolai Viessmann	8c0f9e3c21	merge and move support pages this are now under the /support path, meaning that this is unified for all clusters.	2026-01-12 17:49:48 +01:00
Hans-Nikolai Viessmann	0bda3a430a	fix issue with the news page	2026-01-12 17:49:47 +01:00
Hans-Nikolai Viessmann	e7bfce70a4	minor fixes * added back the HPCE logo to landing page * activated the sticky tabs navigation feature (so navigation bar stays visible) * added edit buttons to content (so users can _maybe_ help us in keeping our docs up to date)	2026-01-12 17:49:47 +01:00
Derek Feichtinger	fb8a2ca771	update main Merlin7 page with production status, remove dead links	2026-01-12 17:49:47 +01:00
Hans-Nikolai Viessmann	7db5d0fd05	initial formatting changes complete	2026-01-12 17:49:47 +01:00
Hans-Nikolai Viessmann	f58c1f57b8	fixed all links now	2026-01-12 17:49:47 +01:00
Hans-Nikolai Viessmann	d6fffc1a82	ensure headers have permalinks usable	2026-01-12 17:49:47 +01:00
Hans-Nikolai Viessmann	bde174b726	first stab at mkdocs migration refactor CSCS and Meg content add merlin6 quick start update merlin6 nomachine docs give the userdoc its own color scheme we use the Materials default one refactored slurm general docs merlin6 add merlin6 JB docs add software support m6 docs add all files to nav vibed changes #1 add missing pages further vibing #2 vibe #3 further fixes	2026-01-12 17:49:41 +01:00