add/rm final files

We use a custom override template (jinja) to generate a suitable list of
new items.

Also added first text for announcing our new user docs

.gitea/workflows/deploy.yml

@@ -3,7 +3,7 @@ name: Build and deploy documentation
 on:
   push:
     branches:
-      - master
+      - main
   workflow_dispatch:
 jobs:
   build-and-deploy-docs:

docs/cscs-userlab/index.md

@@ -32,9 +32,7 @@ oversubscription, will be arbitrated by a panel within CSD.
 
 ### Instructions for filling out the 2026 survey
 
-* We have a budget of 100 kCHF for 2026, which translates to 435'000 multicore node hours or 35'600 node hours on the GPU Grace Hopper nodes.
-  * multicore projects: The minimum allocation is 10'000 node hours, an average project allocation amounts to 30'000 node hours
-  * GPU projects: The minimum allocation is 800 node hours, an average project allocation is 2000 node hours.
+* We have a budget of 100 kCHF for 2026, which translates to 435'000 multicore node hours or 35'600 node hours on the GPU Grace Hopper nodes. The minimum allocation is 10'000 node hours for multicore projects, an average project allocation would amount to 30'000 node hours
 * You need to specify the total resource request for your project in node hours, and how you would like to split the resources over the 4 quarters. For the allocations per quarter year, please enter the number in percent (e.g. 25%, 25%, 25%, 25%). If you indicate nothing, a 25% per quarter will be assumed.
 * We currently have a total of 65 TB of storage for all projects. Additional storage
   can be obtained, but large storage assignments are not in scope for these projects.

docs/merlin6/introduction.md

@@ -1,8 +1,7 @@
 # Introduction
 
-!!! 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.
+!!! note
+    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
 
@@ -11,8 +10,7 @@ Comprised the **`merlin6`** CPU cluster and the
 cluster (formally called [**`merlin5`**](../merlin5/cluster-introduction.md) is
 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 submitting to the **`gmerlin6`** GPU cluster need to specify the option ``--cluster=gmerlin6``.
@@ -20,6 +18,6 @@ submitted from the login node will be submitted to that cluster if not.
 ### Slurm 'merlin6'
 
 **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 specified (with the `--cluster` option), this will be the cluster to which
-the jobs will be sent.
+this is the ***default Slurm cluster***. Hence, by default, if no Slurm cluster is
+specified (with the `--cluster` option), this will be the cluster to which the jobs
+will be sent.

docs/merlin7/02-How-To-Use-Merlin/merlin_tools.md

@@ -93,10 +93,7 @@ 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
 a member of **is not possible**.
 
-!!! tip "Updating the project config"
-    If you are added/removed from a project, you can update this config file by
-    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*).
+If you are added/removed from a project, you can update this config file by
+calling `merlin_quotas genconf --force` (notice the `--force`, which will overwrite
+your existing config file) or by editing the file by hand (*not recommended*).
 

docs/merlin7/05-Software-Support/gromacs.md

@@ -11,7 +11,6 @@ It is primarily designed for biochemical molecules like proteins, lipids and nuc
 GROMACS is a joint effort, with contributions from developers around the world: users agree to acknowledge use of GROMACS in any reports or publications of results obtained with the Software (see GROMACS Homepage for details).
 
 ## How to run on Merlin7
-## 2025.2
 ### CPU nodes
 ```bash
 module use Spack unstable
@@ -27,22 +26,6 @@ module load gcc/12.3 openmpi/5.0.7-3vzj-A100-gpu gromacs/2025.2-vbj4-A100-gpu-om
 module use Spack unstable
 module load gcc/12.3 openmpi/5.0.7-blxc-GH200-gpu gromacs/2025.2-cjnq-GH200-gpu-omp
 ```
-## 2025.3
-### CPU nodes
-```bash
-module use Spack unstable
-module load gcc/12.3 openmpi/5.0.9-n4yf-A100-gpu gromacs/2025.3-6ken-omp
-```
-### A100 nodes
-```bash
-module use Spack unstable
-module load gcc/12.3 openmpi/5.0.9-xqhy-A100-gpu gromacs/2025.3-ohlj-A100-gpu-omp
-```
-### GH nodes
-```bash
-module use Spack unstable
-module load gcc/12.3 openmpi/5.0.9-inxi-GH200-gpu gromacs/2025.3-yqlu-GH200-gpu-omp
-```
 
 ### SBATCH CPU, 4 MPI ranks, 16 OMP threads
 ```bash

docs/merlin7/05-Software-Support/ippl.md

@@ -13,7 +13,8 @@ GNU GPLv3
 [![Pipeline](https://gitea.psi.ch/HPCE/spack-psi/actions/workflows/ippl_gpu_merlin7.yml/badge.svg?branch=main)](https://gitea.psi.ch/HPCE/spack-psi)
 ```bash
 module use Spack unstable
