From 58b44f51b958144eb76baa78b3df4c33e5758670 Mon Sep 17 00:00:00 2001 From: Hans-Nikolai Viessmann Date: Wed, 7 Jan 2026 16:08:38 +0100 Subject: [PATCH] fix issue with the news page --- docs/merlin6/{index.md => introduction.md} | 14 ++++++++------ mkdocs.yml | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) rename docs/merlin6/{index.md => introduction.md} (62%) diff --git a/docs/merlin6/index.md b/docs/merlin6/introduction.md similarity index 62% rename from docs/merlin6/index.md rename to docs/merlin6/introduction.md index 560a5db..bc5f91d 100644 --- a/docs/merlin6/index.md +++ b/docs/merlin6/introduction.md @@ -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. diff --git a/mkdocs.yml b/mkdocs.yml index 9473153..4cb712f 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -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: