diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6f99d0f27..c3ad89568 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -72,8 +72,7 @@ jobs:
       - name: Install Testgres
         run: |
           git clone -b no-port-for --single-branch --depth 1 https://github.com/postgrespro/testgres.git
-          cd testgres
-          python setup.py install
+          pip3 install psycopg2 ./testgres
 
       # Grant the Github runner user full control of the workspace for initdb to successfully process the data folder
       - name: Test Probackup
diff --git a/doc/pgprobackup.xml b/doc/pgprobackup.xml
index a73041f31..10e766239 100644
--- a/doc/pgprobackup.xml
+++ b/doc/pgprobackup.xml
@@ -2,7 +2,6 @@
 doc/src/sgml/pgprobackup.sgml
 &project; documentation
 -->
-
 <refentry id="app-pgprobackup">
  <indexterm zone="app-pgprobackup">
   <primary>pg_probackup</primary>
@@ -529,106 +528,112 @@ doc/src/sgml/pgprobackup.sgml
       </step>
       <step id="pbk-init-the-backup-catalog">
         <para>Initialize the backup catalog:</para>
-        <programlisting>
+        <programlisting id="pbk-init-the-backup-catalog-listing">
 backup_user@backup_host:~$ pg_probackup-16 init -B /mnt/backups
 INFO: Backup catalog '/mnt/backups' successfully initialized
 </programlisting>
       </step>
       <step id="pbk-add-instance-to-backup-catalog">
         <para>Add a backup instance called <literal>mydb</literal> to the backup catalog:</para>
-        <programlisting>
+        <programlisting id="pbk-add-instance-to-backup-catalog-listing">
 backup_user@backup_host:~$ pg_probackup-16 add-instance \
     -B /mnt/backups \
-    -D /var/lib/postgresql/16/main \
-    --instance=mydb \
+    -D /var/lib/pgpro/std-16/data \
+    --instance=node \
     --remote-host=postgres_host \
     --remote-user=postgres
-INFO: Instance 'mydb' successfully initialized
+INFO: Instance 'node' successfully initialized
 </programlisting>
       </step>
       <step id="pbk-make-full-backup">
         <para>Make a FULL backup:</para>
-        <programlisting>
+        <programlisting id="pbk-make-full-backup-listing">
 backup_user@backup_host:~$ pg_probackup-16 backup \
     -B /mnt/backups \
     -b FULL \
-    --instance=mydb \
+    --instance=node \
     --stream \
+    --compress-algorithm=zlib \
     --remote-host=postgres_host \
     --remote-user=postgres \
     -U backup \
     -d backupdb
-INFO: Backup start, pg_probackup version: 2.5.13, instance: mydb, backup ID: S6OBFN, backup mode: FULL, wal mode: STREAM, remote: true, compress-algorithm: none, compress-level: 1
+INFO: Backup start, pg_probackup version: 2.5.15, instance: node, backup ID: SCUN1Q, backup mode: FULL, wal mode: STREAM, remote: true, compress-algorithm: zlib, compress-level: 1
+INFO: This PostgreSQL instance was initialized with data block checksums. Data block corruption will be detected
 INFO: Database backup start
 INFO: wait for pg_backup_start()
-INFO: Wait for WAL segment /mnt/backups/backups/mydb/S6OBFN/database/pg_wal/000000010000000000000002 to be streamed
-INFO: PGDATA size: 29MB
-INFO: Current Start LSN: 0/2000060, TLI: 1
+INFO: Wait for WAL segment /mnt/backups/backups/node/SCUN1Q/database/pg_wal/000000010000000000000008 to be streamed
+INFO: PGDATA size: 96MB
+INFO: Current Start LSN: 0/8000028, TLI: 1
 INFO: Start transferring data files
-INFO: Data files are transferred, time elapsed: 0
+INFO: Data files are transferred, time elapsed: 1s
 INFO: wait for pg_stop_backup()
 INFO: pg_stop backup() successfully executed
-INFO: stop_lsn: 0/2003CB0
+INFO: stop_lsn: 0/800BBD0
 INFO: Getting the Recovery Time from WAL
 INFO: Syncing backup files to disk
-INFO: Backup files are synced, time elapsed: 0
-INFO: Validating backup S6OBFN
-INFO: Backup S6OBFN data files are valid
-INFO: Backup S6OBFN resident size: 45MB
-INFO: Backup S6OBFN completed
+INFO: Backup files are synced, time elapsed: 1s
+INFO: Validating backup SCUN1Q
+INFO: Backup SCUN1Q data files are valid
+INFO: Backup SCUN1Q resident size: 56MB
+INFO: Backup SCUN1Q completed
 </programlisting>
       </step>
       <step id="pbk-list-backups">
         <para>List the backups of the instance:</para>
-        <programlisting>
-backup_user@backup_host:~$ pg_probackup-16 show -B /mnt/backups --instance=mydb
+        <programlisting id="pbk-list-backups-listing">
+backup_user@backup_host:~$ pg_probackup-16 show \
+        -B /mnt/backups \
+        --instance=node
 ================================================================================================================================
  Instance  Version  ID      Recovery Time           Mode  WAL Mode  TLI  Time  Data   WAL  Zratio  Start LSN  Stop LSN   Status 
 ================================================================================================================================
- mydb      16       S6OBFN  2024-01-03 06:59:49+00  FULL  STREAM    1/0   10s  29MB  16MB    1.00  0/2000060  0/2003CB0  OK
+ node      16       SCUN1Q  2024-05-02 11:17:53+03  FULL  STREAM    1/0   12s  40MB  16MB    2.42  0/8000028  0/800BBD0  OK     
 </programlisting>
       </step>
       <step id="pbk-make-incremental-backup-in-delta-mode">
         <para>Make an incremental backup in the DELTA mode:</para>
-        <programlisting>
+        <programlisting id="pbk-make-incremental-backup-in-delta-mode-listing">
 backup_user@backup_host:~$ pg_probackup-16 backup \
-    -B /mnt/backups \
-    -b delta \
-    --instance=mydb \
-    --stream \
-    --remote-host=postgres_host \
-    --remote-user=postgres \
-    -U backup \
-    -d backupdb
-INFO: Backup start, pg_probackup version: 2.5.13, instance: mydb, backup ID: S6OBLG, backup mode: DELTA, wal mode: STREAM, remote: true, compress-algorithm: none, compress-level: 1
+            -B /mnt/backups \
+            -b DELTA \
+            --instance=node \
+            --stream \
+            --compress-algorithm=zlib \
+            --remote-host=postgres_host \
+            --remote-user=postgres \
+            -U backup \
+            -d backupdb
+INFO: Backup start, pg_probackup version: 2.5.15, instance: node, backup ID: SCUN22, backup mode: DELTA, wal mode: STREAM, remote: true, compress-algorithm: zlib, compress-level: 1
+INFO: This PostgreSQL instance was initialized with data block checksums. Data block corruption will be detected
 INFO: Database backup start
 INFO: wait for pg_backup_start()
-INFO: Parent backup: S6OBFN
-INFO: Wait for WAL segment /mnt/backups/backups/mydb/S6OBLG/database/pg_wal/000000010000000000000004 to be streamed
-INFO: PGDATA size: 29MB
-INFO: Current Start LSN: 0/4000028, TLI: 1
-INFO: Parent Start LSN: 0/2000060, TLI: 1
+INFO: Parent backup: SCUN1Q
+INFO: Wait for WAL segment /mnt/backups/backups/node/SCUN22/database/pg_wal/000000010000000000000009 to be streamed
+INFO: PGDATA size: 96MB
+INFO: Current Start LSN: 0/9000028, TLI: 1
+INFO: Parent Start LSN: 0/8000028, TLI: 1
 INFO: Start transferring data files
 INFO: Data files are transferred, time elapsed: 1s
 INFO: wait for pg_stop_backup()
 INFO: pg_stop backup() successfully executed
-INFO: stop_lsn: 0/4000168
+INFO: stop_lsn: 0/9000168
 INFO: Getting the Recovery Time from WAL
 INFO: Syncing backup files to disk
-INFO: Backup files are synced, time elapsed: 0
-INFO: Validating backup S6OBLG
-INFO: Backup S6OBLG data files are valid
-INFO: Backup S6OBLG resident size: 32MB
-INFO: Backup S6OBLG completed
+INFO: Backup files are synced, time elapsed: 1s
+INFO: Validating backup SCUN22
+INFO: Backup SCUN22 data files are valid
+INFO: Backup SCUN22 resident size: 34MB
+INFO: Backup SCUN22 completed
 </programlisting>
       </step>
       <step id="pbk-save-config-parameters">
         <para>Add or modify some parameters in the <application>pg_probackup</application>
         configuration file, so that you do not have to specify them each time on the command line:</para>
-        <programlisting>
+        <programlisting id="pbk-save-config-parameters-listing">
 backup_user@backup_host:~$ pg_probackup-16 set-config \
     -B /mnt/backups \
-    --instance=mydb \
+    --instance=node \
     --remote-host=postgres_host \
     --remote-user=postgres \
     -U backup \
@@ -637,11 +642,13 @@ backup_user@backup_host:~$ pg_probackup-16 set-config \
       </step>
       <step id="pbk-print-instance-config">
         <para>Check the configuration of the instance:</para>
-        <programlisting>
-backup_user@backup_host:~$ pg_probackup-16 show-config -B /mnt/backups --instance=mydb
+        <programlisting id="pbk-print-instance-config-listing">
+backup_user@backup_host:~$ pg_probackup-16 show-config \
+    -B /mnt/backups \
+    --instance=node
 # Backup instance information
-pgdata = /var/lib/postgresql/16/main
-system-identifier = 7319761899046784808
+pgdata = /var/lib/pgpro/std-16/data
+system-identifier = 7364313570668255886
 xlog-seg-size = 16777216
 # Connection parameters
 pgdatabase = backupdb
@@ -678,62 +685,73 @@ remote-user = postgres
       <step id="pbk-make-another-incremental-backup-in-delta-mode-using-saved-parameters">
         <para>Make another incremental backup in the DELTA mode, omitting
         the parameters stored in the configuration file earlier:</para>
-        <programlisting>
-backup_user@backup_host:~$ pg_probackup-16 backup -B /mnt/backups --instance=mydb -b delta --stream
-INFO: Backup start, pg_probackup version: 2.5.13, instance: mydb, backup ID: S6OBQO, backup mode: DELTA, wal mode: STREAM, remote: true, compress-algorithm: none, compress-level: 1
+        <programlisting id="pbk-make-another-incremental-backup-in-delta-mode-using-saved-parameters-listing">
+backup_user@backup_host:~$ pg_probackup-16 backup \
+        -B /mnt/backups \
+        -b DELTA \
+        --instance=node \
+        --stream \
+        --compress-algorithm=zlib
+INFO: Backup start, pg_probackup version: 2.5.15, instance: node, backup ID: SCUN2C, backup mode: DELTA, wal mode: STREAM, remote: true, compress-algorithm: zlib, compress-level: 1
+INFO: This PostgreSQL instance was initialized with data block checksums. Data block corruption will be detected
 INFO: Database backup start
 INFO: wait for pg_backup_start()
-INFO: Parent backup: S6OBLG
-INFO: Wait for WAL segment /mnt/backups/backups/mydb/S6OBQO/database/pg_wal/000000010000000000000006 to be streamed
-INFO: PGDATA size: 29MB
-INFO: Current Start LSN: 0/6000028, TLI: 1
-INFO: Parent Start LSN: 0/4000028, TLI: 1
+INFO: Parent backup: SCUN22
+INFO: Wait for WAL segment /mnt/backups/backups/node/SCUN2C/database/pg_wal/00000001000000000000000B to be streamed
+INFO: PGDATA size: 96MB
+INFO: Current Start LSN: 0/B000028, TLI: 1
+INFO: Parent Start LSN: 0/9000028, TLI: 1
 INFO: Start transferring data files
 INFO: Data files are transferred, time elapsed: 0
 INFO: wait for pg_stop_backup()
 INFO: pg_stop backup() successfully executed
-INFO: stop_lsn: 0/6000168
+INFO: stop_lsn: 0/B000168
 INFO: Getting the Recovery Time from WAL
 INFO: Syncing backup files to disk
 INFO: Backup files are synced, time elapsed: 0
-INFO: Validating backup S6OBQO
-INFO: Backup S6OBQO data files are valid
-INFO: Backup S6OBQO resident size: 32MB
-INFO: Backup S6OBQO completed
+INFO: Validating backup SCUN2C
+INFO: Backup SCUN2C data files are valid
+INFO: Backup SCUN2C resident size: 17MB
+INFO: Backup SCUN2C completed
 </programlisting>
       </step>
       <step id="pbk-list-backups-again">
         <para>List the backups of the instance again:</para>
-        <programlisting>
-backup_user@backup_host:~$ pg_probackup-16 show -B /mnt/backups --instance=mydb
-==================================================================================================================================
- Instance  Version  ID      Recovery Time           Mode   WAL Mode  TLI  Time   Data   WAL  Zratio  Start LSN  Stop LSN   Status 
-==================================================================================================================================
- mydb      16       S6OBQO  2024-01-03 07:06:26+00  DELTA  STREAM    1/1    6s  111kB  32MB    1.00  0/6000028  0/6000168  OK
- mydb      16       S6OBLG  2024-01-03 07:03:18+00  DELTA  STREAM    1/1   10s  127kB  32MB    1.00  0/4000028  0/4000168  OK
- mydb      16       S6OBFN  2024-01-03 06:59:49+00  FULL   STREAM    1/0   10s   29MB  16MB    1.00  0/2000060  0/2003CB0  OK
+        <programlisting id="pbk-list-backups-again-listing">
+backup_user@backup_host:~$ pg_probackup-16 show \
+    -B /mnt/backups \
+    --instance=node
+===================================================================================================================================
+ Instance  Version  ID      Recovery Time           Mode   WAL Mode  TLI  Time    Data   WAL  Zratio  Start LSN  Stop LSN   Status 
+===================================================================================================================================
+ node      16       SCUN2C  2024-05-02 11:18:13+03  DELTA  STREAM    1/1   10s  1139kB  16MB    1.00  0/B000028  0/B000168  OK     
+ node      16       SCUN22  2024-05-02 11:18:04+03  DELTA  STREAM    1/1   10s  2357kB  32MB    1.02  0/9000028  0/9000168  OK     
+ node      16       SCUN1Q  2024-05-02 11:17:53+03  FULL   STREAM    1/0   12s    40MB  16MB    2.42  0/8000028  0/800BBD0  OK     
 </programlisting>
       </step>
       <step id="pbk-quickstart-restore">
         <para>Restore the data from the latest available backup to an arbitrary location:</para>
-        <programlisting>
-backup_user@backup_host:~$ pg_probackup-16 restore -B /mnt/backups -D /var/lib/postgresql/16/staging --instance=mydb
-INFO: Validating parents for backup S6OBQO
-INFO: Validating backup S6OBFN
-INFO: Backup S6OBFN data files are valid
-INFO: Validating backup S6OBLG
-INFO: Backup S6OBLG data files are valid
-INFO: Validating backup S6OBQO
-INFO: Backup S6OBQO data files are valid
-INFO: Backup S6OBQO WAL segments are valid
-INFO: Backup S6OBQO is valid.
-INFO: Restoring the database from backup at 2024-01-03 07:06:24+00
-INFO: Start restoring backup files. PGDATA size: 61MB
-INFO: Backup files are restored. Transfered bytes: 61MB, time elapsed: 1s
-INFO: Restore incremental ratio (less is better): 100% (61MB/61MB)
+        <programlisting id="pbk-quickstart-restore-listing">
+backup_user@backup_host:~$ pg_probackup-16 restore \
+    -B /mnt/backups \
+    -D /var/lib/pgpro/std-16/staging-data \
+    --instance=node
+INFO: Validating parents for backup SCUN2C
+INFO: Validating backup SCUN1Q
+INFO: Backup SCUN1Q data files are valid
+INFO: Validating backup SCUN22
+INFO: Backup SCUN22 data files are valid
+INFO: Validating backup SCUN2C
+INFO: Backup SCUN2C data files are valid
+INFO: Backup SCUN2C WAL segments are valid
+INFO: Backup SCUN2C is valid.
+INFO: Restoring the database from backup SCUN2C on localhost
+INFO: Start restoring backup files. PGDATA size: 112MB
+INFO: Backup files are restored. Transfered bytes: 112MB, time elapsed: 0
+INFO: Restore incremental ratio (less is better): 100% (112MB/112MB)
 INFO: Syncing restored files to disk
-INFO: Restored backup files are synced, time elapsed: 0
-INFO: Restore of backup S6OBQO completed.
+INFO: Restored backup files are synced, time elapsed: 2s
+INFO: Restore of backup SCUN2C completed.
 </programlisting>
       </step>
     </procedure>
@@ -806,7 +824,7 @@ apt-cache search pg_probackup
         Install or upgrade a <application>pg_probackup</application> version of your choice
       </para>
       <programlisting>
-sudo apt install pg-probackup-15
+sudo apt install pg-probackup-16
 </programlisting>
     </listitem>
     <listitem>
@@ -814,7 +832,7 @@ sudo apt install pg-probackup-15
         Optionally install the debug package
       </para>
       <programlisting>
-sudo apt install pg-probackup-15-dbg
+sudo apt install pg-probackup-16-dbg
 </programlisting>
     </listitem>
     <listitem>
@@ -823,7 +841,7 @@ sudo apt install pg-probackup-15-dbg
       </para>
       <programlisting>
 sudo apt install dpkg-dev
-sudo apt source pg-probackup-15
+sudo apt source pg-probackup-16
 </programlisting>
     </listitem>
   </orderedlist>
@@ -855,7 +873,7 @@ dnf search pg_probackup
         Install or upgrade a <application>pg_probackup</application> version of your choice
       </para>
       <programlisting>
-dnf install pg_probackup-15
+dnf install pg_probackup-16
 </programlisting>
     </listitem>
     <listitem>
@@ -863,7 +881,7 @@ dnf install pg_probackup-15
         Optionally install the debug package
       </para>
       <programlisting>
-dnf install pg_probackup-15-debuginfo
+dnf install pg_probackup-16-debuginfo
 </programlisting>
     </listitem>
     <listitem>
@@ -877,7 +895,7 @@ dnf install pg_probackup-15-debuginfo
           </para>
           <programlisting>
 dnf install 'dnf-command(download)'
-dnf download --source pg_probackup-15
+dnf download --source pg_probackup-16
 </programlisting>
         </listitem>
         <listitem>
@@ -885,7 +903,7 @@ dnf download --source pg_probackup-15
             Using <application>yum</application>:
           </para>
           <programlisting>
-yumdownloader --source pg_probackup-15
+yumdownloader --source pg_probackup-16
 </programlisting>
         </listitem>
       </itemizedlist>
@@ -936,7 +954,7 @@ apt-cache search pg_probackup
         Install or upgrade a <application>pg_probackup</application> version of your choice
       </para>
       <programlisting>
-sudo apt-get install pg_probackup-15
+sudo apt-get install pg_probackup-16
 </programlisting>
     </listitem>
     <listitem>
@@ -944,7 +962,7 @@ sudo apt-get install pg_probackup-15
         Optionally install the debug package
       </para>
       <programlisting>
-sudo apt-get install pg_probackup-15-debuginfo
+sudo apt-get install pg_probackup-16-debuginfo
 </programlisting>
     </listitem>
   </orderedlist>
@@ -983,7 +1001,7 @@ zypper se pg_probackup
         Install or upgrade a <application>pg_probackup</application> version of your choice
       </para>
       <programlisting>
-zypper in pg_probackup-15
+zypper in pg_probackup-16
 </programlisting>
     </listitem>
     <listitem>
@@ -991,7 +1009,7 @@ zypper in pg_probackup-15
         Optionally install the source package for rebuilding the binaries
       </para>
       <programlisting>
-zypper si pg_probackup-15
+zypper si pg_probackup-16
 </programlisting>
     </listitem>
   </orderedlist>
@@ -1080,7 +1098,7 @@ pg_probackup init -B <replaceable>backup_dir</replaceable>
       To add a new backup instance, run the following command:
     </para>
     <programlisting>
-pg_probackup add-instance -B <replaceable>backup_dir</replaceable> -D <replaceable>data_dir</replaceable> --instance <replaceable>instance_name</replaceable> [<replaceable>remote_options</replaceable>]
+pg_probackup add-instance -B <replaceable>backup_dir</replaceable> -D <replaceable>data_dir</replaceable> --instance=<replaceable>instance_name</replaceable> [<replaceable>remote_options</replaceable>]
 </programlisting>
     <para>
       Where:
@@ -1128,7 +1146,7 @@ pg_probackup add-instance -B <replaceable>backup_dir</replaceable> -D <replaceab
       <replaceable>backup_dir</replaceable> directory and at least read-only
       access to <replaceable>data_dir</replaceable> directory. If you
       specify the path to the backup catalog in the
-      <envar>BACKUP_DIR</envar> environment variable, you can
+      <envar>BACKUP_PATH</envar> environment variable, you can
       omit the corresponding option when running <application>pg_probackup</application>
       commands.
     </para>
@@ -1355,7 +1373,7 @@ ALTER ROLE backup WITH REPLICATION;
           parameter, as follows:
         </para>
         <programlisting>
-archive_command = '"<replaceable>install_dir</replaceable>/pg_probackup" archive-push -B "<replaceable>backup_dir</replaceable>" --instance <replaceable>instance_name</replaceable> --wal-file-name=%f [<replaceable>remote_options</replaceable>]'
+archive_command = '"<replaceable>install_dir</replaceable>/pg_probackup" archive-push -B "<replaceable>backup_dir</replaceable>" --instance=<replaceable>instance_name</replaceable> --wal-file-name=%f [<replaceable>remote_options</replaceable>]'
 </programlisting>
       </listitem>
     </itemizedlist>
@@ -1804,7 +1822,7 @@ CREATE EXTENSION ptrack;
       To create a backup, run the following command:
     </para>
     <programlisting>
-pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> -b <replaceable>backup_mode</replaceable>
+pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> -b <replaceable>backup_mode</replaceable>
 </programlisting>
     <para>
       Where <replaceable>backup_mode</replaceable> can take one of the
@@ -1830,7 +1848,7 @@ pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance <replace
         For example, to make a FULL backup in ARCHIVE mode, run:
       </para>
       <programlisting>
-pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> -b FULL
+pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> -b FULL
 </programlisting>
       <para>
         ARCHIVE backups rely on
@@ -1860,7 +1878,7 @@ pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance <replace
         previous example:
       </para>
       <programlisting>
-pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> -b FULL --stream --temp-slot
+pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> -b FULL --stream --temp-slot
 </programlisting>
       <para>
         The optional <option>--temp-slot</option> flag ensures that
@@ -1953,7 +1971,7 @@ pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance <replace
         directory on Linux, run:
       </para>
       <programlisting>
-pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> -b FULL --external-dirs=/etc/dir1:/etc/dir2
+pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> -b FULL --external-dirs=/etc/dir1:/etc/dir2
 </programlisting>
       <para>
         Similarly, to include <filename>C:\dir1</filename> and
@@ -1961,7 +1979,7 @@ pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance <replace
         on Windows, run:
       </para>
       <programlisting>
-pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> -b FULL --external-dirs=C:\dir1;C:\dir2
+pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> -b FULL --external-dirs=C:\dir1;C:\dir2
 </programlisting>
       <para>
         <application>pg_probackup</application> recursively copies the contents
@@ -1989,7 +2007,7 @@ pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance <replace
       not corrupt, run the following command:
     </para>
     <programlisting>
-pg_probackup checkdb [-B <replaceable>backup_dir</replaceable> [--instance <replaceable>instance_name</replaceable>]] [-D <replaceable>data_dir</replaceable>] [<replaceable>connection_options</replaceable>]
+pg_probackup checkdb [-B <replaceable>backup_dir</replaceable> [--instance=<replaceable>instance_name</replaceable>]] [-D <replaceable>data_dir</replaceable>] [<replaceable>connection_options</replaceable>]
 </programlisting>
 
     <para>
