diff --git a/_resource/overrides/main.html b/_resource/overrides/main.html
index 17cc316f..7b96139b 100644
--- a/_resource/overrides/main.html
+++ b/_resource/overrides/main.html
@@ -121,7 +121,10 @@
 
 {% block content %}
 
+{# Stop Cloudflare Email Obfuscation from rewriting addresses in code samples #}
+<!--email_off-->
 {{ super() }}
+<!--email_on-->
 
 <script>
 window.addEventListener('beforeprint', (event) => {
diff --git a/_resourcepdf/overrides/main.html b/_resourcepdf/overrides/main.html
index 9a33f2c1..7fc886ae 100644
--- a/_resourcepdf/overrides/main.html
+++ b/_resourcepdf/overrides/main.html
@@ -95,7 +95,10 @@
 
 {% block content %}
 
+{# Stop Cloudflare Email Obfuscation from rewriting addresses in code samples #}
+<!--email_off-->
 {{ super() }}
+<!--email_on-->
 
 <script>
 window.addEventListener('beforeprint', (event) => {
diff --git a/docs/.linkspector.yml b/docs/.linkspector.yml
index 954ee5e2..1b182d03 100644
--- a/docs/.linkspector.yml
+++ b/docs/.linkspector.yml
@@ -11,7 +11,6 @@ ignorePatterns:
   - pattern: "#mysql_alerts$"
   - pattern: "#postgresql_alerts$"
   - pattern: "#proxysql_alerts$"
-  - pattern: "^https://www\\.zmanda\\.com/zrm-community/?$"
 
 replacementPatterns:
   - pattern: "\\{\\{vers\\}\\}"
diff --git a/docs/accelerate-backup-process.md b/docs/accelerate-backup-process.md
index b0bb8f43..07fde52f 100644
--- a/docs/accelerate-backup-process.md
+++ b/docs/accelerate-backup-process.md
@@ -34,7 +34,7 @@ xtrabackup --backup --parallel=4 --target-dir=/path/to/backup
 
 By using the xbstream in streaming backups, you can additionally speed up the
 compression process with the `--compress-threads` option. This option
-specifies the number of threads created by xtrabackup for for parallel data
+specifies the number of threads created by xtrabackup for parallel data
 compression. The default value for this option is 1.
 
 To use this feature, simply add the option to a local backup, for example:
@@ -57,7 +57,7 @@ TABLES WITH READ LOCK` and once during to minimize the time the read lock is
 being held. During the second `rsync` call, it will only synchronize the
 changes to non-transactional data (if any) since the first call performed before
 the `FLUSH TABLES WITH READ LOCK`. Note that Percona XtraBackup will use
-[Backup locks] where available as a lightweight alternative to `FLUSH TABLES WITH READ
+[backup locks :octicons-link-external-16:](https://docs.percona.com/percona-server/{{ps}}/backup-locks.html) where available as a lightweight alternative to `FLUSH TABLES WITH READ
 LOCK`.
 
 Percona XtraBackup uses these locks automatically to copy non-InnoDB data to avoid blocking Data manipulation language (DML) queries that modify InnoDB tables. Find more information in [Backup locks :octicons-link-external-16:](https://docs.percona.com/percona-server/{{ps}}/backup-locks.html)
diff --git a/docs/apt-repo.md b/docs/apt-repo.md
index 5a53b650..b628cfef 100644
--- a/docs/apt-repo.md
+++ b/docs/apt-repo.md
@@ -11,7 +11,7 @@ described in [Percona Release Lifecycle Overview :octicons-link-external-16:](ht
 Install Percona XtraBackup, like many other Percona products, with the `percona-release` package configuration tool. Run the following commands as root or use the sudo command.
 {.power-number}
 
-1. Use the apt package manager to dowload `percona-release`:
+1. Use the apt package manager to download `percona-release`:
 
     ```shell
     sudo apt update
diff --git a/docs/backup-size-reporting.md b/docs/backup-size-reporting.md
index 6d0b1c5e..85f58a58 100644
--- a/docs/backup-size-reporting.md
+++ b/docs/backup-size-reporting.md
@@ -53,7 +53,7 @@ Compressed backups additionally report:
 Percona XtraBackup calculates `uncompressed_backup_size` separately from the final compressed backup size so that the reported value reflects the logical backup size before compression.
 
 Percona XtraBackup stores the reported values in:
-Expand commentComment on line R60Resolved
+
 * `xtrabackup_info`
 
 * XtraBackup error log
diff --git a/docs/compile-xtrabackup.md b/docs/compile-xtrabackup.md
index 72a2a004..45c13634 100644
--- a/docs/compile-xtrabackup.md
+++ b/docs/compile-xtrabackup.md
@@ -53,7 +53,7 @@ in your distribution as a separate package `cmake3`. For more information, see [
 
     Percona Xtrabackup requires GCC version 5.3 or higher. If the
     version of GCC installed on your system is lower then you may need to
-    install and enable [the Developer Toolset] on
+    install and enable [the Developer Toolset :octicons-link-external-16:](https://developers.redhat.com/products/developertoolset/overview) on
     `RPM`-based distributions to make sure that you use the latest GCC
     compiler and development tools.  Then, install `cmake` and other
     dependencies:
@@ -193,10 +193,10 @@ Update your PATH environment variable if you would like to use the command on
 the command line directly.
 
 ```shell
-$# Setting $PATH on the command line
+# Setting $PATH on the command line
 PATH=$PATH:/usr/local/xtrabackup/bin/xtrabackup
 
-$# Run xtrabackup directly
+# Run xtrabackup directly
 xtrabackup
 ```
 
diff --git a/docs/create-incremental-backup.md b/docs/create-incremental-backup.md
index ba3f3a91..cfd77650 100644
--- a/docs/create-incremental-backup.md
+++ b/docs/create-incremental-backup.md
@@ -31,7 +31,7 @@ xtrabackup --backup --target-dir=/data/backups/base
 ```
 
 If you look at the `xtrabackup_checkpoints` file, you should see similar
-content depending on your LSN nuber:
+content depending on your LSN number:
 
 ??? example "Expected output"
 
diff --git a/docs/docker.md b/docs/docker.md
index 9c45ad5a..91a6422f 100644
--- a/docs/docker.md
+++ b/docs/docker.md
@@ -44,7 +44,7 @@ To set up a database server on a host machine or in Docker
 container, follow the documentation of the supported product that you
 intend to use with Percona XtraBackup.
 
-!!! admontion "See also"
+!!! admonition "See also"
 
     [Docker volumes as container persistent data storage :octicons-link-external-16:](https://docs.docker.com/storage/volumes/)
 
diff --git a/docs/encrypt-backups.md b/docs/encrypt-backups.md
index 074c23fa..c5957faa 100644
--- a/docs/encrypt-backups.md
+++ b/docs/encrypt-backups.md
@@ -29,7 +29,7 @@ xtrabackup --backup --encrypt=AES256 --encrypt-key="{randomly-generated-alphanum
 ### encrypt-key-file option
 
 The recommended method uses the command line: `echo -n “{randomly-generated-alphanumeric-string}” > /data/backups/keyfile` to create the file.
-Remember that using the-- encrypt-key-file option, your text editor can automatically insert a CRLF (end of line) character in the `KEYFILE`. This inserted character invalidates the key because the size is wrong. 
+Remember that when you use the `--encrypt-key-file` option, your text editor can automatically insert a CRLF (end of line) character in the `KEYFILE`. This inserted character invalidates the key because the size is wrong. 
 
 An example of using the `--encrypt-key-file` option:
 
diff --git a/docs/faq.md b/docs/faq.md
index 978ba15f..cf32eb7f 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -7,13 +7,11 @@ created in versions prior to {{vers}} of MySQL, Percona Server for MySQL or
 Percona XtraDB Cluster. 
 
 
-## Are you aware of any web-based backup management tools (commercial or not) built around Percona XtraBackup*?
+## Are you aware of any web-based backup management tools (commercial or not) built around Percona XtraBackup?
 
-[ZRM Community :octicons-link-external-16:](https://www.zmanda.com/zrm-community/) is a community tool that uses Percona XtraBackup for Non-Blocking Backups:
+[Percona Monitoring and Management (PMM) :octicons-link-external-16:](https://docs.percona.com/percona-monitoring-and-management/3/backup/index.html) includes backup management for MySQL. PMM uses Percona XtraBackup to create on-demand and scheduled physical backups and to restore them from the PMM web interface.
 
-“ZRM provides support for non-blocking backups of MySQL using Percona
-XtraBackup. ZRM with \Percona XtraBackup provides resource utilization
-management by providing throttling based on the number of IO operations per second. Percona XtraBackup based backups also allow for table level recovery even though the backup was done at the database level (needs the recovery database server to be Percona Server for MySQL with XtraDB).”\*
+For the required XtraBackup version and setup, see [MySQL backup prerequisites :octicons-link-external-16:](https://docs.percona.com/percona-monitoring-and-management/3/backup/mysql-backup/mysql_prerequisites.html).
 
 ## xtrabackup binary fails with a floating point exception
 
diff --git a/docs/glossary.md b/docs/glossary.md
index 3bc657ef..f40259ae 100644
--- a/docs/glossary.md
+++ b/docs/glossary.md
@@ -22,7 +22,7 @@ A finalized version of the product which is made available to the general public
 
 ## .ibd
 
-On a multiple tablespace setup ([innodb\_file\_per\_table] enabled), MySQL will store each newly created table on a file with a `.ibd` extension.
+On a multiple tablespace setup ([`innodb_file_per_table`](#innodb_file_per_table) enabled), MySQL will store each newly created table on a file with a `.ibd` extension.
 
 ## .MRG
 
@@ -104,39 +104,49 @@ engine for MySQL {{vers}}.
 
 The size in bytes of the memory buffer to cache data and indexes of InnoDB’s tables. This aims to reduce disk access to provide better performance. 
 
-> \[mysqld\]<br/>
-> innodb\_buffer\_pool\_size=8MB
+```ini
+[mysqld]
+innodb_buffer_pool_size=8MB
+```
 
 ## innodb\_data\_home\_dir
 
 The directory (relative to `datadir`) where the database server stores 
 the files in a shared tablespace setup. This option does not affect the location of `innodb\_file\_per\_table`. For example:
 
-> \[mysqld\]<br/>
-> innodb\_data\_home\_dir = ./
+```ini
+[mysqld]
+innodb_data_home_dir = ./
+```
 
 ## innodb\_data\_file\_path
 
 Specifies the names, sizes and location of shared tablespace files:
 
-> \[mysqld\]<br/>
-> innodb\_data\_file\_path=ibdata1:50M;ibdata2:50M:autoextend
+```ini
+[mysqld]
+innodb_data_file_path=ibdata1:50M;ibdata2:50M:autoextend
+```
 
 ## innodb\_file\_per\_table
 
 By default, InnoDB creates tables and indexes in a [file-per-tablespace :octicons-link-external-16:](https://dev.mysql.com/doc/refman/{{vers}}/en/innodb-file-per-table-tablespaces.html). If the `innodb_file_per_table` variable is disabled, you can enable the variable in your configuration file:
 
-> \[mysqld\]<br/>
-> innodb\_file\_per\_table <br/>
-> or <br/>
-> start the server with `--innodb_file_per_table`.
+```ini
+[mysqld]
+innodb_file_per_table
+```
+
+Alternatively, start the server with `--innodb_file_per_table`.
 
 ## innodb\_log\_group\_home\_dir
 
 Specifies the location of the InnoDB log files:
 
-> \[mysqld\]<br/>
-> innodb\_log\_group\_home=/var/lib/mysql
+```ini
+[mysqld]
+innodb_log_group_home=/var/lib/mysql
+```
 
 ## logical backup
 
diff --git a/docs/index.md b/docs/index.md
index 8a594b6f..fe67ef98 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -12,7 +12,7 @@ Percona XtraBackup is designed to make backups seamless without disrupting the p
 
 ## Percona XtraBackup features
 
-Taking your backup with Percona XtraBackup is easy. Follow our documentation guides, and you’ll be set up in quickly.
+Taking your backup with Percona XtraBackup is easy. Follow our documentation guides, and you’ll be set up quickly.
 
 <div data-grid markdown><div data-banner markdown>
 
diff --git a/docs/lru-dump-backup.md b/docs/lru-dump-backup.md
index e0214fda..0e6fc71f 100644
--- a/docs/lru-dump-backup.md
+++ b/docs/lru-dump-backup.md
@@ -7,7 +7,7 @@ reducing the warm up time. It restores the buffer pool state from
 `ib_buffer_pool` and backs it up automatically.
 
 
-![image](_static/lru_dump.png)
+![Diagram: page IDs from the InnoDB buffer pool LRU list, ordered from most to least recently used, are written to the ib_lru_dump file](_static/lru_dump.png)
 
 If the buffer restore option is enabled in `my.cnf`, buffer pool will be in
 the warm state after backup is restored.
diff --git a/docs/page-tracking.md b/docs/page-tracking.md
index f02b722b..000f85a0 100644
--- a/docs/page-tracking.md
+++ b/docs/page-tracking.md
@@ -16,13 +16,13 @@ To start using the page tracking functionality, do the following:
 
 1. Install the `mysqlbackup` component and enable it on the server:
 
-    ```shell
+    ```sql
     INSTALL COMPONENT "file://component_mysqlbackup";
     ```
 
 2. Check whether the `mysqlbackup` component is installed successfully:
 
-    ```shell
+    ```sql
     SELECT COUNT(1) FROM mysql.component WHERE component_urn='file://component_mysqlbackup';
     ```
 
@@ -73,7 +73,7 @@ Enable page tracking before creating the first backup to avoid this delay. This
 After the mysqlbackup component is loaded and active on the server, you can
 start page tracking manually with the following option:
 
-```shell
+```sql
 SELECT mysqlbackup_page_track_set(true);
 ```
 
@@ -82,7 +82,7 @@ SELECT mysqlbackup_page_track_set(true);
 Check the LSN value starting from which changed pages are tracked with the
 following option:
 
-```shell
+```sql
 SELECT mysqlbackup_page_track_get_start_lsn();
 ```
 
@@ -90,7 +90,7 @@ SELECT mysqlbackup_page_track_get_start_lsn();
 
 To stop page tracking, use the following command:
 
-```shell
+```sql
 SELECT mysqlbackup_page_track_set(false);
 ```
 
@@ -105,7 +105,7 @@ grow until you stop the page tracking explicitly.
 If you purge the page tracking data, you should create a full backup
 afterward. To purge the page tracking data, do the following steps:
 
-```shell
+```sql
 SELECT mysqlbackup_page_track_set(false);
 SELECT mysqlbackup_page_track_purge_up_to(9223372036854775807);
 /* Specify the LSN up to which you want to purge page tracking data. /
@@ -118,12 +118,12 @@ SELECT mysqlbackup_page_track_set(true);
 If the index is built in place using an exclusive algorithm and then is
 added to a table after the last LSN checkpoint, you may generate a bad
 incremental backup using page tracking. For more details
-see [PS-8032 :octicons-link-external-16:](https://jira.percona.com/browse/PS-8032).
+see [PS-8032 :octicons-link-external-16:](https://perconadev.atlassian.net/browse/PS-8032).
 
 ## Uninstall the mysqlbackup component
 
 To uninstall the mysqlbackup component, use the following statement:
 
-```shell
+```sql
 UNINSTALL COMPONENT "file://component_mysqlbackup"
 ```
diff --git a/docs/quickstart-overview.md b/docs/quickstart-overview.md
index dcb46973..5bca70bd 100644
--- a/docs/quickstart-overview.md
+++ b/docs/quickstart-overview.md
@@ -31,7 +31,7 @@ This guide will help you get started quickly, but there's a lot more to learn ab
 To take a backup of Percona Server for MySQL, run Percona Server for MySQL in a Docker container and create a database, and a table.
 
 * [Start Percona Server in a Docker container :octicons-link-external-16:](https://docs.percona.com/percona-server/{{ps}}/quickstart-docker.html)
-* [Create a database and table in Percona Server :octicons-link-external-16:](https://docs.percona.com/percona-server/{{ps}}/quickstart-docker.html#create-a-database)
+* [Create a database and table in Percona Server :octicons-link-external-16:](https://docs.percona.com/percona-server/{{ps}}/quickstart-database-script.html)
 
 ### Limitations
 
diff --git a/docs/quickstart-restore-back.md b/docs/quickstart-restore-back.md
index e65e8235..e318714b 100644
--- a/docs/quickstart-restore-back.md
+++ b/docs/quickstart-restore-back.md
@@ -27,7 +27,7 @@ The following steps describe how to restore your backup to another Percona Serve
 
     You must provide at least one environment variable to access the database, such as `MYSQL_ROOT_PASSWORD`, `MYSQL_DATABASE`, `MYSQL_USER`, and `MYSQL_PASSWORD` or the instance refuses to initialize.
 
-    For this document, we are using the `9.7` tag. In Docker, a tag is a label assigned to an image. Tags are used to maintain different versions of an image. If we did not add a tag, Docker uses `latest` as the default tag and downloads the latest image from [percona/percona-server on the Docker Hub].
+    For this document, we are using the `9.7` tag. In Docker, a tag is a label assigned to an image. Tags are used to maintain different versions of an image. If we did not add a tag, Docker uses `latest` as the default tag and downloads the latest image from [percona/percona-server on Docker Hub :octicons-link-external-16:](https://hub.docker.com/r/percona/percona-server).
 
     To use a Docker volume for persistent storage with a database, specify the path where the database stores its data inside the container, usually `/var/lib/mysql`.
 
@@ -203,7 +203,7 @@ This section describes the backup validation steps assuming that you backed up `
 
 6. Check that your table contains data
 
-    ```sql 
+    ```sql
     SELECT * FROM employees; 
     ```
 
diff --git a/docs/redo-log-archiving.md b/docs/redo-log-archiving.md
index c74e7db0..b717db7e 100644
--- a/docs/redo-log-archiving.md
+++ b/docs/redo-log-archiving.md
@@ -1,7 +1,5 @@
 # InnoDB Redo Log Archiving
 
-<!-- Varify the instruction for 9.7 version-->
-
 A physical backup includes raw copies of database contents and related files, such as configuration files and logs. During crash recovery, InnoDB uses the redo log to correct data from incomplete transactions. The redo log contains entries that restore the database to a consistent state. An LSN value identifies the position of data in the redo log.
 
 InnoDB continuously appends data to the redo log. When a file fills, InnoDB creates a new file. The checkpoint process truncates old data and removes obsolete files.
diff --git a/docs/release-notes/9.7.1-rc1.md b/docs/release-notes/9.7.1-rc1.md
index b76c9b6f..dba4ca41 100644
--- a/docs/release-notes/9.7.1-rc1.md
+++ b/docs/release-notes/9.7.1-rc1.md
@@ -45,10 +45,10 @@ Percona XtraBackup 9.7 adds support for Ubuntu 26.04.
 
 ## Additional resources
 
-Install [Percona XtraBackup 9.7.1-rc1](..//installation.md)
+Install [Percona XtraBackup 9.7.1-rc1](../installation.md)
 
 The [Percona XtraBackup GitHub repository](https://github.com/percona/percona-xtrabackup)
 
 Download product binaries, packages, and tarballs at [Percona Product Downloads](https://www.percona.com/downloads/)
 
-[Quickstart Guide for Percona XtraBackup]: ..//quickstart-overview.md
+[Quickstart Guide for Percona XtraBackup]: ../quickstart-overview.md
diff --git a/docs/set-up-replication.md b/docs/set-up-replication.md
index 7925efe4..71fbfea3 100644
--- a/docs/set-up-replication.md
+++ b/docs/set-up-replication.md
@@ -293,8 +293,8 @@ rsync -avprP -e ssh /path/to/backupdir NewReplica:/path/to/mysql/datadir
 For example, to set up a new user, `user2`, you add another grant on
 the Source:
 
-```{.bash data-prompt=">"}
-> GRANT REPLICATION REPLICA ON *.*  TO 'user2'@'$newreplicaip'
+```sql
+GRANT REPLICATION REPLICA ON *.*  TO 'user2'@'$newreplicaip'
  IDENTIFIED BY '$replicapass';
 ```
 
@@ -329,8 +329,8 @@ CHANGE REPLICATION SOURCE TO
 
 Start the replica:
 
-```{.bash data-prompt=">"}
-> START REPLICA;
+```sql
+START REPLICA;
 ```
 
 If both IO and SQL threads are running when you check the `NewReplica`,
diff --git a/docs/smart-memory-estimation.md b/docs/smart-memory-estimation.md
index 7a6ed976..ab9a1994 100644
--- a/docs/smart-memory-estimation.md
+++ b/docs/smart-memory-estimation.md
@@ -22,16 +22,16 @@ To run `prepare`, Percona XtraBackup checks the server's available free memory a
 
 You can enable or disable the memory estimation during the `backup` phase with the [`--estimate-memory`](xtrabackup-option-reference.md#estimate-memory) option. The default value is `OFF`. Enable the memory estimation with  `--estimate-memory=ON`:
 
-```{.bash data-prompt="$"}
-$ xtrabackup --backup --estimate-memory=ON --target-dir=/data/backups/
+```shell
+xtrabackup --backup --estimate-memory=ON --target-dir=/data/backups/
 ```
 
 In the `prepare` phase, enable the [`--use-free-memory-pct`](xtrabackup-option-reference.md#use-free-memory-pct) option by specifying the percentage of free memory to be used to `prepare` a backup. The `--use-free-memory-pct` value must be larger than 0.
 
 For example:
 
-```{.bash data-prompt="$"}
-$ xtrabackup --prepare --use-free-memory-pct=50 --target-dir=/data/backups/
+```shell
+xtrabackup --prepare --use-free-memory-pct=50 --target-dir=/data/backups/
 ```
 
 ## Example of Smart memory estimation usage
diff --git a/docs/toolkit-version-check.md b/docs/toolkit-version-check.md
index 0ce2fdd9..e785f795 100644
--- a/docs/toolkit-version-check.md
+++ b/docs/toolkit-version-check.md
@@ -73,7 +73,7 @@ Although the *version checking* feature does not collect any personal informatio
 you might prefer to disable this feature, either one time or permanently.  To
 disable it one time, use `--no-version-check` option when invoking the tool
 from a Percona product which supports it. Here is a simple example which shows
-running [pt-diskstats :octicons-link-external-16:](https://www.percona.com/doc/percona-toolkit/LATEST/pt-diskstats.html) tool
+running [pt-diskstats :octicons-link-external-16:](https://docs.percona.com/percona-toolkit/pt-diskstats.html) tool
 from the *Percona Toolkit* with *version checking* turned off:
 
 ```text
@@ -83,7 +83,7 @@ pt-diskstats --no-version-check
 Disabling *version checking* permanently can be done by placing
 `no-version-check` option into the configuration file of a Percona product
 (see correspondent documentation for exact file name and syntax). For example,
-in case of *Percona Toolkit* [this can be done :octicons-link-external-16:](https://www.percona.com/doc/percona-toolkit/LATEST/configuration_files.html)
+in case of *Percona Toolkit* [this can be done :octicons-link-external-16:](https://docs.percona.com/percona-toolkit/configuration_files.html)
 in a global configuration file `/etc/percona-toolkit/percona-toolkit.conf`:
 
 ```shell
diff --git a/docs/verify-backup.md b/docs/verify-backup.md
index 2bc60d7f..01b89b91 100644
--- a/docs/verify-backup.md
+++ b/docs/verify-backup.md
@@ -1,7 +1,7 @@
 # Verify backups with replication and pt-checksum
 
 One way to verify if the backup is consistent is by setting up the
-replication and running [pt-table-checksum :octicons-link-external-16:](http://www.percona.com/doc/percona-toolkit/pt-table-checksum.html). This can be used to verify any type of backups, but before setting up
+replication and running [pt-table-checksum :octicons-link-external-16:](https://docs.percona.com/percona-toolkit/pt-table-checksum.html). This can be used to verify any type of backups, but before setting up
 replication, backup should be prepared and be able to run (this means that
 incremental backups should be merged to full backups, encrypted backups
 decrypted etc.).
@@ -25,7 +25,7 @@ which produces different results on replicas that are inconsistent with the
 source.
 
 After you confirmed that replication has been set up successfully, you
-can [install :octicons-link-external-16:](http://www.percona.com/doc/percona-toolkit/installation.html)
+can [install :octicons-link-external-16:](https://docs.percona.com/percona-toolkit/installation.html)
 or download *pt-table-checksum*. This example shows downloading the latest
 version of *pt-table-checksum*:
 
diff --git a/docs/xbcloud-azure.md b/docs/xbcloud-azure.md
index 8c0942a9..6345311b 100644
--- a/docs/xbcloud-azure.md
+++ b/docs/xbcloud-azure.md
@@ -14,7 +14,7 @@ The following are the options, environment variables, and descriptions for uploa
 | --azure-endpoint=name        | AZURE_ENDPOINT        | The endpoint allows clients to securely access data                                                                                                                                                                                                                                                              |
 | --azure-tier-class=name      | AZURE_STORAGE_CLASS   | Cloud tier can decrease the local storage required while maintaining the performance. When enabled, this feature has the following categories: <br/><br/>Hot - Frequently accessed or modified data <br/><br/>Cool - Infrequently accessed or modified data <br/><br/>Archive - Rarely accessed or modified data |
 
-Test your Azure applications with the [Azurite open-source emulator :octicons-link-external-16:](https://docs.microsoft.com/en-us/azure/storage/common/storage-use-azurite?tabs=visual-studio). For testing purposes, the xbcloud binary adds the `--azure-development-storage` option that uses the default `access_key` and `storage account` of azurite and `testcontainer` for the container. You can overwrite these options, if needed.
+Test your Azure applications with the [Azurite open-source emulator :octicons-link-external-16:](https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite). For testing purposes, the xbcloud binary adds the `--azure-development-storage` option that uses the default `access_key` and `storage account` of azurite and `testcontainer` for the container. You can overwrite these options, if needed.
 
 ## Usage
 
diff --git a/docs/xbcloud-binary-fifo-datasink.md b/docs/xbcloud-binary-fifo-datasink.md
index 484a21f5..09064538 100644
--- a/docs/xbcloud-binary-fifo-datasink.md
+++ b/docs/xbcloud-binary-fifo-datasink.md
@@ -39,7 +39,7 @@ When you stream backups to Amazon S3 compatible storage using LAN with a streami
 
 XtraBackup spawns multiple copy threads and each copy thread reads a data chunk from a specific file. Then multiple FIFO files are created to store the data from XtraBackup. Each XtraBackup copy thread writes the data chunks to a specific FIFO file. Xbcloud reads from the FIFO streams and uploads data to an object storage using an async request. The xbcloud event handler executes the callback depending on the response from the object storage (success or failure). 
 
-![image](_static/fifo-datasink.png)
+![Diagram: parallel XtraBackup copy threads write data chunks to FIFO files; xbcloud read threads and event handlers upload them to object storage with asynchronous PUT operations](_static/fifo-datasink.png)
 
 ## Performance improvement 
 
diff --git a/docs/xbcloud-exbackoff.md b/docs/xbcloud-exbackoff.md
index 294cfd56..b8f92fe2 100644
--- a/docs/xbcloud-exbackoff.md
+++ b/docs/xbcloud-exbackoff.md
@@ -78,7 +78,7 @@ Each cloud provider may return a different CURL error or an HTTP error,
 depending on the issue. Add new errors by setting the following
 variables `--curl-retriable-errors` or `--http-retriable-errors` on the
 command line or in `my.cnf` or in a custom configuration file under
-the [xbcloud] section. You can add multiple errors using a comma-separated list of codes.
+the `[xbcloud]` section. You can add multiple errors using a comma-separated list of codes.
 
 The error handling is enhanced when using the `--verbose` output. This
 output specifies which error caused xbcloud to fail and what parameter a
diff --git a/docs/xbcloud-iam-profile.md b/docs/xbcloud-iam-profile.md
index a5772211..a7dae09c 100644
--- a/docs/xbcloud-iam-profile.md
+++ b/docs/xbcloud-iam-profile.md
@@ -16,7 +16,7 @@ An IAM instance profile does not need the `--s3-secret-key` nor the `--s3-access
 An example of the command:
 
 ```text
-$ xtrabackup ... | xbcloud put --storage=s3 --s3-bucket=bucket-name backup-name
+xtrabackup ... | xbcloud put --storage=s3 --s3-bucket=bucket-name backup-name
 ```
 
 The xbcloud binary outputs a connect message when successful.
diff --git a/docs/xbcloud-options.md b/docs/xbcloud-options.md
index 93ac03ce..99527b57 100644
--- a/docs/xbcloud-options.md
+++ b/docs/xbcloud-options.md
@@ -295,7 +295,7 @@ Turns on the cURL tracing.
 
 ## Swift authentication options
 
-The Swift specification describes several [authentication options :octicons-link-external-16:](http://docs.openstack.org/developer/swift/overview_auth.html). The *xbcloud* tool can
+The Swift specification describes several [authentication options :octicons-link-external-16:](https://docs.openstack.org/swift/latest/overview_auth.html). The *xbcloud* tool can
 authenticate against keystone with API version 2 and 3.
 
 ## swift-auth-version
diff --git a/docs/xbcloud-s3.md b/docs/xbcloud-s3.md
index d1c6d2fe..6663fe0b 100644
--- a/docs/xbcloud-s3.md
+++ b/docs/xbcloud-s3.md
@@ -8,7 +8,7 @@ xbcloud put --storage=s3 \
 --s3-endpoint='s3.amazonaws.com' \
 --s3-access-key='YOUR-ACCESSKEYID' \
 --s3-secret-key='YOUR-SECRETACCESSKEY' \
---s3-bucket='mysql_backups'
+--s3-bucket='mysql_backups' \
 --parallel=10 \
 $(date -I)-full_backup
 ```
@@ -17,13 +17,13 @@ The following options are available when using Amazon S3:
 
 | Option                                                                                                                                                                                                                                                           | Details                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
 |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| –s3-access-key                                                                                                                                                                                                                                                   | Use to supply the AWS access key ID                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-| –s3-secret-key                                                                                                                                                                                                                                                   | Use to supply the AWS secret access key                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| –s3-bucket                                                                                                                                                                                                                                                       | Use supply the AWS bucket name                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
-| –s3-region                                                                                                                                                                                                                                                       | Use to specify the AWS region. The default value is **us-east-1**                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
-| –s3-api-version = <AUTO&vert;2                                               &vert;4>                                                                                                                                                                            | Select the signing algorithm. The default value is AUTO. In this case, xbcloud will probe.                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| –s3-bucket-lookup = <AUTO                                                             &vert;PATH &vert;DNS>                                                                                                                                                      | Specify whether to use bucket.endpoint.com or endpoint.com/bucket*style requests. The default value is AUTO. In this case, xbcloud will probe.                                                                                                                                                                                                                                                                                                                                                                                                 |                                                                                                                      |
-| –s3-storage-class=<name>                                                                                                                                                                                                                                         | Specify the [S3 storage class :octicons-link-external-16:](https://docs.aws.amazon.com/AmazonS3/latest/userguide/storage-class-intro.html). The default storage class depends on the provider. The name options are the following:<ul><li>STANDARD</li><li>STANDARD_IA</li><li>GLACIER</li></ul> **NOTE** If you use the GLACIER storage class, the object must be [restored to S3 :octicons-link-external-16:](https://docs.aws.amazon.com/AmazonS3/latest/userguide/restoring-objects.html) before restoring the backup. Also supports using custom S3 implementations such as MinIO or CephRadosGW. | 
+| `--s3-access-key` | Use to supply the AWS access key ID                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+| `--s3-secret-key` | Use to supply the AWS secret access key                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
+| `--s3-bucket` | Use to supply the AWS bucket name                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
+| `--s3-region` | Use to specify the AWS region. The default value is **us-east-1**                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
+| `--s3-api-version=<AUTO|2|4>` | Select the signing algorithm. The default value is AUTO. In this case, xbcloud will probe.                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| `--s3-bucket-lookup=<AUTO|PATH|DNS>` | Specify whether to use bucket.endpoint.com or endpoint.com/bucket*style requests. The default value is AUTO. In this case, xbcloud will probe.                                                                                                                                                                                                                                                                                                                                                                                                 |
+| `--s3-storage-class=<name>` | Specify the [S3 storage class :octicons-link-external-16:](https://docs.aws.amazon.com/AmazonS3/latest/userguide/storage-class-intro.html). The default storage class depends on the provider. The name options are the following:<ul><li>STANDARD</li><li>STANDARD_IA</li><li>GLACIER</li></ul> **NOTE** If you use the GLACIER storage class, the object must be [restored to S3 :octicons-link-external-16:](https://docs.aws.amazon.com/AmazonS3/latest/userguide/restoring-objects.html) before restoring the backup. Also supports using custom S3 implementations such as MinIO or CephRadosGW. | 
 
 ## Permissions setup
 
diff --git a/docs/xbcloud-swift.md b/docs/xbcloud-swift.md
index 810fc83a..ceb20c5a 100644
--- a/docs/xbcloud-swift.md
+++ b/docs/xbcloud-swift.md
@@ -5,7 +5,7 @@
 The following example shows how to make a full backup and upload it to Swift.
 
 ```shell
-$ xtrabackup --backup --stream=xbstream --extra-lsndir=/tmp --target-dir=/tmp | \
+xtrabackup --backup --stream=xbstream --extra-lsndir=/tmp --target-dir=/tmp | \
 xbcloud put --storage=swift \
 --swift-container=test \
 --swift-user=test:tester \
@@ -119,7 +119,7 @@ Do not verify server's certificate
 
 ### Swift authentication options
 
-The Swift specification describes several [authentication options :octicons-link-external-16:](http://docs.openstack.org/developer/swift/overview_auth.html). The *xbcloud* tool can
+The Swift specification describes several [authentication options :octicons-link-external-16:](https://docs.openstack.org/swift/latest/overview_auth.html). The *xbcloud* tool can
 authenticate against keystone with API version 2 and 3.
 
 ### --swift-auth-version()
diff --git a/docs/xbcrypt-options.md b/docs/xbcrypt-options.md
index 2bb33fb5..41147818 100644
--- a/docs/xbcrypt-options.md
+++ b/docs/xbcrypt-options.md
@@ -3,7 +3,7 @@
 Usage: 
  
 ```shell
-xbcrypt[OPTIONS]
+xbcrypt [OPTIONS]
 ```
 
 The `xbcrypt` binary has the following command line options:
diff --git a/docs/xtrabackup-option-reference.md b/docs/xtrabackup-option-reference.md
index 4df0f99d..246c9f28 100644
--- a/docs/xtrabackup-option-reference.md
+++ b/docs/xtrabackup-option-reference.md
@@ -15,7 +15,7 @@ You invoke xtrabackup in one of the following modes:
 When you intend to run xtrabackup in any of these modes, use the following syntax:
 
 ```shell
-xtrabackup [--defaults-file=#] --backup|--prepare|--copy-back| [OPTIONS]
+xtrabackup [--defaults-file=#] --backup|--prepare|--copy-back [OPTIONS]
 ```
 
 For example, the `--prepare` mode is applied as follows:
@@ -105,10 +105,10 @@ If a privilege is not needed for the current operation but is missing and may be
 
 ??? example "Example output"
 
-        ```{.text .no-copy}
-        xtrabackup: Error: missing required privilege LOCK TABLES on *.*
-        xtrabackup: Warning: missing required privilege REPLICATION CLIENT on *.*
-        ```
+    ```{.text .no-copy}
+    xtrabackup: Error: missing required privilege LOCK TABLES on *.*
+    xtrabackup: Warning: missing required privilege REPLICATION CLIENT on *.*
+    ```
 
 ### check-tables
 
@@ -388,11 +388,11 @@ The option lets you enable or disable the [Smart memory estimation](smart-memory
 An example of how to enable the Smart memory estimation feature:
 
 ```shell
-$ xtrabackup --backup --estimate-memory=ON --target-dir=/data/backups/
+xtrabackup --backup --estimate-memory=ON --target-dir=/data/backups/
 ```
 
 ```shell
-$ xtrabackup --prepare --use-free-memory-pct=50 --target-dir=/data/backups/
+xtrabackup --prepare --use-free-memory-pct=50 --target-dir=/data/backups/
 ```
 
 ### export
@@ -569,7 +569,7 @@ This option is ignored for MySQL option compatibility.
 
 ### innodb-miscellaneous
 
-Usage: `--innodb-miscellaneous
+Usage: `--innodb-miscellaneous`
 xtrabackup boots up its embedded InnoDB with the same configuration as your current server using the InnoDB options read from that server's `my.cnf` file. You do not need to specify these options explicitly.
 
 These options behave the same in either InnoDB or XtraDB.
@@ -689,7 +689,7 @@ Use this option with caution since the operation removes backup files.
 
 Usage: `--no-backup-locks`
 
-Explicity disables the [`--backup-locks`](#backup-locks) option which is enabled by default.
+Explicitly disables the [`--backup-locks`](#backup-locks) option which is enabled by default.
 
 ### no-defaults
 
@@ -1124,11 +1124,11 @@ This option works only if `--estimate-memory` option is enabled. If the `--estim
 An example of how to enable the Smart memory estimation feature:
 
 ```shell
-$ xtrabackup --backup --estimate-memory=ON --target-dir=/data/backups/
+xtrabackup --backup --estimate-memory=ON --target-dir=/data/backups/
 ```
 
 ```shell
-$ xtrabackup --prepare --use-free-memory-pct=50 --target-dir=/data/backups/
+xtrabackup --prepare --use-free-memory-pct=50 --target-dir=/data/backups/
 ```
 
 ### use-memory