-module load gcc/13.2.0 openmpi/5.0.7-dnpr-A100-gpu boost/1.82.0-lgrt fftw/3.3.10.6-zv2b-omp googletest/1.14.0-msmu h5hut/2.0.0rc7-zy7s openblas/0.3.29-zkwb cmake/3.31.6-ufy7
+module load gcc/13.2.0 openmpi/4.1.6-57rc-A100-gpu
+module load boost/1.82.0-e7gp fftw/3.3.10 gnutls/3.8.3 googletest/1.14.0 gsl/2.8 h5hut/2.0.0rc7 openblas/0.3.26-omp cmake/3.31.6-oe7u
 
 cd <path to IPPL source directory>
 mkdir build_gpu

docs/merlin7/05-Software-Support/opal-x.md

@@ -33,7 +33,7 @@ module purge
 module use Spack unstable
 module load gcc/13.2.0 openmpi/5.0.7-dnpr-A100-gpu
 module load boost/1.82.0-lgrt fftw/3.3.10.6-zv2b-omp gnutls/3.8.9-mcdr googletest/1.14.0-msmu gsl/2.7.1-hxwy h5hut/2.0.0rc7-zy7s openblas/0.3.29-zkwb cmake/3.31.6-oe7u
-git clone https://github.com/OPALX-project/OPALX.git opal-x
+git clone https://gitlab.psi.ch/OPAL/opal-x/src.git opal-x
 cd opal-x
 ./gen_OPALrevision
 
@@ -56,7 +56,7 @@ module use Spack unstable
 module load gcc/13.2.0 openmpi/5.0.7-z3y6-GH200-gpu
 module load boost/1.82.0-znbt fftw/3.3.10-jctz gnutls/3.8.9-rtrg googletest/1.15.2-odox gsl/2.7.1-j2dk h5hut/2.0.0rc7-k63k openblas/0.3.29-d3m2 cmake/3.31.4-u2nm
 
-git clone https://github.com/OPALX-project/OPALX.git opal-x
+git clone https://gitlab.psi.ch/OPAL/opal-x/src.git opal-x
 cd opal-x
 ./gen_OPALrevision
 mkdir build_gh

docs/merlin7/05-Software-Support/quantum-espresso.md

@@ -13,20 +13,6 @@ Quantum ESPRESSO is an integrated suite of Open-Source computer codes for electr
 Quantum ESPRESSO is an open initiative, in collaboration with many groups world-wide, coordinated by the Quantum ESPRESSO Foundation. Scientific work done using Quantum ESPRESSO should contain an explicit acknowledgment and reference to the main papers (see Quantum Espresso Homepage for the details).
 
 ## How to run on Merlin7
-### 7.5
-### CPU nodes
-```bash
-module purge
-module use Spack unstable
-module load gcc/12.3 openmpi/5.0.9-xqhy-A100-gpu quantum-espresso/7.5-zfwh-omp
-```
-### GH nodes
-```bash
-module purge
-module use Spack unstable
-module load nvhpc/25.7 openmpi/4.1.8-l3jj-GH200-gpu quantum-espresso/7.5-2ysd-gpu-omp
-```
-### 7.4.1
 ### A100 nodes
 ```bash
 module purge

docs/news/posts/new-user-docs-2026.md

@@ -3,25 +3,20 @@ date:
   created: 2026-01-12
 tags:
   - getting_started
+  - draft
 ---
 
 # New User Documentation Site
 
 Starting in 2026, we are changing the design of the user documentation website.
-Previously we had used the theme [Documentation for
-Jekyll](https://github.com/tomjoht/documentation-theme-jekyll) together with
-the [Jykell SSG](https://jekyllrb.com/), but have now switch to the more modern
+Previously we had used the [documentation
+theme](https://github.com/tomjoht/documentation-theme-jekyll) together with 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
 SSG engine. This comes with a few improvements:
 
 * searching is more complete and provides better results
 * theme related improvements (day-night coloring, page layout, content formatting)
-* edits for pages can be submitted via the *Edit* button (taking you to the
-  Gitea editor and letting you submit a pull request)
+* edits for pages can be submitted via the *Edit* (this will direct you to the Gitea repository which hosts the documentation)
 
-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.
+TBD

docs/support/index.md

@@ -9,10 +9,10 @@
 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
-* you can also us our [user mailing list](#merlin-user-mailing-list), or
+* you can also us our [user mailing list](#merlin-user-mailing-list), or lastly
 * 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
     system using the *Message of the Day* mechanism.
 

mkdocs.yml

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