diff --git a/docs/_redirects b/docs/_redirects
index 3f53cc100ddc6a067e58b43db740d721ed0bddd7..9a9b1893814c6c760418905e41245b8f2496ec8e 100644
--- a/docs/_redirects
+++ b/docs/_redirects
@@ -141,4 +141,4 @@
 /introduction/test_networks.html /user/multinetwork.html 301
 /user/various.html /user/exits.html 301
 /user/versioning.html /introduction/versioning.html 301
-/protocols/019_paris.html protocols/020_paris.html 301
+/protocols/019_paris.html /protocols/020_paris.html 301
diff --git a/docs/alpha/sapling.rst b/docs/alpha/sapling.rst
index 2385c8dc669885a0bc0cf9bb03730b1bb56bc0e3..c7b5e1e7549ed65b3225de5896783b30403743f3 100644
--- a/docs/alpha/sapling.rst
+++ b/docs/alpha/sapling.rst
@@ -40,7 +40,7 @@ transaction and produce the zero-knowledge proofs, which are
 computationally too intensive for an embedded device.
 
 More details can be found in the `specification document
-<https://github.com/zcash/zips/blob/main/protocol/sapling.pdf>`_.
+<https://zips.z.cash/protocol/protocol.pdf>`_.
 
 Shielded transactions
 ~~~~~~~~~~~~~~~~~~~~~
@@ -358,7 +358,7 @@ It can be generated from a mnemonic using `BIP39
 that it can be recovered in case of loss using the mnemonic.
 Alternatively it is possible to derive new keys from existing ones
 using `ZIP32
-<https://github.com/zcash/zips/blob/main/zip-0032.rst>`_, a Sapling
+<https://github.com/zcash/zips/blob/main/zips/zip-0032.rst>`_, a Sapling
 variant of `BIP32
 <https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki>`_ for
 hierarchical deterministic wallets. As usual, in this case it is
diff --git a/docs/conf.py b/docs/conf.py
index f934183a9a171f9bc0530c79aa75ead41ae686c7..763d805c8a3371f30200572805be9db54f4cbe65 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -268,6 +268,14 @@ linkcheck_allowed_redirects = dict(
             r'https://www.reddit.com/r/tezos/',
             r'https://www.reddit.com/r/tezos/[?]rdt=[0-9]+',
         ),
+        (
+            r'https://ocaml\.org/api/.*',
+            r'https://ocaml\.org/manual/[0-9.]+/api/.*',
+        ),
+        (
+            r'https://ocaml\.org/manual/.*',
+            r'https://ocaml\.org/manual/[0-9.]+/.*',
+        ),
         # 2. permanent redidections, maybe fix one day
         (r'https://bitheap\.org/cram/', r'https://github\.com/aiiie/cram'),
     ]
diff --git a/docs/introduction/cosign-verify.rst b/docs/introduction/cosign-verify.rst
index ef13d168c2f89478ab540ba4024ccbe80dd16abb..1fe9e24fa7effca8359f9d068e61f1a95cd8cc2e 100644
--- a/docs/introduction/cosign-verify.rst
+++ b/docs/introduction/cosign-verify.rst
@@ -2,7 +2,7 @@ Verifying Octez Docker Images with Cosign
 ==========================================
 
 `Cosign <https://github.com/sigstore/cosign>`_ is a tool developed by `Sigstore
-<https://sigstore.dev/>`_ to sign and verify container images and other
+<https://www.sigstore.dev/>`_ to sign and verify container images and other
 artifacts. This document provides instructions on how to verify Docker images of Octez
 signed using Cosign.
 
@@ -11,8 +11,8 @@ Prerequisites
 Before you can verify Docker images signed with Cosign, ensure you have
 Docker and Cosign installed on your system.
 
-- `Docker Installation Guide <https://docs.docker.com/get-docker/>`_
-- `Cosign Installation Guide <https://docs.sigstore.dev/cosign/installation/>`_
+- `Docker Installation Guide <https://docs.docker.com/get-started/get-docker/>`_
+- `Cosign Installation Guide <https://docs.sigstore.dev/cosign/system_config/installation/>`_
 
 Obtaining the Public Key
 ------------------------
diff --git a/docs/paris/sapling.rst b/docs/paris/sapling.rst
index a53f2ac82715b15997970e5fd499b3e86dffd145..5121b4df63b8a20d2085b7a15d5fde4b8812ed8d 100644
--- a/docs/paris/sapling.rst
+++ b/docs/paris/sapling.rst
@@ -40,7 +40,7 @@ transaction and produce the zero-knowledge proofs, which are
 computationally too intensive for an embedded device.
 
 More details can be found in the `specification document
-<https://github.com/zcash/zips/blob/main/protocol/sapling.pdf>`_.
+<https://zips.z.cash/protocol/protocol.pdf>`_.
 
 Shielded transactions
 ~~~~~~~~~~~~~~~~~~~~~
@@ -358,7 +358,7 @@ It can be generated from a mnemonic using `BIP39
 that it can be recovered in case of loss using the mnemonic.
 Alternatively it is possible to derive new keys from existing ones
 using `ZIP32
-<https://github.com/zcash/zips/blob/main/zip-0032.rst>`_, a Sapling
+<https://github.com/zcash/zips/blob/main/zips/zip-0032.rst>`_, a Sapling
 variant of `BIP32
 <https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki>`_ for
 hierarchical deterministic wallets. As usual, in this case it is
diff --git a/docs/protocols/021_quebeca.rst b/docs/protocols/021_quebeca.rst
index 6da540e52757032bec34da66d6528a8f7f8864f6..697a0870a5aa2de3e79dbaeb73502e4fd9bd4f99 100644
--- a/docs/protocols/021_quebeca.rst
+++ b/docs/protocols/021_quebeca.rst
@@ -83,7 +83,7 @@ RPC Changes
 
 - In the following paths, ``../`` is short for
   ``/chains/<chain_id>/blocks/<block_id>/context/delegates/<baker_pkh>/``.
-  See https://tezos.gitlab.io/beta/baking_power.html for more
+  See https://tezos.gitlab.io/quebeca/baking_power.html for more
   details on the renamed and new RPCs.
 
   * Renamed RPC ``GET ../current_frozen_deposits`` to ``GET
diff --git a/docs/quebeca/sapling.rst b/docs/quebeca/sapling.rst
index da9de7ce45d213009bfcaf98de3c57da5c91715f..ff3bfa88b873ba5f9e3b6818c479b1a8758b8ee4 100644
--- a/docs/quebeca/sapling.rst
+++ b/docs/quebeca/sapling.rst
@@ -40,7 +40,7 @@ transaction and produce the zero-knowledge proofs, which are
 computationally too intensive for an embedded device.
 
 More details can be found in the `specification document
-<https://github.com/zcash/zips/blob/main/protocol/sapling.pdf>`_.
+<https://zips.z.cash/protocol/protocol.pdf>`_.
 
 Shielded transactions
 ~~~~~~~~~~~~~~~~~~~~~
@@ -358,7 +358,7 @@ It can be generated from a mnemonic using `BIP39
 that it can be recovered in case of loss using the mnemonic.
 Alternatively it is possible to derive new keys from existing ones
 using `ZIP32
-<https://github.com/zcash/zips/blob/main/zip-0032.rst>`_, a Sapling
+<https://github.com/zcash/zips/blob/main/zips/zip-0032.rst>`_, a Sapling
 variant of `BIP32
 <https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki>`_ for
 hierarchical deterministic wallets. As usual, in this case it is
diff --git a/docs/shell/smart_rollup_node.rst b/docs/shell/smart_rollup_node.rst
index 444d729cece3ededc86d9965f22c802342fee624..6fe797c1c2073eab662f3d2ea3a52051ced72528 100644
--- a/docs/shell/smart_rollup_node.rst
+++ b/docs/shell/smart_rollup_node.rst
@@ -856,10 +856,10 @@ The available options are:
      - Description
    * - Singlepass
      - ``singlepass``
-     - `When to use Singlepass <https://github.com/wasmerio/wasmer/tree/master/lib/compiler-singlepass#when-to-use-singlepass>`_
+     - `When to use Singlepass <https://github.com/wasmerio/wasmer/tree/main/lib/compiler-singlepass#when-to-use-singlepass>`_
    * - Cranelift
      - ``cranelift``
-     - `When to use Cranelift <https://github.com/wasmerio/wasmer/tree/master/lib/compiler-cranelift#when-to-use-cranelift>`_
+     - `When to use Cranelift <https://github.com/wasmerio/wasmer/tree/main/lib/compiler-cranelift#when-to-use-cranelift>`_
 
 Note that while the rollup node is generally capable of using Wasmer's
 LLVM-based compiler, Octez does not currently ship with it.
diff --git a/tezt/lib_tezos/daemon.mli b/tezt/lib_tezos/daemon.mli
index 7f6f7db1dded34d3eccd8b923d91cf710cdc57dd..d04703cb19830aa82af56a09a6dbab92c9cd4a06 100644
--- a/tezt/lib_tezos/daemon.mli
+++ b/tezt/lib_tezos/daemon.mli
@@ -25,10 +25,10 @@
 
 (** Parameters of the [Daemon.Make] functor. *)
 module type PARAMETERS = sig
-  (** Data to store whether a daemon is running or not. *)
+  (** User-defined read-only data stored when the daemon is created. *)
   type persistent_state
 
-  (** Data to store when a daemon is running. *)
+  (** User-defined read-only data set when the daemon is run and unset when the daemon terminates. *)
   type session_state
 
   (** Basis for the default value for the [?name] argument of [create].