diff --git a/docs/_redirects b/docs/_redirects
index 83f94b6633480ff8cdda7e2fbe80a30d00bd9574..5cfc0f79ee5adc801be545fcd898bd2887dfdc83 100644
--- a/docs/_redirects
+++ b/docs/_redirects
@@ -1,3 +1,4 @@
+/releases/latest.html /releases/version-21.html 302
 /007/cli-commands.html https://octez.tezos.com/docs/shell/cli-commands.html 301
 /007/* https://octez.tezos.com/docs/alpha/:splat 301
 /009/glossary.html /active/glossary.html 301
diff --git a/docs/_redirects.s3 b/docs/_redirects.s3
index 2a285ed73f195ad52a71adcea97f0c14129e82b2..08c100c8aa79da828a034d02b0c011604986b8bc 100644
--- a/docs/_redirects.s3
+++ b/docs/_redirects.s3
@@ -3,3 +3,4 @@
 
 # this one is temporary, just for testing:
 /install.html /introduction/howtoget.html 301
+/releases/latest.html /releases/version-21.html 302
diff --git a/docs/alpha/staking.rst b/docs/alpha/staking.rst
index 9f38072db51e08d02bbbc8163354dfec85ee706d..b4f27c2945d17f5b0f09255a3d7218c6bf589229 100644
--- a/docs/alpha/staking.rst
+++ b/docs/alpha/staking.rst
@@ -149,6 +149,11 @@ or more conveniently::
 
    octez-client stake <amount> for <staker>
 
+The staked amount and remaining spendable funds can then be checked respectively with::
+
+   octez-client get staked balance for <staker>
+   octez-client get balance for <staker>
+
 To *unstake* funds, a staker first submits an unstake request with the
 ``unstake`` pseudo-operation. This is implemented by transferring the
 chosen amount in tez to their ``unstake`` entry-point::
diff --git a/docs/index.rst b/docs/index.rst
index 26b4058c6a4d5adb8d7df8b5c23966848f58c1e8..f817ceab1bc48dbc2c3b5954b208d7764fdbdebb 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -14,10 +14,7 @@ This documentation describes an implementation of the `Tezos blockchain <https:/
 .. note::
 
   For documentation of the whole Tezos ecosystem, including software beyond the Octez & protocol platform, such as smart contracts languages, developer tools, or web3 libraries, see https://docs.tezos.com.
-
-.. Uncomment the following when OpenTezos is updated:
-
-  Learning material about the Tezos ecosystem, consisting of training modules with exercises, can be found at https://opentezos.tezos.com.
+  Training material about the Tezos ecosystem, consisting of learning modules with exercises, can be found at https://opentezos.com.
 
 To start browsing the Octez & Protocol documentation, directly pick any topics in the menu on the left, or click one of the guided paths below:
 
diff --git a/docs/user/key-management.rst b/docs/user/key-management.rst
index f9d6f81d16abc87ae633fa49273851216d4789a1..edf84da7e7477f73fa1601bbf668f1716c624818 100644
--- a/docs/user/key-management.rst
+++ b/docs/user/key-management.rst
@@ -287,11 +287,11 @@ The operation is signed by the manager key and does not require the consensus pr
 
 However the public key must be known by the client. It can be imported with the command::
 
-   octez-client import public key consensus unencrypted:edpk...
+   octez-client import public key <consensus_key> unencrypted:edpk...
 
 The command to update the consensus key is::
 
-   octez-client set consensus key for <mgr> to consensus
+   octez-client set consensus key for <manager_key> to <consensus_key>
 
 The update becomes active after ``CONSENSUS_RIGHTS_DELAY + 1`` cycles. We therefore distinguish
 the active consensus key and the pending consensus keys.
@@ -299,7 +299,7 @@ The active consensus key is by default the delegate’s manager key, which canno
 
 However, it is also possible to register as a delegate and immediately set the consensus key::
 
-   octez-client register key <mgr> as delegate with consensus key <key>
+   octez-client register key <mananger_key> as delegate with consensus key <consensus_key>
 
 There can be multiple pending updates: it is possible to have multiple pending consensus keys for multiple future cycles.
 A subsequent update within the same cycle takes precedences over the initial one.
diff --git a/docs/user/node-monitoring.rst b/docs/user/node-monitoring.rst
index b754c593f7cb5ac6e95b75ae259abc15693634dc..718f1ad470cc2b4e60aa3b9efe669ef6192efc07 100644
--- a/docs/user/node-monitoring.rst
+++ b/docs/user/node-monitoring.rst
@@ -209,7 +209,7 @@ To install Netdata:
 
   bash <(curl -Ss https://my-netdata.io/kickstart.sh)
 
-Add the following at the end of ``/etc/netdata/app_groups.conf``
+Add the following at the end of ``/etc/netdata/apps_groups.conf``
 
 .. code-block:: shell
 
diff --git a/grafazos/doc/index.rst b/grafazos/doc/index.rst
index 12b0304362fd1794409fd8fcbfe12f8fdeecf11c..edd5dae5e40d4c704b1f1e9fdb035d248aebb862 100644
--- a/grafazos/doc/index.rst
+++ b/grafazos/doc/index.rst
@@ -19,15 +19,15 @@ Grafonnet
 
 ``Grafonnet`` is the jsonnet library used to generate grafana dashboards.
 
-``Grafonnet`` should be installed using `jsonnet-bundler <https://github.com/jsonnet-bundler/jsonnet-bundler/)>`__.
+``Grafonnet`` should be installed using `jsonnet-bundler <https://github.com/jsonnet-bundler/jsonnet-bundler/>`__.
 
 To do so, run ``go install -a github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb@latest`` and update your environment variables such as ``export GOPATH=$HOME/go`` and ``export PATH=$PATH:$GOPATH/bin``.
 
 Once ``jsonnet-bundler`` installed you can import dependencies (here ``grafonnet``) by running the following:
 
-```sh
-jb install
-```
+.. code-block:: shell
+
+    jb install
 
 Tools
 -----