From 6812bb6badaa82e7f8ccb72c69f9365d66a65685 Mon Sep 17 00:00:00 2001 From: Hans-Nikolai Viessmann Date: Fri, 23 Jan 2026 15:25:23 +0100 Subject: [PATCH] improve some admonishment titles --- docs/merlin6/introduction.md | 14 ++++++++------ docs/merlin7/02-How-To-Use-Merlin/merlin_tools.md | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/docs/merlin6/introduction.md b/docs/merlin6/introduction.md index 06342d0..0bddc18 100644 --- 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. diff --git a/docs/merlin7/02-How-To-Use-Merlin/merlin_tools.md b/docs/merlin7/02-How-To-Use-Merlin/merlin_tools.md index 8b5fc05..8176a33 100644 --- 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,7 @@ 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 +!!! tip "Updating the project config" If you are added/removed from a project, you can update this config file by calling `merlin_quotas genconf --all-projects --force`. The `--all-projects` will fully check your possible membership to all projects,