From f85373afc267beed3d011935c5a2cdc975cfc098 Mon Sep 17 00:00:00 2001
From: caubet_m <marc.caubet@psi.ch>
Date: Mon, 19 Aug 2019 16:36:03 +0200
Subject: [PATCH] Updated NoMachine screenshots

---
 .../merlin6/02 accessing-merlin6/nomachine.md | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pages/merlin6/02 accessing-merlin6/nomachine.md b/pages/merlin6/02 accessing-merlin6/nomachine.md
index 96465d8..b2a8059 100644
--- a/pages/merlin6/02 accessing-merlin6/nomachine.md	
+++ b/pages/merlin6/02 accessing-merlin6/nomachine.md	
@@ -26,70 +26,70 @@ remote access from outside PSI must request VPN access. This has to be requested
 to the IT Department by opening a PSI Service Now ticket:
 [VPN Access (PSI employees)](https://psi.service-now.com/psisp?id=psi_new_sc_cat_item&sys_id=beccc01b6f44a200d02a82eeae3ee440)
 
-## Connecting to Merlin6 NoMachine
+## Accessing Merlin6 NoMachine
 
 The Merlin6 NoMachine service is located **only** in the following login nodes:
 
 * `merlin-l-001.psi.ch`
 * ~~`merlin-l-002.psi.ch`~~ (not available yet)
 
-Below is explained all the steps necessary for configuring the access to the 
+Below are explained all the steps necessary for configuring the access to the 
 NoMachine service running on a login node.
 
-### Creating a new connection
+### Creating a Merlin6 NoMachine connection
 
-#### Create a **New** connection
+#### Creating a **New** connection
 
 Click on the **New** button to create a new connection:
 
 ![Create New NoMachine Connection]({{ "/images/NoMachine/screen_nx1.png" }})
 
-#### Configure **NX** protocol
+#### Configuring **NX** protocol
 
 ![Select NoMachine Protocol]({{ "/images/NoMachine/screen_nx2.png" }})
 
-#### Configure NoMachine Server Information
+#### Configuring NoMachine Server Information
 
 Select the corresponding login node server where the NoMachine service is running and
 keep **4000** as the listening port; then **Continue**. 
 
 ![Configure NoMachine Server Information]({{ "/images/NoMachine/screen_nx3.png" }})
 
-#### Configure NoMachine Authentication
+#### Configuring NoMachine Authentication Method
 
 Choose your authentication method and **Continue**. **Password** or *Kerberos* are the recommended ones:
 
 ![Configure NoMachine Authentication Method]({{ "/images/NoMachine/screen_nx4.png" }})
 
-#### Configure Proxy
+#### Configuring Proxy
 
 In Merlin6, we will check **Don't use a proxy**, and **Continue**:
 
 ![Configure NoMachine Proxy Information]({{ "/images/NoMachine/screen_nx5.png" }})
 
-#### Configure Connection Name
+#### Configuring Connection Name
 
 We strongly recommend to add the login node hostname, but
 you are free to choose any other name for your connection:
 
 ![Configure Connection Name]({{ "/images/NoMachine/screen_nx6.png" }})
 
-### Connecting to a NoMachine existing connection
+### Connecting to Merlin6 NoMachine
 
-#### Connect to a Merlin6 NoMachine Server
+#### Opening an existing NoMachine connection
 
 Double click on the NoMachine server in order to connect to it:
 
 ![Connect to a NoMachine existing connecion]({{ "/images/NoMachine/screen_nx7.png" }})
 
-#### Authenticate (whenever necessary)
+#### Authenticating (whenever necessary)
 
 If authentication is required, you will be asked for it. The example below corresponds to **Password** 
 authentication:
 
 ![NoMachine Authentication]({{ "/images/NoMachine/screen_nx8.png" }})
 
-#### Create/Re-Connect Virtual Desktop
+#### Creating/Re-Connecting Virtual Desktops
 
 Finally, create a virtual desktop in order to get in. If a previous virtual desktop was created, you 
 might be able to re-attach the session.