fixed all links now

docs/gmerlin6/hardware-and-software-description.md

@@ -120,13 +120,13 @@ The below table summarizes the hardware setup for the Merlin6 GPU computing node
 
 ### Login Nodes
 
-The login nodes are part of the **[Merlin6](../merlin6/cluster-introduction.md)** HPC cluster,
+The login nodes are part of the **[Merlin6](../merlin6/index.md)** HPC cluster,
 and are used to compile and to submit jobs to the different ***Merlin Slurm clusters*** (`merlin5`,`merlin6`,`gmerlin6`,etc.).
 Please refer to the **[Merlin6 Hardware Documentation](../merlin6/hardware-and-software-description.md)** for further information.
 
 ### Storage
 
-The storage is part of the **[Merlin6](../merlin6/cluster-introduction.md)** HPC cluster,
+The storage is part of the **[Merlin6](../merlin6/index.md)** HPC cluster,
 and is mounted in all the ***Slurm clusters*** (`merlin5`,`merlin6`,`gmerlin6`,etc.).
 Please refer to the **[Merlin6 Hardware Documentation](../merlin6/hardware-and-software-description.md)** for further information.
 

docs/merlin5/cluster-introduction.md

@@ -1,30 +1,22 @@
----
-title: Cluster 'merlin5'
-#tags:
-#keywords:
-last_updated: 07 April 2021
-#summary: "Merlin 5 cluster overview"
-sidebar: merlin6_sidebar
-permalink: /merlin5/cluster-introduction.html
----
+# Merlin 5 Cluster
 
-## Slurm 'merlin5' cluster
+## Slurm cluster
 
 **Merlin5** was the old official PSI Local HPC cluster for development and
 mission-critical applications which was built in 2016-2017. It was an
-extension of the Merlin4 cluster and built from existing hardware due 
-to a lack of central investment on Local HPC Resources. **Merlin5** was 
-then replaced by the **[Merlin6](../merlin6/cluster-introduction.md)** cluster in 2019,
-with an important central investment of ~1,5M CHF. **Merlin5** was mostly 
-based on CPU resources, but also contained a small amount of GPU-based 
+extension of the Merlin4 cluster and built from existing hardware due
+to a lack of central investment on Local HPC Resources. **Merlin5** was
+then replaced by the **[Merlin6](../merlin6/index.md)** cluster in 2019,
+with an important central investment of ~1,5M CHF. **Merlin5** was mostly
+based on CPU resources, but also contained a small amount of GPU-based
 resources which were mostly used by the BIO experiments.
 
 **Merlin5** has been kept as a **Local HPC [Slurm](https://slurm.schedmd.com/overview.html) cluster**,
 called **`merlin5`**. In that way, the old CPU computing nodes are still available as extra computation resources,
 and as an extension of the official production **`merlin6`** [Slurm](https://slurm.schedmd.com/overview.html) cluster.
 
-The old Merlin5 _**login nodes**_, _**GPU nodes**_ and _**storage**_ were fully migrated to the **[Merlin6](../merlin6/index.md)** 
-cluster, which becomes the **main Local HPC Cluster**. Hence, **[Merlin6](/merlin6/index.html)**
+The old Merlin5 _**login nodes**_, _**GPU nodes**_ and _**storage**_ were fully migrated to the **[Merlin6](../merlin6/index.md)**
+cluster, which becomes the **main Local HPC Cluster**. Hence, **[Merlin6](../merlin6/index.md)**
 contains the storage which is mounted on the different Merlin HPC [Slurm](https://slurm.schedmd.com/overview.html) Clusters (`merlin5`, `merlin6`, `gmerlin6`).
 
 ### Submitting jobs to 'merlin5'

docs/merlin6/index.md

@@ -1,16 +1,8 @@
----
-title: Introduction
-#tags:
-#keywords:
-last_updated: 28 June 2019
-#summary: "Merlin 6 cluster overview"
-sidebar: merlin6_sidebar
-permalink: /merlin6/cluster-introduction.html
----
+# Merlin 6 Cluster
 
 ## Slurm clusters
 
-* The new Slurm CPU cluster is called [**`merlin6`**](cluster-introduction.md).
+* 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).

docs/news/posts/launching-merlin6-docs.md

@@ -7,6 +7,6 @@ tags:
 
 # Merlin 6 documentation available
 
-Merlin 6 docs are now available at [Merlin6 docs](../../merlin6/cluster-introduction.md)!
+Merlin 6 docs are now available at [Merlin6 docs](../../merlin6/index.md)!
 
 More complete documentation will be coming shortly.

mkdocs.yml

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