fix issue with the news page

This commit is contained in:
2026-01-07 16:08:38 +01:00
parent 280d4a76a0
commit 58b44f51b9
2 changed files with 9 additions and 7 deletions

View File

@@ -1,12 +1,14 @@
# Merlin 6 Cluster
# 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.
## Slurm clusters
* The new Slurm CPU cluster is called **`merlin6`**.
* The new Slurm GPU cluster is called [**`gmerlin6`**](../gmerlin6/cluster-introduction.md)
* The old Slurm *merlin* cluster is still active and best effort support is provided.
The cluster, was renamed as [**merlin5**](../merlin5/cluster-introduction.md).
Comprised the **`merlin6`** CPU cluster and the
[**`gmerlin6`**](../gmerlin6/cluster-introduction.md) GPU cluster. A legacy
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.

View File

@@ -124,7 +124,7 @@ nav:
- merlin7/99-support/migration-from-merlin6.md
- merlin7/99-support/contact.md
- Merlin 6:
- merlin6/index.md
- merlin6/introduction.md
- merlin6/hardware-and-software-description.md
- merlin6/slurm-configuration.md
- Quick Start Guide: