From 173759bbf0fff6e89cb796a444a4bc08d202e8dc Mon Sep 17 00:00:00 2001
From: caubet_m <marc.caubet@psi.ch>
Date: Wed, 19 May 2021 14:44:30 +0200
Subject: [PATCH] Added XQuartz in MacOS recipe

---
 _data/sidebars/merlin6_sidebar.yml            | 46 +++++++++----------
 .../connect-from-macos.md                     | 12 ++++-
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/_data/sidebars/merlin6_sidebar.yml b/_data/sidebars/merlin6_sidebar.yml
index d724d24..d065a63 100644
--- a/_data/sidebars/merlin6_sidebar.yml
+++ b/_data/sidebars/merlin6_sidebar.yml
@@ -15,25 +15,7 @@ entries:
       url: /merlin6/request-account.html
     - title: Requesting Projects
       url: /merlin6/request-project.html
-  - title: Slurm CPU 'merlin5'
-    folderitems:
-    - title: Introduction
-      url: /merlin5/introduction.html
-    - title: Hardware And Software Description
-      url: /merlin5/hardware-and-software.html
-  - title: Slurm CPU 'merlin6'
-    folderitems:
-    - title: Introduction
-      url: /merlin6/introduction.html
-    - title: Hardware And Software Description
-      url: /merlin6/hardware-and-software.html
-  - title: Slurm GPU 'gmerlin6'
-    folderitems:
-    - title: Introduction
-      url: /gmerlin6/introduction.html
-    - title: Hardware And Software Description
-      url: /gmerlin6/hardware-and-software.html
-  - title: Accessing Merlin
+  - title: How To Use Merlin
     folderitems:
     - title: Accessing Interactive Nodes
       url: /merlin6/interactive.html
@@ -43,8 +25,6 @@ entries:
       url: /merlin6/connect-from-windows.html
     - title: Accessing from a MacOS client
       url: /merlin6/connect-from-macos.html
-    - title: Accessing Slurm Cluster
-      url: /merlin6/slurm-access.html
     - title: Merlin6 Storage
       url: /merlin6/storage.html
     - title: Transferring Data
@@ -55,10 +35,12 @@ entries:
       url: /merlin6/nomachine.html
     - title: Configuring SSH Keys
       url: /merlin6/ssh-keys.html
+    - title: Software repository - PModules
+      url: /merlin6/using-modules.html
   - title: Job Submission
     folderitems:
-    - title: Using PModules
-      url: /merlin6/using-modules.html
+    - title: Accessing Slurm Cluster
+      url: /merlin6/slurm-access.html
     - title: Slurm Basic Commands
       url: /merlin6/slurm-basics.html
     - title: Running Batch Scripts
@@ -71,6 +53,24 @@ entries:
       url: /merlin6/slurm-configuration.html
     - title: Monitoring
       url: /merlin6/monitoring.html
+  - title: Slurm CPU 'merlin6'
+    folderitems:
+    - title: Introduction
+      url: /merlin6/introduction.html
+    - title: Hardware And Software Description
+      url: /merlin6/hardware-and-software.html
+  - title: Slurm GPU 'gmerlin6'
+    folderitems:
+    - title: Introduction
+      url: /gmerlin6/introduction.html
+    - title: Hardware And Software Description
+      url: /gmerlin6/hardware-and-software.html
+  - title: Slurm CPU 'merlin5'
+    folderitems:
+    - title: Introduction
+      url: /merlin5/introduction.html
+    - title: Hardware And Software Description
+      url: /merlin5/hardware-and-software.html
   - title: Jupyterhub
     folderitems:
     - title: Jupyterhub service
diff --git a/pages/merlin6/02 accessing-merlin6/connect-from-macos.md b/pages/merlin6/02 accessing-merlin6/connect-from-macos.md
index c61493d..9912761 100644
--- a/pages/merlin6/02 accessing-merlin6/connect-from-macos.md	
+++ b/pages/merlin6/02 accessing-merlin6/connect-from-macos.md	
@@ -22,11 +22,21 @@ ssh $username@merlin-l-002.psi.ch
 
 ## SSH with X11 Forwarding
 
-Official X11 Forwarding support is through NoMachine. Please follow the document
+### Requirements
+
+For running SSH with X11 Forwarding in MacOS, one needs to have a X server running in MacOS.
+The official X Server for MacOS is **[XQuartz](https://www.xquartz.org/)**. Please ensure
+you have it running before starting a SSH connection with X11 forwarding.
+
+### SSH with X11 Forwarding in MacOS
+
+Official X11 support is through NoMachine. Please follow the document
 [{Job Submission -> Interactive Jobs}](/merlin6/interactive-jobs.html#Requirements) and
 [{Accessing Merlin -> NoMachine}](/merlin6/nomachine.html) for more details. However,
 we provide a small recipe for enabling X11 Forwarding in MacOS.
 
+* Ensure that **[XQuartz](https://www.xquartz.org/)** is installed and running in your MacOS.
+
 * For enabling client X11 forwarding, add the following to the start of ``~/.ssh/config``
 to implicitly add ``-Y`` to all ssh connections: