5 Commits

Author SHA1 Message Date
6812bb6bad improve some admonishment titles
All checks were successful
Build and deploy documentation / build-and-deploy-docs (push) Successful in 25s
2026-01-23 15:25:23 +01:00
76c2b407f3 improve merlin_quotas docu
All checks were successful
Build and deploy documentation / build-and-deploy-docs (push) Successful in 22s
2026-01-23 15:22:04 +01:00
b79f937149 Update RSM step2 image
All checks were successful
Build and deploy documentation / build-and-deploy-docs (push) Successful in 21s
2026-01-15 16:43:38 +01:00
7aba2e0851 Merge pull request 'MkDocs migration' (#17) from mkdocs into master
All checks were successful
Build and deploy documentation / build-and-deploy-docs (push) Successful in 21s
Reviewed-on: #17
2026-01-12 17:51:34 +01:00
3d3eb50d10 final changes 2026-01-12 17:51:15 +01:00
6 changed files with 28 additions and 18 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View File

@@ -1,7 +1,8 @@
# Introduction # Introduction
!!! note !!! failure "Deprecated"
Merlin6 is no longer accessible for new users! Please have a look at [Merlin 7](../merlin7/01-Quick-Start-Guide/introduction.md) instead. Merlin6 is no longer accessible for new users! Please have a look at
[Merlin 7](../merlin7/01-Quick-Start-Guide/introduction.md) instead.
## Slurm clusters ## Slurm clusters
@@ -10,7 +11,8 @@ Comprised the **`merlin6`** CPU cluster and the
cluster (formally called [**`merlin5`**](../merlin5/cluster-introduction.md) is cluster (formally called [**`merlin5`**](../merlin5/cluster-introduction.md) is
kept active with best effort support. kept active with best effort support.
From July 2019, **`merlin6`** becomes the **default Slurm cluster** and any job submitted from the login node will be submitted to that cluster if not. From July 2019, **`merlin6`** becomes the **default Slurm cluster** and any job
submitted from the login node will be submitted to that cluster if not.
* Users can keep submitting to the old *`merlin5`* computing nodes by using the option ``--cluster=merlin5``. * Users can keep submitting to the old *`merlin5`* computing nodes by using the option ``--cluster=merlin5``.
* Users submitting to the **`gmerlin6`** GPU cluster need to specify the option ``--cluster=gmerlin6``. * Users submitting to the **`gmerlin6`** GPU cluster need to specify the option ``--cluster=gmerlin6``.
@@ -18,6 +20,6 @@ From July 2019, **`merlin6`** becomes the **default Slurm cluster** and any job
### Slurm 'merlin6' ### Slurm 'merlin6'
**CPU nodes** are configured in a **Slurm** cluster, called **`merlin6`**, and **CPU nodes** are configured in a **Slurm** cluster, called **`merlin6`**, and
this is the ***default Slurm cluster***. Hence, by default, if no Slurm cluster is this is the ***default Slurm cluster***. Hence, by default, if no Slurm cluster
specified (with the `--cluster` option), this will be the cluster to which the jobs is specified (with the `--cluster` option), this will be the cluster to which
will be sent. the jobs will be sent.

View File

@@ -93,7 +93,10 @@ be tracked. In theory any (or all available projects) can be tracked, but due to
UNIX and Lustre permissions, accessing quotas information for a project you're not UNIX and Lustre permissions, accessing quotas information for a project you're not
a member of **is not possible**. a member of **is not possible**.
If you are added/removed from a project, you can update this config file by !!! tip "Updating the project config"
calling `merlin_quotas genconf --force` (notice the `--force`, which will overwrite If you are added/removed from a project, you can update this config file by
your existing config file) or by editing the file by hand (*not recommended*). calling `merlin_quotas genconf --all-projects --force`. The
`--all-projects` will fully check your possible membership to all projects,
and the `--force` will overwrite your existing config file. You can also
edit the file by hand (*not recommended*).

View File

@@ -3,20 +3,25 @@ date:
created: 2026-01-12 created: 2026-01-12
tags: tags:
- getting_started - getting_started
- draft
--- ---
# New User Documentation Site # New User Documentation Site
Starting in 2026, we are changing the design of the user documentation website. Starting in 2026, we are changing the design of the user documentation website.
Previously we had used the [documentation Previously we had used the theme [Documentation for
theme](https://github.com/tomjoht/documentation-theme-jekyll) together with the Jekyll](https://github.com/tomjoht/documentation-theme-jekyll) together with
[Jykell SSG](https://jekyllrb.com/), but have now switch to the more modern the [Jykell SSG](https://jekyllrb.com/), but have now switch to the more modern
[Material for MkDocs](https://squidfunk.github.io/mkdocs-material/) theme and [Material for MkDocs](https://squidfunk.github.io/mkdocs-material/) theme and
SSG engine. This comes with a few improvements: SSG engine. This comes with a few improvements:
* searching is more complete and provides better results * searching is more complete and provides better results
* theme related improvements (day-night coloring, page layout, content formatting) * theme related improvements (day-night coloring, page layout, content formatting)
* edits for pages can be submitted via the *Edit* (this will direct you to the Gitea repository which hosts the documentation) * edits for pages can be submitted via the *Edit* button (taking you to the
Gitea editor and letting you submit a pull request)
TBD With the latter new feature, we encourage our users to point out any issues they
find with the documentation. Contributation are very welcome and will help in
ensuring that the documentation is kept up-to-date.
Notice also that we now have a dedicated [Support](../../support/index.md) page,
making it easier to find and use our different contact options.

View File

@@ -9,10 +9,10 @@
There are several channels you can use to get support: There are several channels you can use to get support:
* the **preferred** choice is to submit a ticket with [PSI Service Now](https://psi.service-now.com/psisp), alternatively * the **preferred** choice is to submit a ticket with [PSI Service Now](https://psi.service-now.com/psisp), alternatively
* you can also us our [user mailing list](#merlin-user-mailing-list), or lastly * you can also us our [user mailing list](#merlin-user-mailing-list), or
* you can email the Admins directly <merlin-admins@lists.psi.ch> * you can email the Admins directly <merlin-admins@lists.psi.ch>
!!! info ??? info
Basic contact information is also displayed on every shell login to the Basic contact information is also displayed on every shell login to the
system using the *Message of the Day* mechanism. system using the *Message of the Day* mechanism.

View File

@@ -6,7 +6,7 @@ site_url: https://hpce.pages.psi.ch
repo_name: "User Documentation Repository" repo_name: "User Documentation Repository"
repo_url: https://gitea.psi.ch/hpce/gitea-pages repo_url: https://gitea.psi.ch/hpce/gitea-pages
# TODO unsure if this works, branch needs to be changed from `mkdocs` to `main` # TODO unsure if this works, branch needs to be changed from `mkdocs` to `main`
edit_uri: _edit/mkdocs/docs/ edit_uri: _edit/master/docs/
# Copyright # Copyright
copyright: Copyright &copy; 2025 HPC and Emerging Technologies Group/CSD @ Paul Scherrer Institut copyright: Copyright &copy; 2025 HPC and Emerging Technologies Group/CSD @ Paul Scherrer Institut