Merge branch 'main' into fix-contributing-guide

Author: bcumming

docs/build-install/containers.md

@@ -6,7 +6,7 @@ Its command-line interface (CLI) closely mirrors Docker’s, providing a consist
 
 ## Preliminary step: configuring Podman's storage
 
-The first step in order to use Podman on Alps is to create a valid Container Storage configuration file at `$HOME/.config/containers/storage.conf`, according to the following minimal template:
+The first step in order to use Podman on Alps is to create a valid Container Storage configuration file at `$HOME/.config/containers/storage.conf` (or `$XDG_CONFIG_HOME/containers/storage.conf`, if you have `$XDG_CONFIG_HOME` set), according to the following minimal template:
 
 ```toml
 [storage]
@@ -21,6 +21,14 @@ graphroot = "/dev/shm/$USER/root"
     The limitation of this approach  is that container images created during a job allocation are deleted when the job ends.
     Therefore, the image needs to either be pushed to a container registry or imported by the Container Engine before the job allocation finishes.
 
+You can use
+
+```bash
+podman info | grep -A 2 "store:"
+```
+
+to check that the correct `storage.conf` file is used by Podman (`store:configFile` field).
+
 ## Building images with Podman
 
 The easiest way to build a container image is to rely on a Containerfile (a more generic name for a container image recipe, but essentially equivalent to Dockerfile):

docs/contributing/index.md

@@ -187,6 +187,9 @@ At the top of each page there is an "edit" icon :material-pencil:, which will op
 
 Once your changes are ready, click on the "Commit changes..." button in the top right hand corner of the editor, and add at least a description commit message.
 
+!!! tip
+    See [the GitLab official guide on editing files](https://docs.github.com/en/repositories/working-with-files/managing-files/editing-files) for a step-by-step walkthrough.
+
 !!! note
     You will need to keep the default option **Create a new branch for this commit and start a pull request**.