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

vibed changes #1

Browse Source
This commit is contained in:
viessm_h
2025-12-11 10:32:15 +01:00
parent e64c265280
commit 4a43d69a1a
45 changed files with 116 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/merlin7/02-How-To-Use-Merlin/connect-from-linux.md
View File

@@ -10,7 +10,7 @@ permalink: /merlin7/connect-from-linux.html
## SSH without X11 Forwarding
This is the standard method. Official X11 support is provided through [NoMachine](/merlin7/nomachine.html).
This is the standard method. Official X11 support is provided through [NoMachine](nomachine.md).
For normal SSH sessions, use your SSH client as follows:
```bash
@@ -21,8 +21,8 @@ ssh $username@login002.merlin7.psi.ch
## SSH with X11 Forwarding
Official X11 Forwarding support is through NoMachine. Please follow the document
[{Job Submission -> Interactive Jobs}](/merlin7/interactive-jobs.html#Requirements) and
[{Accessing Merlin -> NoMachine}](/merlin7/nomachine.html) for more details. However,
[{Job Submission -> Interactive Jobs}](../03-Slurm-General-Documentation/interactive-jobs.md#requirements) and
[{Accessing Merlin -> NoMachine}](nomachine.md) 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``