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 8c9e8c7593
commit 2664690d34
45 changed files with 116 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/merlin6/how-to-use-merlin/connect-from-macos.md
View File

@@ -10,7 +10,7 @@ permalink: /merlin6/connect-from-macos.html
## SSH without X11 Forwarding
This is the standard method. Official X11 support is provided through [NoMachine](/merlin6/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
@@ -30,8 +30,8 @@ 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,
[{Job Submission -> Interactive Jobs}](../slurm-general-docs/interactive-jobs.md#requirements) and
[{Accessing Merlin -> NoMachine}](nomachine.md) 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.