Clean Merlin6 docs

docs/gmerlin6/cluster-introduction.md

@@ -4,23 +4,23 @@
 
 ### Introduction
 
-Merlin6 is a the official PSI Local HPC cluster for development and
-mission-critical applications that has been built in 2019. It replaces
+Merlin6 was a the official PSI Local HPC cluster for development and
+mission-critical applications that has been built in 2019. It replaced
 the Merlin5 cluster.
 
-Merlin6 is designed to be extensible, so is technically possible to add
+Merlin6 was designed to be extensible, so was technically possible to add
 more compute nodes and cluster storage without significant increase of
 the costs of the manpower and the operations.
 
-Merlin6 is mostly based on **CPU** resources, but also contains a small amount
+Merlin6 was mostly based on **CPU** resources, but also contained a small amount
 of **GPU**-based resources which are mostly used by the BIO experiments.
 
 ### Slurm 'gmerlin6'
 
-THe **GPU nodes** have a dedicated **Slurm** cluster, called **`gmerli6`**.
+THe **GPU nodes** have a dedicated **Slurm** cluster, called **`gmerlin6`**.
 
 This cluster contains the same shared storage resources (`/data/user`, `/data/project`, `/shared-scracth`, `/afs`, `/psi/home`)
-which are present in the other Merlin Slurm clusters (`merlin5`,`merlin6`). The Slurm `gmerlin6` cluster is maintainted
+which are present in the Merlin6 Slurm CPU cluster. The Slurm `gmerlin6` cluster is maintainted
 independently to ease access for the users and keep independent user accounting.
 
 ## Merlin6 Architecture
@@ -31,8 +31,8 @@ The following image shows the Merlin6 cluster architecture diagram:
 
 ![Merlin6 Architecture Diagram](../images/merlinschema3.png)
 
-### Merlin5 + Merlin6 Slurm Cluster Architecture Design
+### Merlin6 Slurm Cluster Architecture Design
 
-The following image shows the Slurm architecture design for the Merlin5 & Merlin6 clusters:
+The following image shows the Slurm architecture design for the Merlin6 clusters:
 
 ![Merlin6 Slurm Architecture Design](../images/merlin-slurm-architecture.png)

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

@@ -10,7 +10,7 @@ Hence, due to this, the Merlin6 GPU computing cluster has a non homogeneus solut
 
 On 2018, for the common good, BIO decided to open the cluster to the Merlin users and make it widely accessible for the PSI scientists.
 
-The below table summarizes the hardware setup for the Merlin6 GPU computing nodes:
+The below table summarizes the hardware setup for the old Merlin6 GPU computing nodes:
 
 <table>
   <thead>
@@ -110,6 +110,10 @@ The below table summarizes the hardware setup for the Merlin6 GPU computing node
   </tbody>
 </table>
 
+### Gwendolen
+
+Currently only Gwendolen is available on `gmerlin6`.
+
 ### Login Nodes
 
 The login nodes are part of the **[Merlin6](../merlin6/introduction.md)** HPC cluster,