HPCE/gitea-pages
HPCE/gitea-pages
0
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Activity

Fixed missing {} in URL descriptions

Browse Source
This commit is contained in:
caubet_m 2019-10-23 13:36:37 +02:00
parent 3b8e2fc9d1
commit bb83b4dbf6
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pages/merlin6/02 accessing-merlin6/connect-from-linux.md
View File

@ -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``

4
pages/merlin6/02 accessing-merlin6/connect-from-macos.md
View File

@ -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``

6
pages/merlin6/02 accessing-merlin6/connect-from-windows.md
View File

@ -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:

2
pages/merlin6/03 Job Submission/interactive-jobs.md
View File

@ -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):