From bb83b4dbf6054e2e88b0c97e7684dde2cbae53da Mon Sep 17 00:00:00 2001 From: caubet_m Date: Wed, 23 Oct 2019 13:36:37 +0200 Subject: [PATCH] Fixed missing {} in URL descriptions --- pages/merlin6/02 accessing-merlin6/connect-from-linux.md | 4 ++-- pages/merlin6/02 accessing-merlin6/connect-from-macos.md | 4 ++-- pages/merlin6/02 accessing-merlin6/connect-from-windows.md | 6 +++--- pages/merlin6/03 Job Submission/interactive-jobs.md | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pages/merlin6/02 accessing-merlin6/connect-from-linux.md b/pages/merlin6/02 accessing-merlin6/connect-from-linux.md index cacda71..1526e23 100644 --- a/pages/merlin6/02 accessing-merlin6/connect-from-linux.md +++ b/pages/merlin6/02 accessing-merlin6/connect-from-linux.md @@ -23,8 +23,8 @@ ssh $username@merlin-l-002.psi.ch ## SSH with X11 Forwarding Official X11 Forwarding 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, +[{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 Linux. * For enabling client X11 forwarding, add the following to the start of ``~/.ssh/config`` diff --git a/pages/merlin6/02 accessing-merlin6/connect-from-macos.md b/pages/merlin6/02 accessing-merlin6/connect-from-macos.md index a4b6961..c61493d 100644 --- a/pages/merlin6/02 accessing-merlin6/connect-from-macos.md +++ b/pages/merlin6/02 accessing-merlin6/connect-from-macos.md @@ -23,8 +23,8 @@ ssh $username@merlin-l-002.psi.ch ## SSH with X11 Forwarding Official X11 Forwarding 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, +[{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. * For enabling client X11 forwarding, add the following to the start of ``~/.ssh/config`` diff --git a/pages/merlin6/02 accessing-merlin6/connect-from-windows.md b/pages/merlin6/02 accessing-merlin6/connect-from-windows.md index 341e3c9..03cc357 100644 --- a/pages/merlin6/02 accessing-merlin6/connect-from-windows.md +++ b/pages/merlin6/02 accessing-merlin6/connect-from-windows.md @@ -34,15 +34,15 @@ If they are missing, you can install them using the Software Kiosk icon on the D ## SSH with PuTTY with X11 Forwarding Official X11 Forwarding 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, +[{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 Windows. Check, if the **Xming** is installed on the Windows workstation by inspecting the Start menu (hint: Use the search to save time). If missing, you can install it by using the Software Kiosk icon (should be on the Desktop). -1. Ensrue that a X server (**Xming**) is running. Otherwise, start it. +1. Ensure that a X server (**Xming**) is running. Otherwise, start it. 2. Enable X11 Forwarding in your SSH client. In example, for Putty: diff --git a/pages/merlin6/03 Job Submission/interactive-jobs.md b/pages/merlin6/03 Job Submission/interactive-jobs.md index 2031d4a..743941e 100644 --- a/pages/merlin6/03 Job Submission/interactive-jobs.md +++ b/pages/merlin6/03 Job Submission/interactive-jobs.md @@ -91,7 +91,7 @@ salloc: Relinquishing job allocation 135087844 [NoMachine](/merlin6/nomachine.html) is the official supported service for graphical access in the Merlin cluster. This service is running on the login nodes. Check the -document [Accessing Merlin -> NoMachine](/merlin6/nomachine.html) for details about +document [{Accessing Merlin -> NoMachine}](/merlin6/nomachine.html) for details about how to connect to the **NoMachine** service in the Merlin cluster. For other non officially supported graphical access (X11 forwarding):