final changes

docs/merlin6/introduction.md

@@ -1,8 +1,7 @@
 # Introduction
 
-!!! failure "Deprecated"
+!!! note
-    Merlin6 is no longer accessible for new users! Please have a look at
+    Merlin6 is no longer accessible for new users! Please have a look at [Merlin 7](../merlin7/01-Quick-Start-Guide/introduction.md) instead.
-    [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
+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.
-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
+this is the ***default Slurm cluster***. Hence, by default, if no Slurm cluster is
-is specified (with the `--cluster` option), this will be the cluster to which
+specified (with the `--cluster` option), this will be the cluster to which the jobs
-the jobs will be sent.
+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
-    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
-    calling `merlin_quotas genconf --all-projects --force`. The
+your existing config file) or by editing the file by hand (*not recommended*).
-    `--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*).
 

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