@@ -2087,7 +2105,7 @@ pg_probackup checkdb --amcheck --skip-block-validation [<replaceable>connection_
       this command:
     </para>
     <programlisting>
-pg_probackup validate -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> --recovery-target-xid=4242
+pg_probackup validate -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> --recovery-target-xid=4242
 </programlisting>
     <para>
       If validation completes successfully, <application>pg_probackup</application> displays the
@@ -2107,11 +2125,11 @@ pg_probackup validate -B <replaceable>backup_dir</replaceable> --instance <repla
     </para>
     <para>
       For example, to check that you can restore the database cluster
-      from a backup copy with the <literal>PT8XFX</literal> backup ID up to the
+      from a backup copy with the <literal>SCUN2C</literal> backup ID up to the
       specified timestamp, run this command:
     </para>
-    <programlisting>
-pg_probackup validate -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> -i PT8XFX --recovery-target-time="2017-05-18 14:18:11+03"
+    <programlisting id="pbk-validating-backups-listing">
+pg_probackup validate -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> -i SCUN2C --recovery-target-time="2024-05-03 11:18:13+03"
 </programlisting>
     <para>
       If you specify the <replaceable>backup_id</replaceable> of an incremental backup,
@@ -2129,7 +2147,7 @@ pg_probackup validate -B <replaceable>backup_dir</replaceable> --instance <repla
       command with at least the following options:
     </para>
     <programlisting>
-pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> -i <replaceable>backup_id</replaceable>
+pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> -i <replaceable>backup_id</replaceable>
 </programlisting>
     <para>
       Where:
@@ -2213,7 +2231,7 @@ pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replac
       specified multiple times for multiple tablespaces. For example:
     </para>
     <programlisting>
-pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> -D <replaceable>data_dir</replaceable> -j 4 -i <replaceable>backup_id</replaceable> -T tablespace1_dir=<replaceable>tablespace1_newdir</replaceable> -T tablespace2_dir=<replaceable>tablespace2_newdir</replaceable>
+pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> -D <replaceable>data_dir</replaceable> -j 4 -i <replaceable>backup_id</replaceable> -T tablespace1_dir=<replaceable>tablespace1_newdir</replaceable> -T tablespace2_dir=<replaceable>tablespace2_newdir</replaceable>
 </programlisting>
 
     <para>
@@ -2245,7 +2263,7 @@ pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replac
         run the <xref linkend="pbk-restore"/> command with the following options:
       </para>
       <programlisting>
-pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> -D <replaceable>data_dir</replaceable> -I <replaceable>incremental_mode</replaceable>
+pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> -D <replaceable>data_dir</replaceable> -I <replaceable>incremental_mode</replaceable>
       </programlisting>
       <para>
       Where <replaceable>incremental_mode</replaceable> can take one of the
@@ -2305,29 +2323,36 @@ pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replac
         Suppose you want to return an old master as replica after switchover
         using incremental restore in LSN mode:
       </para>
-      <programlisting>
-=============================================================================================================================================
- Instance  Version  ID      Recovery Time           Mode   WAL Mode  TLI      Time    Data    WAL  Zratio  Start LSN    Stop LSN     Status
-=============================================================================================================================================
- node      12       QBRNBP  2020-06-11 17:40:58+03  DELTA  ARCHIVE   16/15     40s   194MB   16MB    8.26  15/2C000028  15/2D000128  OK
- node      12       QBRIDX  2020-06-11 15:51:42+03  PAGE   ARCHIVE   15/15     11s    18MB   16MB    5.10  14/DC000028  14/DD0000B8  OK
- node      12       QBRIAJ  2020-06-11 15:51:08+03  PAGE   ARCHIVE   15/15     20s   141MB   96MB    6.22  14/D4BABFE0  14/DA9871D0  OK
- node      12       QBRHT8  2020-06-11 15:45:56+03  FULL   ARCHIVE   15/0   2m:11s  1371MB  416MB   10.93  14/9D000028  14/B782E9A0  OK
-
-pg_probackup restore -B /backup --instance node -R -I lsn
-INFO: Running incremental restore into nonempty directory: "/var/lib/pgsql/12/data"
-INFO: Destination directory redo point 15/2E000028 on tli 16 is within reach of backup QBRIDX with Stop LSN 14/DD0000B8 on tli 15
-INFO: shift LSN: 14/DD0000B8
-INFO: Restoring the database from backup at 2020-06-11 17:40:58+03
-INFO: Extracting the content of destination directory for incremental restore
-INFO: Destination directory content extracted, time elapsed: 1s
-INFO: Removing redundant files in destination directory
-INFO: Redundant files are removed, time elapsed: 1s
-INFO: Start restoring backup files. PGDATA size: 15GB
-INFO: Backup files are restored. Transfered bytes: 1693MB, time elapsed: 43s
-INFO: Restore incremental ratio (less is better): 11% (1693MB/15GB)
-INFO: Restore of backup QBRNBP completed.
-      </programlisting>
+      <programlisting id="pbk-incremental-restore-listing">
+======================================================================================================================================
+ Instance  Version  ID      Recovery Time           Mode    WAL Mode  TLI  Time   Data    WAL  Zratio  Start LSN   Stop LSN    Status 
+======================================================================================================================================
+ node      16       SCUN3Y  2024-05-02 11:19:16+03  DELTA   STREAM    16/15   7s   92MB  208MB    2.27  0/3C0043A8  0/46159C70  OK     
+ node      16       SCUN3M  2024-05-02 11:19:01+03  PTRACK  STREAM    15/15  10s   30MB   16MB    2.23  0/32000028  0/32005ED0  OK     
+ node      16       SCUN39  2024-05-02 11:18:50+03  PAGE    STREAM    15/15  12s   46MB   32MB    1.44  0/2A000028  0/2B0000B8  OK     
+ node      16       SCUN2V  2024-05-02 11:18:38+03  FULL    STREAM    15/0   11s  154MB   16MB    2.32  0/23000028  0/23000168  OK     
+
+backup_user@backup_host:~$ pg_probackup-16 restore -B /mnt/backups --instance=node -R -I lsn
+INFO: Destination directory and tablespace directories are empty, disable incremental restore
+INFO: Validating parents for backup SCUN3Y
+INFO: Validating backup SCUN2V
+INFO: Backup SCUN2V data files are valid
+INFO: Validating backup SCUN39
+INFO: Backup SCUN39 data files are valid
+INFO: Validating backup SCUN3M
+INFO: Backup SCUN3M data files are valid
+INFO: Validating backup SCUN3Y
+INFO: Backup SCUN3Y data files are valid
+INFO: Backup SCUN3Y WAL segments are valid
+INFO: Backup SCUN3Y is valid.
+INFO: Restoring the database from backup SCUN3Y
+INFO: Start restoring backup files. PGDATA size: 759MB
+INFO: Backup files are restored. Transfered bytes: 759MB, time elapsed: 3s
+INFO: Restore incremental ratio (less is better): 100% (759MB/759MB)
+INFO: Syncing restored files to disk
+INFO: Restored backup files are synced, time elapsed: 1s
+INFO: Restore of backup SCUN3Y completed.
+</programlisting>
       <note>
         <para>
           Incremental restore is possible only for backups with
@@ -2351,7 +2376,7 @@ INFO: Restore of backup QBRNBP completed.
         with the following options:
       </para>
       <programlisting>
-pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> --db-include=<replaceable>database_name</replaceable>
+pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> --db-include=<replaceable>database_name</replaceable>
       </programlisting>
       <para>
         The <option>--db-include</option> option can be specified
@@ -2360,14 +2385,14 @@ pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replac
         following command:
       </para>
       <programlisting>
-pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> --db-include=db1 --db-include=db2
+pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> --db-include=db1 --db-include=db2
 </programlisting>
       <para>
         To exclude one or more databases from restore, use
         the <option>--db-exclude</option> option:
       </para>
       <programlisting>
-pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> --db-exclude=<replaceable>database_name</replaceable>
+pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> --db-exclude=<replaceable>database_name</replaceable>
 </programlisting>
       <para>
         The <option>--db-exclude</option> option can be specified
@@ -2376,7 +2401,7 @@ pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replac
         restore, run the following command:
       </para>
       <programlisting>
-pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> --db-exclude=db1 --db-exclude=db2
+pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> --db-exclude=db1 --db-exclude=db2
 </programlisting>
       <para>
         Partial restore relies on lax behavior of <productname>PostgreSQL</productname> recovery
@@ -2438,7 +2463,7 @@ pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replac
           timestamp format. For example:
         </para>
         <programlisting>
-pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> --recovery-target-time="2017-05-18 14:18:11+03"
+pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> --recovery-target-time="2024-05-03 11:18:13+03"
 </programlisting>
       </listitem>
       <listitem>
@@ -2447,7 +2472,7 @@ pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replac
           ID, use the <option>--recovery-target-xid</option> option:
         </para>
         <programlisting>
-pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> --recovery-target-xid=687
+pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> --recovery-target-xid=687
 </programlisting>
       </listitem>
       <listitem>
@@ -2456,7 +2481,7 @@ pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replac
           <option>--recovery-target-lsn</option> option:
         </para>
         <programlisting>
-pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> --recovery-target-lsn=16/B374D848
+pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> --recovery-target-lsn=16/B374D848
 </programlisting>
       </listitem>
       <listitem>
@@ -2465,7 +2490,7 @@ pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replac
           point, use <option>--recovery-target-name</option> option:
         </para>
         <programlisting>
-pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> --recovery-target-name="before_app_upgrade"
+pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> --recovery-target-name="before_app_upgrade"
 </programlisting>
       </listitem>
       <listitem>
@@ -2475,7 +2500,7 @@ pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replac
           with <literal>latest</literal> value:
         </para>
         <programlisting>
-pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> --recovery-target="latest"
+pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> --recovery-target="latest"
 </programlisting>
       </listitem>
       <listitem>
@@ -2485,7 +2510,7 @@ pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replac
           <literal>immediate</literal> value:
         </para>
         <programlisting>
-pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> --recovery-target='immediate'
+pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> --recovery-target='immediate'
 </programlisting>
       </listitem>
     </itemizedlist>
@@ -2569,7 +2594,7 @@ pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replac
       through port <literal>2302</literal>, run:
     </para>
     <programlisting>
-pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> -b FULL --remote-user=postgres --remote-host=192.168.0.2 --remote-port=2302
+pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> -b FULL --remote-user=postgres --remote-host=192.168.0.2 --remote-port=2302
 </programlisting>
     <para>
       To restore the latest available backup on a remote system with host address
@@ -2577,7 +2602,7 @@ pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance <replace
       user via SSH connection through port <literal>2302</literal>, run:
     </para>
     <programlisting>
-pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> --remote-user=postgres --remote-host=192.168.0.2 --remote-port=2302
+pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> --remote-user=postgres --remote-host=192.168.0.2 --remote-port=2302
 </programlisting>
     <para>
       Restoring an ARCHIVE backup or performing PITR in the remote mode
@@ -2604,20 +2629,20 @@ pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replac
       <literal>2303</literal>, run:
     </para>
     <programlisting>
-pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> --remote-user=postgres --remote-host=192.168.0.2 --remote-port=2302 --archive-host=192.168.0.3 --archive-port=2303 --archive-user=backup
+pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> --remote-user=postgres --remote-host=192.168.0.2 --remote-port=2302 --archive-host=192.168.0.3 --archive-port=2303 --archive-user=backup
 </programlisting>
     <para>
       Provided arguments will be used to construct the <command>restore_command</command>:
     </para>
     <programlisting>
-restore_command = '"<replaceable>install_dir</replaceable>/pg_probackup" archive-get -B "<replaceable>backup_dir</replaceable>" --instance <replaceable>instance_name</replaceable> --wal-file-path=%p --wal-file-name=%f --remote-host=192.168.0.3 --remote-port=2303 --remote-user=backup'
+restore_command = '"<replaceable>install_dir</replaceable>/pg_probackup" archive-get -B "<replaceable>backup_dir</replaceable>" --instance=<replaceable>instance_name</replaceable> --wal-file-path=%p --wal-file-name=%f --remote-host=192.168.0.3 --remote-port=2303 --remote-user=backup'
 </programlisting>
     <para>
       Alternatively, you can use the <option>--restore-command</option>
       option to provide the entire <parameter>restore_command</parameter>:
     </para>
     <programlisting>
-pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> --remote-user=postgres --remote-host=192.168.0.2 --remote-port=2302 --restore-command='"<replaceable>install_dir</replaceable>/pg_probackup" archive-get -B "<replaceable>backup_dir</replaceable>" --instance <replaceable>instance_name</replaceable> --wal-file-path=%p --wal-file-name=%f --remote-host=192.168.0.3 --remote-port=2303 --remote-user=backup'
+pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> --remote-user=postgres --remote-host=192.168.0.2 --remote-port=2302 --restore-command='"<replaceable>install_dir</replaceable>/pg_probackup" archive-get -B "<replaceable>backup_dir</replaceable>" --instance=<replaceable>instance_name</replaceable> --wal-file-path=%p --wal-file-name=%f --remote-host=192.168.0.3 --remote-port=2303 --remote-user=backup'
 </programlisting>
     <note>
       <para>
@@ -2646,7 +2671,7 @@ pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replac
       example, to create a backup using four parallel threads, run:
     </para>
     <programlisting>
-pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> -b FULL -j 4
+pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> -b FULL -j 4
 </programlisting>
     <note>
       <para>
@@ -2707,14 +2732,14 @@ pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance <replace
       using the <command>set-config</command> command:
     </para>
     <programlisting>
-pg_probackup set-config -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable>
+pg_probackup set-config -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable>
 [--external-dirs=<replaceable>external_directory_path</replaceable>] [<replaceable>remote_options</replaceable>] [<replaceable>connection_options</replaceable>] [<replaceable>retention_options</replaceable>] [<replaceable>logging_options</replaceable>]
 </programlisting>
     <para>
       To view the current settings, run the following command:
     </para>
     <programlisting>
-pg_probackup show-config -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable>
+pg_probackup show-config -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable>
 </programlisting>
     <para>
       You can override the settings defined in <filename>pg_probackup.conf</filename> when
@@ -2788,16 +2813,16 @@ pg_probackup show -B <replaceable>backup_dir</replaceable>
         <application>pg_probackup</application> displays the list of all the available backups.
         For example:
       </para>
-      <programlisting>
+      <programlisting id="pbk-viewing-backup-info-listing-1">
 BACKUP INSTANCE 'node'
 ======================================================================================================================================
- Instance  Version  ID      Recovery time           Mode    WAL Mode  TLI  Time    Data   WAL  Zratio  Start LSN   Stop LSN    Status
+ Instance  Version  ID      Recovery Time           Mode    WAL Mode  TLI  Time   Data    WAL  Zratio  Start LSN   Stop LSN    Status 
 ======================================================================================================================================
- node      10       PYSUE8  2019-10-03 15:51:48+03  FULL    ARCHIVE   1/0   16s  9047kB  16MB    4.31  0/12000028  0/12000160  OK
- node      10       P7XDQV  2018-04-29 05:32:59+03  DELTA   STREAM    1/1   11s    19MB  16MB    1.00  0/15000060  0/15000198  OK
- node      10       P7XDJA  2018-04-29 05:28:36+03  PTRACK  STREAM    1/1   21s    32MB  32MB    1.00  0/13000028  0/13000198  OK
- node      10       P7XDHU  2018-04-29 05:27:59+03  PAGE    STREAM    1/1   15s    33MB  16MB    1.00  0/11000028  0/110001D0  OK
- node      10       P7XDHB  2018-04-29 05:27:15+03  FULL    STREAM    1/0   11s    39MB  16MB    1.00  0/F000028   0/F000198   OK
+ node      16       SCUN4E  2024-05-02 11:19:37+03  FULL    ARCHIVE   1/0   13s  239MB   16MB    2.31  0/4C000028  0/4D0000B8  OK     
+ node      16       SCUN3Y  2024-05-02 11:19:16+03  DELTA   STREAM    1/1    7s   92MB  208MB    2.27  0/3C0043A8  0/46159C70  OK     
+ node      16       SCUN3M  2024-05-02 11:19:01+03  PTRACK  STREAM    1/1   10s   30MB   16MB    2.23  0/32000028  0/32005ED0  OK     
+ node      16       SCUN39  2024-05-02 11:18:50+03  PAGE    STREAM    1/1   12s   46MB   32MB    1.44  0/2A000028  0/2B0000B8  OK     
+ node      16       SCUN2V  2024-05-02 11:18:38+03  FULL    STREAM    1/0   11s  154MB   16MB    2.32  0/23000028  0/23000168  OK     
 </programlisting>
       <para>
         For each backup, the following information is provided:
@@ -2947,12 +2972,12 @@ BACKUP INSTANCE 'node'
         <command>show</command> command with the backup ID:
       </para>
       <programlisting>
-pg_probackup show -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> -i <replaceable>backup_id</replaceable>
+pg_probackup show -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> -i <replaceable>backup_id</replaceable>
 </programlisting>
       <para>
         The sample output is as follows:
       </para>
-      <programlisting>
+      <programlisting id="pbk-viewing-backup-info-listing-2">
 #Configuration
 backup-mode = FULL
 stream = false
@@ -2962,27 +2987,26 @@ from-replica = false
 
 #Compatibility
 block-size = 8192
-wal-block-size = 8192
+xlog-block-size = 8192
 checksum-version = 1
-program-version = 2.1.3
-server-version = 10
+program-version = 2.5.15
+server-version = 16
 
 #Result backup info
 timelineid = 1
-start-lsn = 0/04000028
-stop-lsn = 0/040000f8
-start-time = '2017-05-16 12:57:29'
-end-time = '2017-05-16 12:57:31'
-recovery-xid = 597
-recovery-time = '2017-05-16 12:57:31'
-expire-time = '2020-05-16 12:57:31'
-data-bytes = 22288792
+start-lsn = 0/4C000028
+stop-lsn = 0/4D0000B8
+start-time = '2024-05-02 11:19:26+03'
+end-time = '2024-05-02 11:19:39+03'
+recovery-xid = 743
+recovery-time = '2024-05-02 11:19:37+03'
+data-bytes = 250827955
 wal-bytes = 16777216
-uncompressed-bytes = 39961833
-pgdata-bytes = 39859393
+uncompressed-bytes = 578216425
+pgdata-bytes = 578216107
 status = OK
-parent-backup-id = 'PT8XFX'
-primary_conninfo = 'user=backup passfile=/var/lib/pgsql/.pgpass port=5432 sslmode=disable sslcompression=1 target_session_attrs=any'
+primary_conninfo = 'user=backup channel_binding=prefer host=localhost port=5432 sslmode=prefer sslcompression=0 sslcertmode=allow sslsni=1 ssl_min_protocol_version=TLSv1.2 gssencmode=prefer krbsrvname=postgres gssdelegation=0 target_session_attrs=any load_balance_hosts=disable'
+content-crc = 802820606
 </programlisting>
       <para>
         Detailed output has additional attributes:
@@ -3091,44 +3115,46 @@ primary_conninfo = 'user=backup passfile=/var/lib/pgsql/.pgpass port=5432 sslmod
         in the <acronym>JSON</acronym> format:
       </para>
       <programlisting>
-pg_probackup show -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> --format=json -i backup_id
+pg_probackup show -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> --format=json -i backup_id
 </programlisting>
       <para>
         The sample output is as follows:
       </para>
-      <programlisting>
+      <programlisting id="pbk-viewing-backup-info-listing-3">
 [
-  {
-      "instance": "node",
-      "backups": [
-          {
-              "id": "PT91HZ",
-              "parent-backup-id": "PT8XFX",
-              "backup-mode": "DELTA",
-              "wal": "ARCHIVE",
-              "compress-alg": "zlib",
-              "compress-level": 1,
-              "from-replica": false,
-              "block-size": 8192,
-              "xlog-block-size": 8192,
-              "checksum-version": 1,
-              "program-version": "2.1.3",
-              "server-version": "10",
-              "current-tli": 16,
-              "parent-tli": 2,
-              "start-lsn": "0/8000028",
-              "stop-lsn": "0/8000160",
-              "start-time": "2019-06-17 18:25:11+03",
-              "end-time": "2019-06-17 18:25:16+03",
-              "recovery-xid": 0,
-              "recovery-time": "2019-06-17 18:25:15+03",
-              "data-bytes": 106733,
-              "wal-bytes": 16777216,
-              "primary_conninfo": "user=backup passfile=/var/lib/pgsql/.pgpass port=5432 sslmode=disable sslcompression=1 target_session_attrs=any",
-              "status": "OK"
-          }
-      ]
-  }
+    {
+        "instance": "node",
+        "backups": [
+            {
+                "id": "SCUN4E",
+                "backup-mode": "FULL",
+                "wal": "ARCHIVE",
+                "compress-alg": "zlib",
+                "compress-level": 1,
+                "from-replica": "false",
+                "block-size": 8192,
+                "xlog-block-size": 8192,
+                "checksum-version": 1,
+                "program-version": "2.5.15",
+                "server-version": "16",
+                "current-tli": 16,
+                "parent-tli": 2,
+                "start-lsn": "0/4C000028",
+                "stop-lsn": "0/4D0000B8",
+                "start-time": "2024-05-02 11:19:26+03",
+                "end-time": "2024-05-02 11:19:39+03",
+                "recovery-xid": 743,
+                "recovery-time": "2024-05-02 11:19:37+03",
+                "data-bytes": 250827955,
+                "wal-bytes": 16777216,
+                "uncompressed-bytes": 578216425,
+                "pgdata-bytes": 578216107,
+                "primary_conninfo": "user=backup channel_binding=prefer host=localhost port=5432 sslmode=prefer sslcompression=0 sslcertmode=allow sslsni=1 ssl_min_protocol_version=TLSv1.2 gssencmode=prefer krbsrvname=postgres gssdelegation=0 target_session_attrs=any load_balance_hosts=disable",
+                "status": "OK",
+                "content-crc": 802820606
+            }
+        ]
+    }
 ]
 </programlisting>
     </refsect3>
@@ -3139,22 +3165,19 @@ pg_probackup show -B <replaceable>backup_dir</replaceable> --instance <replaceab
         run the command:
       </para>
       <programlisting>
-pg_probackup show -B <replaceable>backup_dir</replaceable> [--instance <replaceable>instance_name</replaceable>] --archive
+pg_probackup show -B <replaceable>backup_dir</replaceable> [--instance=<replaceable>instance_name</replaceable>] --archive
 </programlisting>
       <para>
         <application>pg_probackup</application> displays the list of all the available WAL files
         grouped by timelines. For example:
       </para>
-      <programlisting>
+      <programlisting id="pbk-viewing-wal-archive-information-listing-1">
+
 ARCHIVE INSTANCE 'node'
-===================================================================================================================================
- TLI  Parent TLI  Switchpoint  Min Segno                 Max Segno                 N segments  Size    Zratio  N backups  Status
-===================================================================================================================================
- 5    1           0/B000000    00000005000000000000000B  00000005000000000000000C  2           685kB   48.00   0          OK
- 4    3           0/18000000   000000040000000000000018  00000004000000000000001A  3           648kB   77.00   0          OK
- 3    2           0/15000000   000000030000000000000015  000000030000000000000017  3           648kB   77.00   0          OK
- 2    1           0/B000108    00000002000000000000000B  000000020000000000000015  5           892kB   94.00   1          DEGRADED
- 1    0           0/0          000000010000000000000001  00000001000000000000000A  10          8774kB  19.00   1          OK
+================================================================================================================================
+ TLI  Parent TLI  Switchpoint  Min Segno                 Max Segno                 N segments  Size   Zratio  N backups  Status 
+================================================================================================================================
+ 1    0           0/0          000000010000000000000019  00000001000000000000004D  53          848MB  1.00    5          OK     
 </programlisting>
       <para>
         For each timeline, the following information is provided:
@@ -3238,219 +3261,176 @@ ARCHIVE INSTANCE 'node'
         format, run the command:
       </para>
       <programlisting>
-pg_probackup show -B <replaceable>backup_dir</replaceable> [--instance <replaceable>instance_name</replaceable>] --archive --format=json
+pg_probackup show -B <replaceable>backup_dir</replaceable> [--instance=<replaceable>instance_name</replaceable>] --archive --format=json
 </programlisting>
       <para>
         The sample output is as follows:
       </para>
-      <programlisting>
+      <programlisting id="pbk-viewing-wal-archive-information-listing-2">
 [
-  {
-      "instance": "replica",
-      "timelines": [
-          {
-              "tli": 5,
-              "parent-tli": 1,
-              "switchpoint": "0/B000000",
-              "min-segno": "00000005000000000000000B",
-              "max-segno": "00000005000000000000000C",
-              "n-segments": 2,
-              "size": 685320,
-              "zratio": 48.00,
-              "closest-backup-id": "PXS92O",
-              "status": "OK",
-              "lost-segments": [],
-              "backups": []
-          },
-          {
-              "tli": 4,
-              "parent-tli": 3,
-              "switchpoint": "0/18000000",
-              "min-segno": "000000040000000000000018",
-              "max-segno": "00000004000000000000001A",
-              "n-segments": 3,
-              "size": 648625,
-              "zratio": 77.00,
-              "closest-backup-id": "PXS9CE",
-              "status": "OK",
-              "lost-segments": [],
-              "backups": []
-          },
-          {
-              "tli": 3,
-              "parent-tli": 2,
-              "switchpoint": "0/15000000",
-              "min-segno": "000000030000000000000015",
-              "max-segno": "000000030000000000000017",
-              "n-segments": 3,
-              "size": 648911,
-              "zratio": 77.00,
-              "closest-backup-id": "PXS9CE",
-              "status": "OK",
-              "lost-segments": [],
-              "backups": []
-          },
-          {
-              "tli": 2,
-              "parent-tli": 1,
-              "switchpoint": "0/B000108",
-              "min-segno": "00000002000000000000000B",
-              "max-segno": "000000020000000000000015",
-              "n-segments": 5,
-              "size": 892173,
-              "zratio": 94.00,
-              "closest-backup-id": "PXS92O",
-              "status": "DEGRADED",
-              "lost-segments": [
-                  {
-                      "begin-segno": "00000002000000000000000D",
-                      "end-segno": "00000002000000000000000E"
-                  },
-                  {
-                      "begin-segno": "000000020000000000000010",
-                      "end-segno": "000000020000000000000012"
-                  }
-              ],
-              "backups": [
-                  {
-                      "id": "PXS9CE",
-                      "backup-mode": "FULL",
-                      "wal": "ARCHIVE",
-                      "compress-alg": "none",
-                      "compress-level": 1,
-                      "from-replica": "false",
-                      "block-size": 8192,
-                      "xlog-block-size": 8192,
-                      "checksum-version": 1,
-                      "program-version": "2.1.5",
-                      "server-version": "10",
-                      "current-tli": 2,
-                      "parent-tli": 0,
-                      "start-lsn": "0/C000028",
-                      "stop-lsn": "0/C000160",
-                      "start-time": "2019-09-13 21:43:26+03",
-                      "end-time": "2019-09-13 21:43:30+03",
-                      "recovery-xid": 0,
-                      "recovery-time": "2019-09-13 21:43:29+03",
-                      "data-bytes": 104674852,
-                      "wal-bytes": 16777216,
-                      "primary_conninfo": "user=backup passfile=/var/lib/pgsql/.pgpass port=5432 sslmode=disable sslcompression=1 target_session_attrs=any",
-                      "status": "OK"
-                  }
-              ]
-          },
-          {
-              "tli": 1,
-              "parent-tli": 0,
-              "switchpoint": "0/0",
-              "min-segno": "000000010000000000000001",
-              "max-segno": "00000001000000000000000A",
-              "n-segments": 10,
-              "size": 8774805,
-              "zratio": 19.00,
-              "closest-backup-id": "",
-              "status": "OK",
-              "lost-segments": [],
-              "backups": [
-                  {
-                      "id": "PXS92O",
-                      "backup-mode": "FULL",
-                      "wal": "ARCHIVE",
-                      "compress-alg": "none",
-                      "compress-level": 1,
-                      "from-replica": "true",
-                      "block-size": 8192,
-                      "xlog-block-size": 8192,
-                      "checksum-version": 1,
-                      "program-version": "2.1.5",
-                      "server-version": "10",
-                      "current-tli": 1,
-                      "parent-tli": 0,
-                      "start-lsn": "0/4000028",
-                      "stop-lsn": "0/6000028",
-                      "start-time": "2019-09-13 21:37:36+03",
-                      "end-time": "2019-09-13 21:38:45+03",
-                      "recovery-xid": 0,
-                      "recovery-time": "2019-09-13 21:37:30+03",
-                      "data-bytes": 25987319,
-                      "wal-bytes": 50331648,
-                      "primary_conninfo": "user=backup passfile=/var/lib/pgsql/.pgpass port=5432 sslmode=disable sslcompression=1 target_session_attrs=any",
-                      "status": "OK"
-                  }
-              ]
-          }
-      ]
-  },
-  {
-      "instance": "master",
-      "timelines": [
-          {
-              "tli": 1,
-              "parent-tli": 0,
-              "switchpoint": "0/0",
-              "min-segno": "000000010000000000000001",
-              "max-segno": "00000001000000000000000B",
-              "n-segments": 11,
-              "size": 8860892,
-              "zratio": 20.00,
-              "status": "OK",
-              "lost-segments": [],
-              "backups": [
-                  {
-                      "id": "PXS92H",
-                      "parent-backup-id": "PXS92C",
-                      "backup-mode": "PAGE",
-                      "wal": "ARCHIVE",
-                      "compress-alg": "none",
-                      "compress-level": 1,
-                      "from-replica": "false",
-                      "block-size": 8192,
-                      "xlog-block-size": 8192,
-                      "checksum-version": 1,
-                      "program-version": "2.1.5",
-                      "server-version": "10",
-                      "current-tli": 1,
-                      "parent-tli": 1,
-                      "start-lsn": "0/4000028",
-                      "stop-lsn": "0/50000B8",
-                      "start-time": "2019-09-13 21:37:29+03",
-                      "end-time": "2019-09-13 21:37:31+03",
-                      "recovery-xid": 0,
-                      "recovery-time": "2019-09-13 21:37:30+03",
-                      "data-bytes": 1328461,
-                      "wal-bytes": 33554432,
-                      "primary_conninfo": "user=backup passfile=/var/lib/pgsql/.pgpass port=5432 sslmode=disable sslcompression=1 target_session_attrs=any",
-                      "status": "OK"
-                  },
-                  {
-                      "id": "PXS92C",
-                      "backup-mode": "FULL",
-                      "wal": "ARCHIVE",
-                      "compress-alg": "none",
-                      "compress-level": 1,
-                      "from-replica": "false",
-                      "block-size": 8192,
-                      "xlog-block-size": 8192,
-                      "checksum-version": 1,
-                      "program-version": "2.1.5",
-                      "server-version": "10",
-                      "current-tli": 1,
-                      "parent-tli": 0,
-                      "start-lsn": "0/2000028",
-                      "stop-lsn": "0/2000160",
-                      "start-time": "2019-09-13 21:37:24+03",
-                      "end-time": "2019-09-13 21:37:29+03",
-                      "recovery-xid": 0,
-                      "recovery-time": "2019-09-13 21:37:28+03",
-                      "data-bytes": 24871902,
-                      "wal-bytes": 16777216,
-                      "primary_conninfo": "user=backup passfile=/var/lib/pgsql/.pgpass port=5432 sslmode=disable sslcompression=1 target_session_attrs=any",
-                      "status": "OK"
-                  }
-              ]
-          }
-      ]
-  }
+    {
+        "instance": "node",
+        "timelines": [
+            {
+                "tli": 1,
+                "parent-tli": 0,
+                "switchpoint": "0/0",
+                "min-segno": "000000010000000000000019",
+                "max-segno": "00000001000000000000004D",
+                "n-segments": 53,
+                "size": 889192448,
+                "zratio": 1.00,
+                "closest-backup-id": "",
+                "status": "OK",
+                "lost-segments": [],
+                "backups": [
+                    {
+                        "id": "SCUN4E",
+                        "backup-mode": "FULL",
+                        "wal": "ARCHIVE",
+                        "compress-alg": "zlib",
+                        "compress-level": 1,
+                        "from-replica": "false",
+                        "block-size": 8192,
+                        "xlog-block-size": 8192,
+                        "checksum-version": 1,
+                        "program-version": "2.5.15",
+                        "server-version": "16",
+                        "current-tli": 1,
+                        "parent-tli": 0,
+                        "start-lsn": "0/4C000028",
+                        "stop-lsn": "0/4D0000B8",
+                        "start-time": "2024-05-02 11:19:26+03",
+                        "end-time": "2024-05-02 11:19:39+03",
+                        "recovery-xid": 743,
+                        "recovery-time": "2024-05-02 11:19:37+03",
+                        "data-bytes": 250827955,
+                        "wal-bytes": 16777216,
+                        "uncompressed-bytes": 578216425,
+                        "pgdata-bytes": 578216107,
+                        "primary_conninfo": "user=backup channel_binding=prefer host=localhost port=5432 sslmode=prefer sslcompression=0 sslcertmode=allow sslsni=1 ssl_min_protocol_version=TLSv1.2 gssencmode=prefer krbsrvname=postgres gssdelegation=0 target_session_attrs=any load_balance_hosts=disable",
+                        "status": "OK",
+                        "content-crc": 802820606
+                    },
+                    {
+                        "id": "SCUN3Y",
+                        "parent-backup-id": "SCUN3M",
+                        "backup-mode": "DELTA",
+                        "wal": "STREAM",
+                        "compress-alg": "zlib",
+                        "compress-level": 1,
+                        "from-replica": "false",
+                        "block-size": 8192,
+                        "xlog-block-size": 8192,
+                        "checksum-version": 1,
+                        "program-version": "2.5.15",
+                        "server-version": "16",
+                        "current-tli": 1,
+                        "parent-tli": 1,
+                        "start-lsn": "0/3C0043A8",
+                        "stop-lsn": "0/46159C70",
+                        "start-time": "2024-05-02 11:19:10+03",
+                        "end-time": "2024-05-02 11:19:17+03",
+                        "recovery-xid": 743,
+                        "recovery-time": "2024-05-02 11:19:16+03",
+                        "data-bytes": 96029293,
+                        "wal-bytes": 218103808,
+                        "uncompressed-bytes": 217639806,
+                        "pgdata-bytes": 578216107,
+                        "primary_conninfo": "user=backup channel_binding=prefer host=localhost port=5432 sslmode=prefer sslcompression=0 sslcertmode=allow sslsni=1 ssl_min_protocol_version=TLSv1.2 gssencmode=prefer krbsrvname=postgres gssdelegation=0 target_session_attrs=any load_balance_hosts=disable",
+                        "status": "OK",
+                        "content-crc": 3074300814
+                    },
+                    {
+                        "id": "SCUN3M",
+                        "parent-backup-id": "SCUN39",
+                        "backup-mode": "PTRACK",
+                        "wal": "STREAM",
+                        "compress-alg": "zlib",
+                        "compress-level": 1,
+                        "from-replica": "false",
+                        "block-size": 8192,
+                        "xlog-block-size": 8192,
+                        "checksum-version": 1,
+                        "program-version": "2.5.15",
+                        "server-version": "16",
+                        "current-tli": 1,
+                        "parent-tli": 1,
+                        "start-lsn": "0/32000028",
+                        "stop-lsn": "0/32005ED0",
+                        "start-time": "2024-05-02 11:18:58+03",
+                        "end-time": "2024-05-02 11:19:08+03",
+                        "recovery-xid": 742,
+                        "recovery-time": "2024-05-02 11:19:01+03",
+                        "data-bytes": 31205704,
+                        "wal-bytes": 16777216,
+                        "uncompressed-bytes": 69585790,
+                        "pgdata-bytes": 509927595,
+                        "primary_conninfo": "user=backup channel_binding=prefer host=localhost port=5432 sslmode=prefer sslcompression=0 sslcertmode=allow sslsni=1 ssl_min_protocol_version=TLSv1.2 gssencmode=prefer krbsrvname=postgres gssdelegation=0 target_session_attrs=any load_balance_hosts=disable",
+                        "status": "OK",
+                        "content-crc": 3446949708
+                    },
+                    {
+                        "id": "SCUN39",
+                        "parent-backup-id": "SCUN2V",
+                        "backup-mode": "PAGE",
+                        "wal": "STREAM",
+                        "compress-alg": "pglz",
+                        "compress-level": 1,
+                        "from-replica": "false",
+                        "block-size": 8192,
+                        "xlog-block-size": 8192,
+                        "checksum-version": 1,
+                        "program-version": "2.5.15",
+                        "server-version": "16",
+                        "current-tli": 1,
+                        "parent-tli": 1,
+                        "start-lsn": "0/2A000028",
+                        "stop-lsn": "0/2B0000B8",
+                        "start-time": "2024-05-02 11:18:45+03",
+                        "end-time": "2024-05-02 11:18:57+03",
+                        "recovery-xid": 741,
+                        "recovery-time": "2024-05-02 11:18:50+03",
+                        "data-bytes": 48381612,
+                        "wal-bytes": 33554432,
+                        "uncompressed-bytes": 69569406,
+                        "pgdata-bytes": 441639083,
+                        "primary_conninfo": "user=backup channel_binding=prefer host=localhost port=5432 sslmode=prefer sslcompression=0 sslcertmode=allow sslsni=1 ssl_min_protocol_version=TLSv1.2 gssencmode=prefer krbsrvname=postgres gssdelegation=0 target_session_attrs=any load_balance_hosts=disable",
+                        "status": "OK",
+                        "content-crc": 3492989773
+                    },
+                    {
+                        "id": "SCUN2V",
+                        "backup-mode": "FULL",
+                        "wal": "STREAM",
+                        "compress-alg": "zlib",
+                        "compress-level": 1,
+                        "from-replica": "false",
+                        "block-size": 8192,
+                        "xlog-block-size": 8192,
+                        "checksum-version": 1,
+                        "program-version": "2.5.15",
+                        "server-version": "16",
+                        "current-tli": 1,
+                        "parent-tli": 0,
+                        "start-lsn": "0/23000028",
+                        "stop-lsn": "0/23000168",
+                        "start-time": "2024-05-02 11:18:31+03",
+                        "end-time": "2024-05-02 11:18:42+03",
+                        "recovery-xid": 740,
+                        "recovery-time": "2024-05-02 11:18:38+03",
+                        "data-bytes": 161084290,
+                        "wal-bytes": 16777216,
+                        "uncompressed-bytes": 373359081,
+                        "pgdata-bytes": 373358763,
+                        "primary_conninfo": "user=backup channel_binding=prefer host=localhost port=5432 sslmode=prefer sslcompression=0 sslcertmode=allow sslsni=1 ssl_min_protocol_version=TLSv1.2 gssencmode=prefer krbsrvname=postgres gssdelegation=0 target_session_attrs=any load_balance_hosts=disable",
+                        "status": "OK",
+                        "content-crc": 1621343133
+                    }
+                ]
+            }
+        ]
+    }
 ]
 </programlisting>
       <para>
@@ -3540,7 +3520,7 @@ pg_probackup show -B <replaceable>backup_dir</replaceable> [--instance <replacea
         for the last seven days:
       </para>
       <programlisting>
-pg_probackup set-config -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> --retention-redundancy=2 --retention-window=7
+pg_probackup set-config -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> --retention-redundancy=2 --retention-window=7
 </programlisting>
 
       <para>
@@ -3558,7 +3538,7 @@ pg_probackup set-config -B <replaceable>backup_dir</replaceable> --instance <rep
         <literal>--delete-expired</literal> flag:
       </para>
       <programlisting>
-pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> --delete-expired
+pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> --delete-expired
 </programlisting>
       <para>
         If you would like to also remove the WAL files that are no
@@ -3566,7 +3546,7 @@ pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance <replace
         <option>--delete-wal</option> flag:
       </para>
       <programlisting>
-pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> --delete-expired --delete-wal
+pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> --delete-expired --delete-wal
 </programlisting>
 
       <para>
@@ -3577,7 +3557,7 @@ pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance <replace
         commands:
       </para>
       <programlisting>
-pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> --delete-expired --retention-window=7 --retention-redundancy=2
+pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> --delete-expired --retention-window=7 --retention-redundancy=2
 </programlisting>
       <para>
         Since incremental backups require that their parent full
@@ -3597,48 +3577,48 @@ pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance <replace
         instance in the <replaceable>backup_dir</replaceable> directory,
         with the <option>--retention-window</option> option set
         to <literal>7</literal>, and you have the following backups
-        available on April 10, 2019:
+        available on May 02, 2024:
       </para>
-      <programlisting>
+      <programlisting id="pbk-retention-policy-listing-1">
 BACKUP INSTANCE 'node'
-===================================================================================================================================
- Instance  Version  ID      Recovery time           Mode   WAL     TLI  Time    Data   WAL  Zratio  Start LSN   Stop LSN    Status
-===================================================================================================================================
- node      10       P7XDHR  2019-04-10 05:27:15+03  FULL   STREAM  1/0   11s   200MB  16MB     1.0  0/18000059  0/18000197  OK
- node      10       P7XDQV  2019-04-08 05:32:59+03  PAGE   STREAM  1/0   11s    19MB  16MB     1.0  0/15000060  0/15000198  OK
- node      10       P7XDJA  2019-04-03 05:28:36+03  DELTA  STREAM  1/0   21s    32MB  16MB     1.0  0/13000028  0/13000198  OK
- -------------------------------------------------------retention window--------------------------------------------------------
- node      10       P7XDHU  2019-04-02 05:27:59+03  PAGE   STREAM  1/0   31s    33MB  16MB     1.0  0/11000028  0/110001D0  OK
- node      10       P7XDHB  2019-04-01 05:27:15+03  FULL   STREAM  1/0   11s   200MB  16MB     1.0  0/F000028   0/F000198   OK
- node      10       P7XDFT  2019-03-29 05:26:25+03  FULL   STREAM  1/0   11s   200MB  16MB     1.0  0/D000028   0/D000198   OK
-</programlisting>
-      <para>
-        Even though <literal>P7XDHB</literal> and <literal>P7XDHU</literal> backups are outside the
+=====================================================================================================================================
+ Instance  Version  ID      Recovery Time           Mode   WAL Mode  TLI  Time    Data   WAL  Zratio  Start LSN   Stop LSN    Status 
+=====================================================================================================================================
+ node      16       SCUN6L  2024-05-02 11:20:48+03  FULL   ARCHIVE   1/0    5s   296MB  16MB    2.30  0/46000028  0/470000B8  OK     
+ node      16       SCQXUI  2024-04-30 11:20:45+03  PAGE   ARCHIVE   1/1    5s  6280kB  16MB    1.00  0/44000028  0/450000F0  OK     
+ node      16       SCFTUG  2024-04-24 11:20:43+03  DELTA  ARCHIVE   1/1    5s  6280kB  16MB    1.00  0/42000028  0/430000B8  OK     
+----------------------------------------------------------retention window-----------------------------------------------------------
+ node      16       SCDZ6D  2024-04-23 11:20:40+03  PAGE   ARCHIVE   1/1    5s  6280kB  16MB    1.00  0/40000028  0/410000B8  OK     
+ node      16       SCC4HX  2024-04-22 11:20:24+03  FULL   ARCHIVE   1/0    5s   296MB  16MB    2.30  0/3E000028  0/3F0000F0  OK     
+ node      16       SC8F5G  2024-04-20 11:20:07+03  FULL   ARCHIVE   1/0    5s   296MB  16MB    2.30  0/3C0000D8  0/3D00BB58  OK     
+</programlisting>
+      <para>
+        Even though <literal id="pbk-retention-policy-backup2-1">SCC4HX</literal> and <literal id="pbk-retention-policy-backup3-1">SCDZ6D</literal> backups are outside the
         retention window, they cannot be removed as it invalidates the
-        succeeding incremental backups <literal>P7XDJA</literal> and <literal>P7XDQV</literal> that are
+        succeeding incremental backups <literal id="pbk-retention-policy-backup4-1">SCFTUG</literal> and <literal id="pbk-retention-policy-backup5">SCQXUI</literal> that are
         still required, so, if you run the
         <xref linkend="pbk-delete"/> command with the
-        <option>--delete-expired</option> flag, only the <literal>P7XDFT</literal> full
+        <option>--delete-expired</option> flag, only the <literal id="pbk-retention-policy-backup1">SC8F5G</literal> full
         backup will be removed.
       </para>
       <para>
-        With the <option>--merge-expired</option> option, the <literal>P7XDJA</literal>
-        backup is merged with the underlying <literal>P7XDHU</literal> and <literal>P7XDHB</literal> backups
+        With the <option>--merge-expired</option> option, the <literal id="pbk-retention-policy-backup4-2">SCFTUG</literal>
+        backup is merged with the underlying <literal id="pbk-retention-policy-backup3-2">SCDZ6D</literal> and <literal id="pbk-retention-policy-backup2-2">SCC4HX</literal> backups
         and becomes a full one, so there is no need to keep these
         expired backups anymore:
       </para>
       <programlisting>
-pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance <replaceable>node</replaceable> --delete-expired --merge-expired
+pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance=<replaceable>node</replaceable> --delete-expired --merge-expired
 pg_probackup show -B <replaceable>backup_dir</replaceable>
 </programlisting>
-      <programlisting>
+      <programlisting id="pbk-retention-policy-listing-2">
 BACKUP INSTANCE 'node'
-==================================================================================================================================
- Instance  Version  ID      Recovery time           Mode  WAL     TLI  Time    Data   WAL  Zratio  Start LSN   Stop LSN    Status
-==================================================================================================================================
- node      10       P7XDHR  2019-04-10 05:27:15+03  FULL  STREAM  1/0   11s   200MB  16MB     1.0  0/18000059  0/18000197  OK
- node      10       P7XDQV  2019-04-08 05:32:59+03  PAGE  STREAM  1/0   11s    19MB  16MB     1.0  0/15000060  0/15000198  OK
- node      10       P7XDJA  2019-04-03 05:28:36+03  FULL  STREAM  1/0   21s    32MB  16MB     1.0  0/13000028  0/13000198  OK
+=====================================================================================================================================
+ Instance  Version  ID      Recovery Time           Mode   WAL Mode  TLI  Time    Data   WAL  Zratio  Start LSN   Stop LSN    Status 
+=====================================================================================================================================
+ node      16       SCUN6L  2024-05-02 11:20:48+03  FULL   ARCHIVE   1/0    5s   296MB  16MB    2.30  0/46000028  0/470000B8  OK     
+ node      16       SCQXUI  2024-04-30 11:20:45+03  PAGE   ARCHIVE   1/1    5s  6280kB  16MB    1.00  0/44000028  0/450000F0  OK     
+ node      16       SCFTUG  2024-04-24 11:20:43+03  FULL   ARCHIVE   1/1    5s   296MB  16MB    1.00  0/42000028  0/430000B8  OK     
 </programlisting>
         <para>
           The <literal>Time</literal> field for the merged backup displays the time
@@ -3654,7 +3634,7 @@ BACKUP INSTANCE 'node'
         for arbitrary time. For example:
       </para>
       <programlisting>
-pg_probackup set-backup -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> -i <replaceable>backup_id</replaceable> --ttl=30d
+pg_probackup set-backup -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> -i <replaceable>backup_id</replaceable> --ttl=30d
 </programlisting>
       <para>
         This command sets the expiration time of the
@@ -3666,7 +3646,7 @@ pg_probackup set-backup -B <replaceable>backup_dir</replaceable> --instance <rep
         using the <option>--expire-time</option> option. For example:
       </para>
       <programlisting>
-pg_probackup set-backup -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> -i <replaceable>backup_id</replaceable> --expire-time="2020-01-01 00:00:00+03"
+pg_probackup set-backup -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> -i <replaceable>backup_id</replaceable> --expire-time="2027-05-02 11:21:00+00"
 </programlisting>
       <para>
         Alternatively, you can use the <option>--ttl</option> and
@@ -3675,23 +3655,23 @@ pg_probackup set-backup -B <replaceable>backup_dir</replaceable> --instance <rep
         created backup:
       </para>
       <programlisting>
-pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> -b FULL --ttl=30d
-pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> -b FULL --expire-time="2020-01-01 00:00:00+03"
+pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> -b FULL --ttl=30d
+pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> -b FULL --expire-time="2027-05-02 11:21:00+00"
 </programlisting>
       <para>
         To check if the backup is pinned,
         run the <xref linkend="pbk-show"/> command:
       <programlisting>
-pg_probackup show -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> -i <replaceable>backup_id</replaceable>
+pg_probackup show -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> -i <replaceable>backup_id</replaceable>
 </programlisting>
       </para>
       <para>
         If the backup is pinned, it has the <literal>expire-time</literal>
         attribute that displays its expiration time:
-      <programlisting>
+      <programlisting id="pbk-backup-pinning-listing">
 ...
-recovery-time = '2017-05-16 12:57:31'
-expire-time = '2020-01-01 00:00:00+03'
+recovery-time = '2024-05-02 11:21:00+00'
+expire-time = '2027-05-02 11:21:00+00'
 data-bytes = 22288792
 ...
 </programlisting>
@@ -3700,7 +3680,7 @@ data-bytes = 22288792
         You can unpin the backup by setting the <option>--ttl</option> option to zero:
       </para>
       <programlisting>
-pg_probackup set-backup -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> -i <replaceable>backup_id</replaceable> --ttl=0
+pg_probackup set-backup -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> -i <replaceable>backup_id</replaceable> --ttl=0
 </programlisting>
 
       <note>
@@ -3764,19 +3744,18 @@ pg_probackup set-backup -B <replaceable>backup_dir</replaceable> --instance <rep
         archiving</link>:
       </para>
       <programlisting>
-pg_probackup show -B <replaceable>backup_dir</replaceable> --instance <replaceable>node</replaceable>
+pg_probackup show -B <replaceable>backup_dir</replaceable> --instance=<replaceable>node</replaceable>
 </programlisting>
-      <programlisting>
-BACKUP INSTANCE 'node'
-====================================================================================================================================
- Instance  Version  ID      Recovery Time           Mode   WAL Mode  TLI  Time   Data   WAL  Zratio  Start LSN   Stop LSN    Status
-====================================================================================================================================
- node      11       PZ9442  2019-10-12 10:43:21+03  DELTA  STREAM    1/0   10s  121kB  16MB    1.00  0/46000028  0/46000160  OK
- node      11       PZ943L  2019-10-12 10:43:04+03  FULL   STREAM    1/0   10s  180MB  32MB    1.00  0/44000028  0/44000160  OK
- node      11       PZ7YR5  2019-10-11 19:49:56+03  DELTA  STREAM    1/1   10s  112kB  32MB    1.00  0/41000028  0/41000160  OK
- node      11       PZ7YMP  2019-10-11 19:47:16+03  DELTA  STREAM    1/1   10s  376kB  32MB    1.00  0/3E000028  0/3F0000B8  OK
- node      11       PZ7YK2  2019-10-11 19:45:45+03  FULL   STREAM    1/0   11s  180MB  16MB    1.00  0/3C000028  0/3C000198  OK
- node      11       PZ7YFO  2019-10-11 19:43:04+03  FULL   STREAM    1/0   10s   30MB  16MB    1.00  0/2000028   0/200ADD8   OK
+      <programlisting id="pbk-wal-archive-retention-policy-listing-1">
+======================================================================================================================================
+ Instance  Version  ID      Recovery Time           Mode   WAL Mode  TLI  Time    Data    WAL  Zratio  Start LSN   Stop LSN    Status 
+======================================================================================================================================
+ node      16       SCUN92  2024-05-02 11:22:16+03  DELTA  STREAM    1/1    9s  1162kB   32MB    1.08  0/7C000028  0/7C000168  OK     
+ node      16       SCUN8N  2024-05-02 11:22:09+03  FULL   STREAM    1/0   12s   296MB   16MB    2.30  0/7A000028  0/7A009A08  OK     
+ node      16       SCUN8I  2024-05-02 11:21:55+03  DELTA  STREAM    1/1    5s  1148kB   32MB    1.01  0/78000028  0/78000168  OK     
+ node      16       SCUN86  2024-05-02 11:21:47+03  DELTA  STREAM    1/1   11s   120MB   16MB    2.27  0/76000028  0/760001A0  OK     
+ node      16       SCUN7I  2024-05-02 11:21:29+03  FULL   STREAM    1/0   22s   296MB  288MB    2.30  0/63012FE8  0/74E7ADA0  OK     
+ node      16       SCUN71  2024-05-02 11:21:12+03  FULL   STREAM    1/0   13s   296MB  272MB    2.30  0/49000028  0/573683B8  OK     
 </programlisting>
       <para>
         You can check the state of the WAL archive by running the
@@ -3784,28 +3763,30 @@ BACKUP INSTANCE 'node'
         <option>--archive</option> flag:
       </para>
       <programlisting>
-pg_probackup show -B <replaceable>backup_dir</replaceable> --instance node --archive
+pg_probackup show -B <replaceable>backup_dir</replaceable> --instance=node --archive
 </programlisting>
-      <programlisting>
+      <programlisting id="pbk-wal-archive-retention-policy-listing-2">
+
 ARCHIVE INSTANCE 'node'
-===============================================================================================================================
- TLI  Parent TLI  Switchpoint  Min Segno                 Max Segno                 N segments  Size  Zratio  N backups  Status
-===============================================================================================================================
- 1    0           0/0          000000010000000000000001  000000010000000000000047  71          36MB  31.00   6          OK
+================================================================================================================================
+ TLI  Parent TLI  Switchpoint  Min Segno                 Max Segno                 N segments  Size   Zratio  N backups  Status 
+================================================================================================================================
+ 1    0           0/0          000000010000000000000048  00000001000000000000007C  53          848MB  1.00    6          OK     
 </programlisting>
       <para>
         WAL purge without <option>--wal-depth</option> cannot
         achieve much, only one segment is removed:
       </para>
       <programlisting>
-pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance node --delete-wal
+pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance=node --delete-wal
 </programlisting>
-      <programlisting>
+      <programlisting id="pbk-wal-archive-retention-policy-listing-3">
+
 ARCHIVE INSTANCE 'node'
-===============================================================================================================================
- TLI  Parent TLI  Switchpoint  Min Segno                 Max Segno                 N segments  Size  Zratio  N backups  Status
-===============================================================================================================================
- 1    0           0/0          000000010000000000000002  000000010000000000000047  70          34MB  32.00   6          OK
+================================================================================================================================
+ TLI  Parent TLI  Switchpoint  Min Segno                 Max Segno                 N segments  Size   Zratio  N backups  Status 
+================================================================================================================================
+ 1    0           0/0          000000010000000000000049  00000001000000000000007C  52          832MB  1.00    6          OK     
 </programlisting>
       <para>
         If you would like, for example, to keep only those WAL
@@ -3813,28 +3794,30 @@ ARCHIVE INSTANCE 'node'
         <option>--wal-depth</option> option to 1:
       </para>
       <programlisting>
-pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance node --delete-wal --wal-depth=1
+pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance=node --delete-wal --wal-depth=1
 </programlisting>
-      <programlisting>
+      <programlisting id="pbk-wal-archive-retention-policy-listing-4">
+
 ARCHIVE INSTANCE 'node'
-================================================================================================================================
- TLI  Parent TLI  Switchpoint  Min Segno                 Max Segno                 N segments  Size   Zratio  N backups  Status
-================================================================================================================================
- 1    0           0/0          000000010000000000000046  000000010000000000000047  2           143kB  228.00  6          OK
+===============================================================================================================================
+ TLI  Parent TLI  Switchpoint  Min Segno                 Max Segno                 N segments  Size  Zratio  N backups  Status 
+===============================================================================================================================
+ 1    0           0/0          00000001000000000000007C  00000001000000000000007C  1           16MB  1.00    6          OK     
 </programlisting>
       <para>
         Alternatively, you can use the <option>--wal-depth</option>
         option with the <xref linkend="pbk-backup"/> command:
       </para>
       <programlisting>
-pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance node -b DELTA --wal-depth=1 --delete-wal
+pg_probackup backup -B <replaceable>backup_dir</replaceable> --instance=node -b DELTA --wal-depth=1 --delete-wal
 </programlisting>
-      <programlisting>
+      <programlisting id="pbk-wal-archive-retention-policy-listing-5">
+
 ARCHIVE INSTANCE 'node'
 ===============================================================================================================================
- TLI  Parent TLI  Switchpoint  Min Segno                 Max Segno                 N segments  Size  Zratio  N backups  Status
+ TLI  Parent TLI  Switchpoint  Min Segno                 Max Segno                 N segments  Size  Zratio  N backups  Status 
 ===============================================================================================================================
- 1    0           0/0          000000010000000000000048  000000010000000000000049  1           72kB  228.00  7          OK
+ 1    0           0/0          00000001000000000000007E  00000001000000000000007E  1           16MB  1.00    7          OK     
 </programlisting>
     </refsect3>
   </refsect2>
@@ -3848,7 +3831,7 @@ ARCHIVE INSTANCE 'node'
       recent incremental backup you would like to merge:
     </para>
     <programlisting>
-pg_probackup merge -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> -i <replaceable>backup_id</replaceable>
+pg_probackup merge -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> -i <replaceable>backup_id</replaceable>
 </programlisting>
     <para>
       This command merges backups that belong to a common incremental backup
@@ -3870,7 +3853,7 @@ pg_probackup merge -B <replaceable>backup_dir</replaceable> --instance <replacea
       command with the backup ID:
     </para>
     <programlisting>
-pg_probackup show -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> -i <replaceable>backup_id</replaceable>
+pg_probackup show -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> -i <replaceable>backup_id</replaceable>
 </programlisting>
     <para>
       If the merge is still in progress, the backup status is
@@ -3888,7 +3871,7 @@ pg_probackup show -B <replaceable>backup_dir</replaceable> --instance <replaceab
       command:
     </para>
     <programlisting>
-pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> -i <replaceable>backup_id</replaceable>
+pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> -i <replaceable>backup_id</replaceable>
 </programlisting>
     <para>
       This command will delete the backup with the specified
@@ -3904,7 +3887,7 @@ pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance <replace
       <option>--delete-wal</option> flag:
     </para>
     <programlisting>
-pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> --delete-wal
+pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> --delete-wal
 </programlisting>
     <para>
       To delete backups that are expired according to the current
@@ -3912,7 +3895,7 @@ pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance <replace
       flag:
     </para>
     <programlisting>
-pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> --delete-expired
+pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> --delete-expired
 </programlisting>
     <para>
       Expired backups cannot be removed while at least one
@@ -3923,7 +3906,7 @@ pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance <replace
       command:
     </para>
     <programlisting>
-pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> --delete-expired --merge-expired
+pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> --delete-expired --merge-expired
 </programlisting>
     <para>
       In this case, <application>pg_probackup</application> searches for the oldest incremental
@@ -3943,7 +3926,7 @@ pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance <replace
       To delete all backups with specific status, use the <option>--status</option>:
     </para>
     <programlisting>
-pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> --status=ERROR
+pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> --status=ERROR
     </programlisting>
 
     <para>
@@ -3997,10 +3980,7 @@ pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance <replace
         <listitem>
           <para>
            DDL commands
-           <ulink url="https://postgrespro.com/docs/postgresql/current/sql-createtablespace"
-           ><command>CREATE TABLESPACE</command></ulink
-           >/<ulink url="https://postgrespro.com/docs/postgresql/current/sql-droptablespace"
-           ><command>DROP TABLESPACE</command></ulink>
+           <ulink url="https://postgrespro.com/docs/postgresql/current/sql-createtablespace"><command>CREATE TABLESPACE</command></ulink>/<ulink url="https://postgrespro.com/docs/postgresql/current/sql-droptablespace"><command>DROP TABLESPACE</command></ulink>
            cannot be run simultaneously with <command>catchup</command>.
           </para>
         </listitem>
@@ -4181,7 +4161,7 @@ pg_probackup init -B <replaceable>backup_dir</replaceable> [--help]
     <refsect3 id="pbk-add-instance" xreflabel="add-instance">
       <title>Codestin Search App</title>
       <programlisting>
-pg_probackup add-instance -B <replaceable>backup_dir</replaceable> -D <replaceable>data_dir</replaceable> --instance <replaceable>instance_name</replaceable> [--help]
+pg_probackup add-instance -B <replaceable>backup_dir</replaceable> -D <replaceable>data_dir</replaceable> --instance=<replaceable>instance_name</replaceable> [--help]
 </programlisting>
       <para>
         Initializes a new backup instance inside the backup catalog
@@ -4199,7 +4179,7 @@ pg_probackup add-instance -B <replaceable>backup_dir</replaceable> -D <replaceab
     <refsect3 id="pbk-del-instance" xreflabel="del-instance">
       <title>Codestin Search App</title>
       <programlisting>
-pg_probackup del-instance -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> [--help]
+pg_probackup del-instance -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> [--help]
 </programlisting>
       <para>
         Deletes all backups and WAL files associated with the
@@ -4209,7 +4189,7 @@ pg_probackup del-instance -B <replaceable>backup_dir</replaceable> --instance <r
     <refsect3 id="pbk-set-config" xreflabel="set-config">
       <title>Codestin Search App</title>
       <programlisting>
-pg_probackup set-config -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable>
+pg_probackup set-config -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable>
 [--help] [--pgdata=<replaceable>pgdata-path</replaceable>]
 [--retention-redundancy=<replaceable>redundancy</replaceable>][--retention-window=<replaceable>window</replaceable>][--wal-depth=<replaceable>wal_depth</replaceable>]
 [--compress-algorithm=<replaceable>compression_algorithm</replaceable>] [--compress-level=<replaceable>compression_level</replaceable>]
@@ -4235,7 +4215,7 @@ pg_probackup set-config -B <replaceable>backup_dir</replaceable> --instance <rep
     <refsect3 id="pbk-set-backup" xreflabel="set-backup">
       <title>Codestin Search App</title>
       <programlisting>
-pg_probackup set-backup -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> -i <replaceable>backup_id</replaceable>
+pg_probackup set-backup -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> -i <replaceable>backup_id</replaceable>
 {--ttl=<replaceable>ttl</replaceable> | --expire-time=<replaceable>time</replaceable>}
 [--note=<replaceable>backup_note</replaceable>] [--help]
 </programlisting>
@@ -4266,7 +4246,7 @@ pg_probackup set-backup -B <replaceable>backup_dir</replaceable> --instance <rep
     <refsect3 id="pbk-show-config" xreflabel="show-config">
       <title>Codestin Search App</title>
       <programlisting>
-pg_probackup show-config -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> [--format=plain|json]
+pg_probackup show-config -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> [--format=plain|json]
 [--no-scale-units] [<replaceable>logging_options</replaceable>]
 </programlisting>
       <para>
@@ -4299,7 +4279,7 @@ pg_probackup show-config -B <replaceable>backup_dir</replaceable> --instance <re
       <title>Codestin Search App</title>
       <programlisting>
 pg_probackup show -B <replaceable>backup_dir</replaceable>
-[--help] [--instance <replaceable>instance_name</replaceable> [-i <replaceable>backup_id</replaceable> | --archive]] [--format=plain|json] [--no-color]
+[--help] [--instance=<replaceable>instance_name</replaceable> [-i <replaceable>backup_id</replaceable> | --archive]] [--format=plain|json] [--no-color]
 </programlisting>
       <para>
         Shows the contents of the backup catalog. If
@@ -4328,7 +4308,7 @@ pg_probackup show -B <replaceable>backup_dir</replaceable>
     <refsect3 id="pbk-backup" xreflabel="backup">
       <title>Codestin Search App</title>
       <programlisting>
-pg_probackup backup -B <replaceable>backup_dir</replaceable> -b <replaceable>backup_mode</replaceable> --instance <replaceable>instance_name</replaceable>
+pg_probackup backup -B <replaceable>backup_dir</replaceable> -b <replaceable>backup_mode</replaceable> --instance=<replaceable>instance_name</replaceable>
 [--help] [-j <replaceable>num_threads</replaceable>] [--progress]
 [-C] [--stream [-S slot_name] [--temp-slot]] [--backup-pg-log]
 [--no-validate] [--skip-block-validation]
@@ -4511,7 +4491,7 @@ pg_probackup backup -B <replaceable>backup_dir</replaceable> -b <replaceable>bac
     <refsect3 id="pbk-restore" xreflabel="restore">
       <title>Codestin Search App</title>
       <programlisting>
-pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable>
+pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable>
 [--help] [-D <replaceable>data_dir</replaceable>] [-i <replaceable>backup_id</replaceable>]
 [-j <replaceable>num_threads</replaceable>] [--progress]
 [-T <replaceable>OLDDIR</replaceable>=<replaceable>NEWDIR</replaceable>] [--external-mapping=<replaceable>OLDDIR</replaceable>=<replaceable>NEWDIR</replaceable>] [--skip-external-dirs]
@@ -4722,7 +4702,7 @@ pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replac
       <title>Codestin Search App</title>
       <programlisting>
 pg_probackup checkdb
-[-B <replaceable>backup_dir</replaceable>] [--instance <replaceable>instance_name</replaceable>] [-D <replaceable>data_dir</replaceable>]
+[-B <replaceable>backup_dir</replaceable>] [--instance=<replaceable>instance_name</replaceable>] [-D <replaceable>data_dir</replaceable>]
 [--help] [-j <replaceable>num_threads</replaceable>] [--progress]
 [--amcheck [--skip-block-validation] [--checkunique] [--heapallindexed]]
 [<replaceable>connection_options</replaceable>] [<replaceable>logging_options</replaceable>]
@@ -4812,7 +4792,7 @@ pg_probackup checkdb
       <title>Codestin Search App</title>
       <programlisting>
 pg_probackup validate -B <replaceable>backup_dir</replaceable>
-[--help] [--instance <replaceable>instance_name</replaceable>] [-i <replaceable>backup_id</replaceable>]
+[--help] [--instance=<replaceable>instance_name</replaceable>] [-i <replaceable>backup_id</replaceable>]
 [-j <replaceable>num_threads</replaceable>] [--progress]
 [--skip-block-validation]
 [<replaceable>recovery_target_options</replaceable>] [<replaceable>logging_options</replaceable>]
@@ -4840,7 +4820,7 @@ pg_probackup validate -B <replaceable>backup_dir</replaceable>
     <refsect3 id="pbk-merge" xreflabel="merge">
       <title>Codestin Search App</title>
       <programlisting>
-pg_probackup merge -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> -i <replaceable>backup_id</replaceable>
+pg_probackup merge -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> -i <replaceable>backup_id</replaceable>
 [--help] [-j <replaceable>num_threads</replaceable>] [--progress] [--no-validate] [--no-sync]
 [<replaceable>logging_options</replaceable>]
 </programlisting>
@@ -4884,7 +4864,7 @@ pg_probackup merge -B <replaceable>backup_dir</replaceable> --instance <replacea
     <refsect3 id="pbk-delete" xreflabel="delete">
       <title>Codestin Search App</title>
       <programlisting>
-pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable>
+pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable>
 [--help] [-j <replaceable>num_threads</replaceable>] [--progress]
 [--retention-redundancy=<replaceable>redundancy</replaceable>][--retention-window=<replaceable>window</replaceable>][--wal-depth=<replaceable>wal_depth</replaceable>] [--delete-wal]
 {-i <replaceable>backup_id</replaceable> | --delete-expired [--merge-expired] | --merge-expired | --status=backup_status}
@@ -4931,7 +4911,7 @@ pg_probackup delete -B <replaceable>backup_dir</replaceable> --instance <replace
     <refsect3 id="pbk-archive-push" xreflabel="archive-push">
       <title>Codestin Search App</title>
       <programlisting>
-pg_probackup archive-push -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable>
+pg_probackup archive-push -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable>
 --wal-file-name=<replaceable>wal_file_name</replaceable> [--wal-file-path=<replaceable>wal_file_path</replaceable>]
 [--help] [--no-sync] [--compress] [--no-ready-rename] [--overwrite]
 [-j <replaceable>num_threads</replaceable>] [--batch-size=<replaceable>batch_size</replaceable>]
@@ -4997,7 +4977,7 @@ pg_probackup archive-push -B <replaceable>backup_dir</replaceable> --instance <r
     <refsect3 id="pbk-archive-get" xreflabel="archive-get">
       <title>Codestin Search App</title>
       <programlisting>
-pg_probackup archive-get -B <replaceable>backup_dir</replaceable> --instance <replaceable>instance_name</replaceable> --wal-file-path=<replaceable>wal_file_path</replaceable> --wal-file-name=<replaceable>wal_file_name</replaceable>
+pg_probackup archive-get -B <replaceable>backup_dir</replaceable> --instance=<replaceable>instance_name</replaceable> --wal-file-path=<replaceable>wal_file_path</replaceable> --wal-file-name=<replaceable>wal_file_name</replaceable>
 [-j <replaceable>num_threads</replaceable>] [--batch-size=<replaceable>batch_size</replaceable>]
 [--prefetch-dir=<replaceable>prefetch_dir_path</replaceable>] [--no-validate-wal]
 [--help] [<replaceable>remote_options</replaceable>] [<replaceable>logging_options</replaceable>]
@@ -5225,14 +5205,14 @@ pg_probackup catchup -b <replaceable>catchup_mode</replaceable>
       <varlistentry>
 <term><option>-B <replaceable>directory</replaceable></option></term>
 <term><option>--backup-path=<replaceable>directory</replaceable></option></term>
-<term><envar>BACKUP_DIR</envar></term>
+<term><envar>BACKUP_PATH</envar></term>
       <listitem>
       <para>
         Specifies the absolute path to the backup catalog. Backup
         catalog is a directory where all backup files and meta
         information are stored. Since this option is required for most
         of the <application>pg_probackup</application> commands, you are recommended to specify
-        it once in the <envar>BACKUP_DIR</envar> environment variable. In this case,
+        it once in the <envar>BACKUP_PATH</envar> environment variable. In this case,
         you do not need to use this option each time on the command
         line.
       </para>
@@ -5375,7 +5355,7 @@ pg_probackup catchup -b <replaceable>catchup_mode</replaceable>
         If the time zone offset is not specified, the local time zone is used.
       </para>
       <para>
-       Example: <literal>--recovery-target-time="2020-01-01 00:00:00+03"</literal>
+       Example: <literal>--recovery-target-time="2027-05-02 11:21:00+00"</literal>
       </para>
       </listitem>
       </varlistentry>
@@ -5565,7 +5545,7 @@ pg_probackup catchup -b <replaceable>catchup_mode</replaceable>
           If the time zone offset is not specified, the local time zone is used.
       </para>
       <para>
-       Example: <literal>--expire-time="2020-01-01 00:00:00+03"</literal>
+       Example: <literal>--expire-time="2027-05-02 11:21:00+00"</literal>
       </para>
       </listitem>
       </varlistentry>
@@ -5692,7 +5672,7 @@ pg_probackup catchup -b <replaceable>catchup_mode</replaceable>
         lazily, when the first log message is written.
       </para>
       <para>
-       Default: <filename>$BACKUP_DIR/log/</filename>
+       Default: <filename>$BACKUP_PATH/log/</filename>
       </para>
       </listitem>
       </varlistentry>
@@ -5775,7 +5755,7 @@ pg_probackup catchup -b <replaceable>catchup_mode</replaceable>
         reached, the log file is rotated once a <application>pg_probackup</application> command
         is launched, except <command>help</command> and <command>version</command> commands. The time of the
         last log file creation is stored in
-        <filename>$BACKUP_DIR/log/log_rotation</filename>. The zero value disables
+        <filename>$BACKUP_PATH/log/log_rotation</filename>. The zero value disables
         time-based rotation. Supported units: ms, s, min, h, d (min by
         default).
       </para>
diff --git a/po/ru.po b/po/ru.po
index 30f50f797..1263675c2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -811,7 +811,7 @@ msgstr ""
 #: src/help.c:360 src/help.c:521 src/help.c:588 src/help.c:635 src/help.c:715
 #: src/help.c:761 src/help.c:833
 #, c-format
-msgid "                                   directory for file logging (default: BACKUP_DIR/log)\n"
+msgid "                                   directory for file logging (default: BACKUP_PATH/log)\n"
 msgstr ""
 
 #: src/help.c:361 src/help.c:522 src/help.c:589 src/help.c:636 src/help.c:716
diff --git a/src/archive.c b/src/archive.c
index e97a1ade8..7d753c8b3 100644
--- a/src/archive.c
+++ b/src/archive.c
@@ -113,7 +113,7 @@ static parray *setup_push_filelist(const char *archive_status_dir,
  * set archive_command to
  * 'pg_probackup archive-push -B /home/anastasia/backup --wal-file-name %f',
  * to move backups into arclog_path.
- * Where archlog_path is $BACKUP_DIR/wal/instance_name
+ * Where archlog_path is $BACKUP_PATH/wal/instance_name
  */
 void
 do_archive_push(InstanceState *instanceState, InstanceConfig *instance, char *pg_xlog_dir,
@@ -1126,7 +1126,7 @@ do_archive_get(InstanceState *instanceState, InstanceConfig *instance, const cha
 	join_path_components(absolute_wal_file_path, current_dir, wal_file_path);
 
 	/* full filepath to WAL file in archive directory.
-	 * $BACKUP_DIR/wal/instance_name/000000010000000000000001 */
+	 * $BACKUP_PATH/wal/instance_name/000000010000000000000001 */
 	join_path_components(backup_wal_file_path, instanceState->instance_wal_subdir_path, wal_file_name);
 
 	INSTR_TIME_SET_CURRENT(start_time);
diff --git a/src/catalog.c b/src/catalog.c
index 4da406af3..b29090789 100644
--- a/src/catalog.c
+++ b/src/catalog.c
@@ -1437,7 +1437,7 @@ get_multi_timeline_parent(parray *backup_list, parray *tli_list,
 }
 
 /*
- * Create backup directory in $BACKUP_DIR
+ * Create backup directory in $BACKUP_PATH
  * (with proposed backup->backup_id)
  * and initialize this directory.
  * If creation of directory fails, then
diff --git a/src/help.c b/src/help.c
index 48cc1f524..e18706a13 100644
--- a/src/help.c
+++ b/src/help.c
@@ -372,7 +372,7 @@ help_backup(void)
 	printf(_("      --error-log-filename=error-log-filename\n"));
 	printf(_("                                   filename for error logging (default: none)\n"));
 	printf(_("      --log-directory=log-directory\n"));
-	printf(_("                                   directory for file logging (default: BACKUP_DIR/log)\n"));
+	printf(_("                                   directory for file logging (default: BACKUP_PATH/log)\n"));
 	printf(_("      --log-rotation-size=log-rotation-size\n"));
 	printf(_("                                   rotate logfile if its size exceeds this value; 0 disables; (default: 0)\n"));
 	printf(_("                                   available units: 'kB', 'MB', 'GB', 'TB' (default: kB)\n"));
@@ -548,7 +548,7 @@ help_restore(void)
 	printf(_("      --error-log-filename=error-log-filename\n"));
 	printf(_("                                   filename for error logging (default: none)\n"));
 	printf(_("      --log-directory=log-directory\n"));
-	printf(_("                                   directory for file logging (default: BACKUP_DIR/log)\n"));
+	printf(_("                                   directory for file logging (default: BACKUP_PATH/log)\n"));
 	printf(_("      --log-rotation-size=log-rotation-size\n"));
 	printf(_("                                   rotate logfile if its size exceeds this value; 0 disables; (default: 0)\n"));
 	printf(_("                                   available units: 'kB', 'MB', 'GB', 'TB' (default: kB)\n"));
@@ -621,7 +621,7 @@ help_validate(void)
 	printf(_("      --error-log-filename=error-log-filename\n"));
 	printf(_("                                   filename for error logging (default: none)\n"));
 	printf(_("      --log-directory=log-directory\n"));
-	printf(_("                                   directory for file logging (default: BACKUP_DIR/log)\n"));
+	printf(_("                                   directory for file logging (default: BACKUP_PATH/log)\n"));
 	printf(_("      --log-rotation-size=log-rotation-size\n"));
 	printf(_("                                   rotate logfile if its size exceeds this value; 0 disables; (default: 0)\n"));
 	printf(_("                                   available units: 'kB', 'MB', 'GB', 'TB' (default: kB)\n"));
@@ -674,7 +674,7 @@ help_checkdb(void)
 	printf(_("      --error-log-filename=error-log-filename\n"));
 	printf(_("                                   filename for error logging (default: none)\n"));
 	printf(_("      --log-directory=log-directory\n"));
-	printf(_("                                   directory for file logging (default: BACKUP_DIR/log)\n"));
+	printf(_("                                   directory for file logging (default: BACKUP_PATH/log)\n"));
 	printf(_("      --log-rotation-size=log-rotation-size\n"));
 	printf(_("                                   rotate logfile if its size exceeds this value; 0 disables; (default: 0)\n"));
 	printf(_("                                   available units: 'kB', 'MB', 'GB', 'TB' (default: kB)\n"));
@@ -760,7 +760,7 @@ help_delete(void)
 	printf(_("      --error-log-filename=error-log-filename\n"));
 	printf(_("                                   filename for error logging (default: none)\n"));
 	printf(_("      --log-directory=log-directory\n"));
-	printf(_("                                   directory for file logging (default: BACKUP_DIR/log)\n"));
+	printf(_("                                   directory for file logging (default: BACKUP_PATH/log)\n"));
 	printf(_("      --log-rotation-size=log-rotation-size\n"));
 	printf(_("                                   rotate logfile if its size exceeds this value; 0 disables; (default: 0)\n"));
 	printf(_("                                   available units: 'kB', 'MB', 'GB', 'TB' (default: kB)\n"));
@@ -814,7 +814,7 @@ help_merge(void)
 	printf(_("      --error-log-filename=error-log-filename\n"));
 	printf(_("                                   filename for error logging (default: none)\n"));
 	printf(_("      --log-directory=log-directory\n"));
-	printf(_("                                   directory for file logging (default: BACKUP_DIR/log)\n"));
+	printf(_("                                   directory for file logging (default: BACKUP_PATH/log)\n"));
 	printf(_("      --log-rotation-size=log-rotation-size\n"));
 	printf(_("                                   rotate logfile if its size exceeds this value; 0 disables; (default: 0)\n"));
 	printf(_("                                   available units: 'kB', 'MB', 'GB', 'TB' (default: kB)\n"));
@@ -890,7 +890,7 @@ help_set_config(void)
 	printf(_("      --error-log-filename=error-log-filename\n"));
 	printf(_("                                   filename for error logging (default: none)\n"));
 	printf(_("      --log-directory=log-directory\n"));
-	printf(_("                                   directory for file logging (default: BACKUP_DIR/log)\n"));
+	printf(_("                                   directory for file logging (default: BACKUP_PATH/log)\n"));
 	printf(_("      --log-rotation-size=log-rotation-size\n"));
 	printf(_("                                   rotate logfile if its size exceeds this value; 0 disables; (default: 0)\n"));
 	printf(_("                                   available units: 'kB', 'MB', 'GB', 'TB' (default: kB)\n"));
@@ -1002,7 +1002,7 @@ help_add_instance(void)
 	printf(_("      --error-log-filename=error-log-filename\n"));
 	printf(_("                                   filename for error logging (default: none)\n"));
 	printf(_("      --log-directory=log-directory\n"));
-	printf(_("                                   directory for file logging (default: BACKUP_DIR/log)\n"));
+	printf(_("                                   directory for file logging (default: BACKUP_PATH/log)\n"));
 	printf(_("      --log-rotation-size=log-rotation-size\n"));
 	printf(_("                                   rotate logfile if its size exceeds this value; 0 disables; (default: 0)\n"));
 	printf(_("                                   available units: 'kB', 'MB', 'GB', 'TB' (default: kB)\n"));
@@ -1072,7 +1072,7 @@ help_archive_push(void)
 	printf(_("      --error-log-filename=error-log-filename\n"));
 	printf(_("                                   filename for error logging (default: none)\n"));
 	printf(_("      --log-directory=log-directory\n"));
-	printf(_("                                   directory for file logging (default: BACKUP_DIR/log)\n"));
+	printf(_("                                   directory for file logging (default: BACKUP_PATH/log)\n"));
 	printf(_("      --log-rotation-size=log-rotation-size\n"));
 	printf(_("                                   rotate logfile if its size exceeds this value; 0 disables; (default: 0)\n"));
 	printf(_("                                   available units: 'kB', 'MB', 'GB', 'TB' (default: kB)\n"));
@@ -1131,7 +1131,7 @@ help_archive_get(void)
 	printf(_("      --error-log-filename=error-log-filename\n"));
 	printf(_("                                   filename for error logging (default: none)\n"));
 	printf(_("      --log-directory=log-directory\n"));
-	printf(_("                                   directory for file logging (default: BACKUP_DIR/log)\n"));
+	printf(_("                                   directory for file logging (default: BACKUP_PATH/log)\n"));
 	printf(_("      --log-rotation-size=log-rotation-size\n"));
 	printf(_("                                   rotate logfile if its size exceeds this value; 0 disables; (default: 0)\n"));
 	printf(_("                                   available units: 'kB', 'MB', 'GB', 'TB' (default: kB)\n"));
@@ -1221,7 +1221,7 @@ help_catchup(void)
 	printf(_("      --error-log-filename=error-log-filename\n"));
 	printf(_("                                   filename for error logging (default: none)\n"));
 	printf(_("      --log-directory=log-directory\n"));
-	printf(_("                                   directory for file logging (default: BACKUP_DIR/log)\n"));
+	printf(_("                                   directory for file logging (default: BACKUP_PATH/log)\n"));
 	printf(_("      --log-rotation-size=log-rotation-size\n"));
 	printf(_("                                   rotate logfile if its size exceeds this value; 0 disables; (default: 0)\n"));
 	printf(_("                                   available units: 'kB', 'MB', 'GB', 'TB' (default: kB)\n"));
diff --git a/src/pg_probackup.c b/src/pg_probackup.c
index e50b05995..fa67ddff5 100644
--- a/src/pg_probackup.c
+++ b/src/pg_probackup.c
@@ -468,10 +468,10 @@ main(int argc, char *argv[])
 	if (backup_path == NULL)
 	{
 		/*
-		 * If command line argument is not set, try to read BACKUP_DIR
+		 * If command line argument is not set, try to read BACKUP_PATH
 		 * from environment variable
 		 */
-		backup_path = getenv("BACKUP_DIR");
+		backup_path = getenv("BACKUP_PATH");
 	}
 
 	if (backup_path != NULL)
@@ -498,7 +498,7 @@ main(int argc, char *argv[])
 		backup_subcmd != CATCHUP_CMD)
 		elog(ERROR,
 			 "No backup catalog path specified.\n"
-			 "Please specify it either using environment variable BACKUP_DIR or\n"
+			 "Please specify it either using environment variable BACKUP_PATH or\n"
 			 "command line option --backup-path (-B)");
 
 	/* ===== catalogState (END) ======*/
diff --git a/src/pg_probackup.h b/src/pg_probackup.h
index 1f4780f58..ae99e0605 100644
--- a/src/pg_probackup.h
+++ b/src/pg_probackup.h
@@ -356,7 +356,7 @@ typedef enum ShowFormat
 #define BYTES_INVALID		(-1) /* file didn`t changed since previous backup, DELTA backup do not rely on it */
 #define FILE_NOT_FOUND		(-2) /* file disappeared during backup */
 #define BLOCKNUM_INVALID	(-1)
-#define PROGRAM_VERSION	"2.5.14"
+#define PROGRAM_VERSION	"2.5.15"
 
 /* update when remote agent API or behaviour changes */
 #define AGENT_PROTOCOL_VERSION 20509
@@ -837,13 +837,13 @@ typedef struct InstanceState
 	CatalogState *catalog_state;
 
 	char		instance_name[MAXPGPATH]; //previously global var instance_name
-	/* $BACKUP_DIR/backups/instance_name */
+	/* $BACKUP_PATH/backups/instance_name */
 	char		instance_backup_subdir_path[MAXPGPATH];
 
-	/* $BACKUP_DIR/backups/instance_name/BACKUP_CATALOG_CONF_FILE */
+	/* $BACKUP_PATH/backups/instance_name/BACKUP_CATALOG_CONF_FILE */
 	char		instance_config_path[MAXPGPATH];
-
-	/* $BACKUP_DIR/backups/instance_name */
+	
+	/* $BACKUP_PATH/backups/instance_name */
 	char		instance_wal_subdir_path[MAXPGPATH]; // previously global var arclog_path
 
 	/* TODO: Make it more specific */
diff --git a/src/pg_probackup_state.h b/src/pg_probackup_state.h
index 1d1ff88d0..56d852537 100644
--- a/src/pg_probackup_state.h
+++ b/src/pg_probackup_state.h
@@ -13,11 +13,11 @@
 
 typedef struct CatalogState
 {
-	/* $BACKUP_DIR */
+	/* $BACKUP_PATH */
 	char		catalog_path[MAXPGPATH]; //previously global var backup_path
-	/* $BACKUP_DIR/backups */
+	/* $BACKUP_PATH/backups */
 	char		backup_subdir_path[MAXPGPATH];
-	/* $BACKUP_DIR/wal */
+	/* $BACKUP_PATH/wal */
 	char		wal_subdir_path[MAXPGPATH]; // previously global var arclog_path
 } CatalogState; 
 
diff --git a/tests/option_test.py b/tests/option_test.py
index e97da1ef7..d1e8cb3a6 100644
--- a/tests/option_test.py
+++ b/tests/option_test.py
@@ -25,7 +25,7 @@ def test_without_backup_path_3(self):
         except ProbackupException as e:
             self.assertIn(
                 'ERROR: No backup catalog path specified.\n' + \
-                'Please specify it either using environment variable BACKUP_DIR or\n' + \
+                'Please specify it either using environment variable BACKUP_PATH or\n' + \
                 'command line option --backup-path (-B)',
                 e.message,
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(repr(e.message), self.cmd))