diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3b6cb0778..24885e044 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -24,4 +24,4 @@ repositories are hosted here: <https://foss.heptapod.net/fluiddyn>.
 Please read our documentation on [developer
 essentials](https://fluiddyn.readthedocs.io/en/latest/advice_developers.html),
 and especially on [setting up
-Mercurial](https://fluiddyn.readthedocs.io/en/latest/mercurial_heptapod.html).
+Mercurial](https://fluidhowto.readthedocs.io/en/latest/mercurial.html).
diff --git a/doc/build-from-source.md b/doc/build-from-source.md
index f15cbe537..bf117abd4 100644
--- a/doc/build-from-source.md
+++ b/doc/build-from-source.md
@@ -20,7 +20,7 @@ Mercurial extensions like [Evolve] and [Topic]. The main repository is hosted
 
 There are other ways to get the source but we are going here to assume that you
 can install [Mercurial]. It can be useful when working with Fluidsim source to
-[fully setup Mercurial with these extensions and learn a bit of Mercurial](http://fluiddyn.readthedocs.org/en/latest/mercurial_heptapod.html).
+[fully setup Mercurial with these extensions and learn a bit of Mercurial](https://fluidhowto.readthedocs.io/en/latest/mercurial.html).
 Then, the Fluidsim repository can be cloned with
 
 ```sh
diff --git a/doc/examples/clusters/jean_zay/README.md b/doc/examples/clusters/jean_zay/README.md
index 15f1b70ab..3b5b41bc4 100644
--- a/doc/examples/clusters/jean_zay/README.md
+++ b/doc/examples/clusters/jean_zay/README.md
@@ -88,7 +88,7 @@ vim ~/.hgrc
 ```
 
 (see also
-https://fluiddyn.readthedocs.io/en/latest/mercurial_heptapod.html#set-up-mercurial)
+https://fluidhowto.readthedocs.io/en/latest/mercurial.html)
 
 ## Setup your environment and submit simulations
 
diff --git a/doc/examples/clusters/licallo/README.md b/doc/examples/clusters/licallo/README.md
index b3d38877a..363e91719 100644
--- a/doc/examples/clusters/licallo/README.md
+++ b/doc/examples/clusters/licallo/README.md
@@ -24,7 +24,7 @@ module purge
 wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
 bash Miniconda3-latest-Linux-x86_64.sh
 conda config --add channels conda-forge
-conda activate base 
+conda activate base
 pip install conda-app
 conda-app install mercurial
 conda run -n _env_mercurial pip install hg-fluiddyn
@@ -33,7 +33,7 @@ conda run -n _env_mercurial pip install hg-fluiddyn
 ### Configure mercurial:
 
 Correct and uncomment the line with the username and email address in ~.hgrc (see also
-https://fluiddyn.readthedocs.io/en/latest/mercurial_heptapod.html#set-up-mercurial)
+https://fluidhowto.readthedocs.io/en/latest/mercurial.html)
 
 ```bash
 nano ~/.hgrc
@@ -43,9 +43,9 @@ nano ~/.hgrc
 
 ```bash
 mkdir Dev
-cd Dev	
+cd Dev
 hg clone https://foss.heptapod.net/fluiddyn/fluidsim
-cd fluidsim 
+cd fluidsim
 ```
 
 ### Install pfft in your $HOME directory
@@ -66,7 +66,7 @@ Move to the install directory and run the following commands (from this director
 cd $HOME/Dev/fluidsim/doc/examples/clusters/licallo/install
 source 0_setup_env_base.sh
 ./1_copy_config_files.sh
-source ~/setup_ssh.sh 
+source ~/setup_ssh.sh
 ./2_create_conda_env.sh
 source 3_setup_env_conda.sh
 ./4_clone_fluid.sh
diff --git a/doc/examples/clusters/occigen/install/README.md b/doc/examples/clusters/occigen/install/README.md
index a73e6b901..953e64931 100644
--- a/doc/examples/clusters/occigen/install/README.md
+++ b/doc/examples/clusters/occigen/install/README.md
@@ -45,4 +45,4 @@ vim ~/.hgrc
 ```
 
 (see also
-https://fluiddyn.readthedocs.io/en/latest/mercurial_heptapod.html#set-up-mercurial)
+https://fluidhowto.readthedocs.io/en/latest/mercurial.html)