From def7d513cdd2d4579acf6e8c675a3d6f7da4f655 Mon Sep 17 00:00:00 2001
From: David Steele <david@pgmasters.net>
Date: Wed, 8 Sep 2021 17:35:45 -0400
Subject: [PATCH] Eliminate linefeed formatting from documentation.

Linefeeds were originally used in the place of <p> tags to denote a paragraph. While much of the linefeed usage has been replaced over time, there were many places where it was still being used, especially in reference.xml. This made it difficult to get consistent formatting across different output types. In particular there were formatting issues in the command-line help because it is harder to audit than HTML or PDF.

Replace linefeed formatting with proper <p> tags to make formatting more consistent.

Remove double spaces in all text where <p> tags were added since it does not add churn.

Update all <ul>/<ol>/<li> tags to the more general <list>/<list-item> tags.

Add a few missing periods.
---
 doc/lib/pgBackRestDoc/Common/Doc.pm           |    2 +-
 doc/lib/pgBackRestDoc/Common/DocRender.pm     |   33 +-
 .../pgBackRestDoc/Custom/DocCustomRelease.pm  |    4 +-
 doc/lib/pgBackRestDoc/Html/DocHtmlBuilder.pm  |    1 -
 doc/xml/dtd/doc.dtd                           |   11 +-
 doc/xml/index.xml                             |   12 +-
 doc/xml/reference.xml                         | 1182 +++++++++++------
 doc/xml/release.xml                           |   54 +-
 src/command/help/help.auto.c                  |   32 +-
 9 files changed, 879 insertions(+), 452 deletions(-)

diff --git a/doc/lib/pgBackRestDoc/Common/Doc.pm b/doc/lib/pgBackRestDoc/Common/Doc.pm
index 0bc479283..240ada000 100644
--- a/doc/lib/pgBackRestDoc/Common/Doc.pm
+++ b/doc/lib/pgBackRestDoc/Common/Doc.pm
@@ -116,7 +116,7 @@ sub parse
 
     my %oOut;
     my $iIndex = 0;
-    my $bText = $strName eq 'text' || $strName eq 'li' || $strName eq 'p' || $strName eq 'title' ||
+    my $bText = $strName eq 'text' || $strName eq 'p' || $strName eq 'title' ||
                 $strName eq 'summary' || $strName eq 'table-cell' || $strName eq 'table-column' || $strName eq 'list-item' ||
                 $strName eq 'admonition';
 
diff --git a/doc/lib/pgBackRestDoc/Common/DocRender.pm b/doc/lib/pgBackRestDoc/Common/DocRender.pm
index 2d3d93b83..11db5fb6c 100644
--- a/doc/lib/pgBackRestDoc/Common/DocRender.pm
+++ b/doc/lib/pgBackRestDoc/Common/DocRender.pm
@@ -35,9 +35,8 @@ my $oRenderTag =
         'b' => ['**', '**'],
         'i' => ['_', '_'],
         # 'bi' => ['_**', '**_'],
-        'ul' => ["\n", ""],
-        'ol' => ["\n", "\n"],
-        'li' => ['- ', "\n"],
+        'list-item' => ["\n", ""],
+        'list-item' => ['- ', "\n"],
         'id' => ['`', '`'],
         'file' => ['`', '`'],
         'path' => ['`', '`'],
@@ -57,12 +56,12 @@ my $oRenderTag =
     'text' =>
     {
         'quote' => ['"', '"'],
+        'p' => ['', "\n\n"],
         'b' => ['', ''],
         'i' => ['', ''],
         # 'bi' => ['', ''],
-        'ul' => ["\n", "\n"],
-        'ol' => ["\n", "\n"],
-        'li' => ['* ', "\n"],
+        'list' => ["", "\n"],
+        'list-item' => ['* ', "\n"],
         'id' => ['', ''],
         'host' => ['', ''],
         'file' => ['', ''],
@@ -78,18 +77,18 @@ my $oRenderTag =
         'backrest' => [undef, ''],
         'proper' => ['', ''],
         'postgres' => ['PostgreSQL', ''],
-        'admonition' => ["\n", "\n\n"],
+        'admonition' => ['', "\n\n"],
     },
 
     'latex' =>
     {
         'quote' => ['``', '"'],
+        'p' => ["\n\\begin{sloppypar}", "\\end{sloppypar}\n"],
         'b' => ['\textbf{', '}'],
         'i' => ['\textit{', '}'],
         # 'bi' => ['', ''],
-        'ul' => ["\\begin{itemize}\n", "\\end{itemize}\n"],
-        # 'ol' => ["\n", "\n"],
-        'li' => ['\item ', "\n"],
+        'list' => ["\\begin{itemize}\n", "\\end{itemize}\n"],
+        'list-item' => ['\item ', "\n"],
         'id' => ['\textnormal{\texttt{', '}}'],
         'host' => ['\textnormal{\textbf{', '}}'],
         'file' => ['\textnormal{\texttt{', '}}'],
@@ -119,10 +118,10 @@ my $oRenderTag =
         'quote' => ['<q>', '</q>'],
         'b' => ['<b>', '</b>'],
         'i' => ['<i>', '</i>'],
+        'p' => ['<div class="section-body-text">', '</div>'],
         # 'bi' => ['<i><b>', '</b></i>'],
-        'ul' => ['<ul>', '</ul>'],
-        'ol' => ['<ol>', '</ol>'],
-        'li' => ['<li>', '</li>'],
+        'list' => ['<ul class="list-unordered">', '</ul>'],
+        'list-item' => ['<li class="list-unordered">', '</li>'],
         'id' => ['<span class="id">', '</span>'],
         'host' => ['<span class="host">', '</span>'],
         'file' => ['<span class="file">', '</span>'],
@@ -851,7 +850,7 @@ sub processTag
             $strBuffer .= $self->processAdmonitionStart($oTag);
         }
 
-        if ($strTag eq 'p' || $strTag eq 'title' || $strTag eq 'li' || $strTag eq 'code-block' || $strTag eq 'summary'
+        if ($strTag eq 'p' || $strTag eq 'title' || $strTag eq 'list-item' || $strTag eq 'code-block' || $strTag eq 'summary'
             || $strTag eq 'admonition')
         {
             $strBuffer .= $self->processText($oTag);
@@ -997,7 +996,11 @@ sub processText
                 confess &log(ERROR, "unable to process quotes in string (use <quote> instead):\n${oNode}");
             }
 
-            $strBuffer .= $oNode;
+            # Skip text nodes with linefeeds since they happen between tags
+            if (index($oNode, "\n") == -1)
+            {
+                $strBuffer .= $oNode;
+            }
         }
         else
         {
diff --git a/doc/lib/pgBackRestDoc/Custom/DocCustomRelease.pm b/doc/lib/pgBackRestDoc/Custom/DocCustomRelease.pm
index 7abda3e3b..3b56a4dd7 100644
--- a/doc/lib/pgBackRestDoc/Custom/DocCustomRelease.pm
+++ b/doc/lib/pgBackRestDoc/Custom/DocCustomRelease.pm
@@ -552,9 +552,9 @@ sub docGet
                         }
 
                         # Add release note if present
-                        if (!$bReleaseNote && $oRelease->nodeGet($strSectionType)->nodeTest('p'))
+                        if (!$bReleaseNote && defined($oRelease->nodeGet($strSectionType)->textGet(false)))
                         {
-                            $oReleaseSection->nodeAdd('p')->textSet($oRelease->nodeGet($strSectionType)->nodeGet('p')->textGet());
+                            $oReleaseSection->nodeAdd('p')->textSet($oRelease->nodeGet($strSectionType)->textGet());
                             $bReleaseNote = true;
                         }
 
diff --git a/doc/lib/pgBackRestDoc/Html/DocHtmlBuilder.pm b/doc/lib/pgBackRestDoc/Html/DocHtmlBuilder.pm
index de6f242d9..970fd0687 100644
--- a/doc/lib/pgBackRestDoc/Html/DocHtmlBuilder.pm
+++ b/doc/lib/pgBackRestDoc/Html/DocHtmlBuilder.pm
@@ -150,7 +150,6 @@ sub htmlRender
     {
         if (!defined($oElement->{bPre}) || !$oElement->{bPre})
         {
-            $oElement->{strContent} =~ s/\n/\<br\/>\n/g;
             $oElement->{strContent} = trim($oElement->{strContent});
 
             # Add a linefeed before the content if not pre. This makes the output more diffable.
diff --git a/doc/xml/dtd/doc.dtd b/doc/xml/dtd/doc.dtd
index 629560b76..2d6df1edb 100644
--- a/doc/xml/dtd/doc.dtd
+++ b/doc/xml/dtd/doc.dtd
@@ -155,9 +155,9 @@
     <!ATTLIST release version CDATA #REQUIRED>
     <!ATTLIST release title CDATA #REQUIRED>
 
-<!ELEMENT release-core-list (p?, release-bug-list?, release-feature-list?, release-improvement-list?, release-development-list?)>
-<!ELEMENT release-test-list (p?, release-feature-list?, release-improvement-list?, release-development-list?)>
-<!ELEMENT release-doc-list (p?, release-bug-list?, release-feature-list?, release-improvement-list?, release-development-list?)>
+<!ELEMENT release-core-list (text?, release-bug-list?, release-feature-list?, release-improvement-list?, release-development-list?)>
+<!ELEMENT release-test-list (text?, release-feature-list?, release-improvement-list?, release-development-list?)>
+<!ELEMENT release-doc-list (text?, release-bug-list?, release-feature-list?, release-improvement-list?, release-development-list?)>
 
 <!ELEMENT release-bug-list (release-item+)>
 <!ELEMENT release-feature-list (release-item+)>
@@ -237,12 +237,9 @@
                    br-setting|pg-option|pg-setting|link|user|proper)*>
 <!ELEMENT p ANY>
     <!ATTLIST p if CDATA "">
-<!ELEMENT text ANY>
+<!ELEMENT text (p|list|admonition)*>
 <!ELEMENT i ANY>
 <!ELEMENT b ANY>
-<!ELEMENT ul (li+)>
-<!ELEMENT ol (li+)>
-<!ELEMENT li ANY>
 <!ELEMENT list (list-item+)>
     <!ATTLIST list if CDATA "">
 <!ELEMENT list-item ANY>
diff --git a/doc/xml/index.xml b/doc/xml/index.xml
index 29e4c7d7f..33ec9aaff 100644
--- a/doc/xml/index.xml
+++ b/doc/xml/index.xml
@@ -171,21 +171,21 @@
     <section id="support">
         <title>Support</title>
 
-        <p><backrest/> is completely free and open source under the <link url="{[github-url-license]}">MIT</link> license.  You may use it for personal or commercial purposes without any restrictions whatsoever.  Bug reports are taken very seriously and will be addressed as quickly as possible.
+        <p><backrest/> is completely free and open source under the <link url="{[github-url-license]}">MIT</link> license. You may use it for personal or commercial purposes without any restrictions whatsoever. Bug reports are taken very seriously and will be addressed as quickly as possible.</p>
 
-        Creating a robust disaster recovery policy with proper replication and backup strategies can be a very complex and daunting task.  You may find that you need help during the architecture phase and ongoing support to ensure that your enterprise continues running smoothly.
+        <p>Creating a robust disaster recovery policy with proper replication and backup strategies can be a very complex and daunting task. You may find that you need help during the architecture phase and ongoing support to ensure that your enterprise continues running smoothly.</p>
 
-        <link url="{[crunchy-url-base]}">Crunchy Data</link> provides packaged versions of <backrest/> for major operating systems and expert full life-cycle commercial support for <backrest/> and all things <postgres/>.  <link url="{[crunchy-url-base]}">Crunchy Data</link> is committed to providing open source solutions with no vendor lock-in, ensuring that cross-compatibility with the community version of <backrest/> is always strictly maintained.
+        <p><link url="{[crunchy-url-base]}">Crunchy Data</link> provides packaged versions of <backrest/> for major operating systems and expert full life-cycle commercial support for <backrest/> and all things <postgres/>. <link url="{[crunchy-url-base]}">Crunchy Data</link> is committed to providing open source solutions with no vendor lock-in, ensuring that cross-compatibility with the community version of <backrest/> is always strictly maintained.</p>
 
-        Please visit <link url="{[crunchy-url-base]}">Crunchy Data</link> for more information.</p>
+        <p>Please visit <link url="{[crunchy-url-base]}">Crunchy Data</link> for more information.</p>
     </section>
 
     <section id="recognition">
         <title>Recognition</title>
 
-        <p>Primary recognition goes to Stephen Frost for all his valuable advice and criticism during the development of <backrest/>.
+        <p>Primary recognition goes to Stephen Frost for all his valuable advice and criticism during the development of <backrest/>.</p>
 
-        <link url="{[crunchy-url-base]}">Crunchy Data</link> has contributed significant time and resources to <backrest/> and continues to actively support development. <link url="{[resonate-url-base]}">Resonate</link> also contributed to the development of <backrest/> and allowed early (but well tested) versions to be installed as their primary <postgres/> backup solution.</p>
+        <p><link url="{[crunchy-url-base]}">Crunchy Data</link> has contributed significant time and resources to <backrest/> and continues to actively support development. <link url="{[resonate-url-base]}">Resonate</link> also contributed to the development of <backrest/> and allowed early (but well tested) versions to be installed as their primary <postgres/> backup solution.</p>
 
         <p><link url="https://thenounproject.com/search/?q=lounge+chair&amp;i=129971">Armchair</link> graphic by <link url="https://thenounproject.com/sandorsz">Sandor Szabo</link>.</p>
     </section>
diff --git a/doc/xml/reference.xml b/doc/xml/reference.xml
index 7bcf02837..2e30e37ba 100644
--- a/doc/xml/reference.xml
+++ b/doc/xml/reference.xml
@@ -5,28 +5,37 @@
     <config title="{[project]} Configuration Reference">
         <description>The {[project]} Configuration Reference details all configuration options.</description>
 
-        <text><backrest/> can be used entirely with command-line parameters but a configuration file is more practical for installations that are complex or set a lot of options. The default location for the configuration file is <file>/etc/pgbackrest/pgbackrest.conf</file>.  If no file exists in that location then the old default of <file>/etc/pgbackrest.conf</file> will be checked.</text>
+        <text>
+            <p><backrest/> can be used entirely with command-line parameters but a configuration file is more practical for installations that are complex or set a lot of options. The default location for the configuration file is <file>/etc/pgbackrest/pgbackrest.conf</file>. If no file exists in that location then the old default of <file>/etc/pgbackrest.conf</file> will be checked.</p>
+        </text>
 
         <config-section-list title="Settings">
             <!-- CONFIG - LOG -->
             <config-section id="log" name="Log">
-                <text>The <setting>log</setting> section defines logging-related settings.<admonition type="caution">Trace-level logging may expose secrets such as keys and passwords.  Use with caution!</admonition></text>
+                <text>
+                    <p>The <setting>log</setting> section defines logging-related settings.</p>
+
+                    <admonition type="caution">Trace-level logging may expose secrets such as keys and passwords. Use with caution!</admonition>
+                </text>
 
                 <!-- CONFIG - LOG SECTION - LOG-LEVEL-FILE KEY -->
                 <config-key-list>
                     <config-key id="log-level-file" name="File Log Level">
                         <summary>Level for file logging.</summary>
 
-                        <text>The following log levels are supported:
-                        <ul>
-                            <li><id>off</id> - No logging at all (not recommended)</li>
-                            <li><id>error</id> - Log only errors</li>
-                            <li><id>warn</id> - Log warnings and errors</li>
-                            <li><id>info</id> - Log info, warnings, and errors</li>
-                            <li><id>detail</id> - Log detail, info, warnings, and errors</li>
-                            <li><id>debug</id> - Log debug, detail, info, warnings, and errors</li>
-                            <li><id>trace</id> - Log trace (very verbose debugging), debug, info, warnings, and errors</li>
-                        </ul></text>
+                        <text>
+                            <p>The following log levels are supported:</p>
+
+                            <list>
+                                <list-item><id>off</id> - No logging at all (not recommended)</list-item>
+                                <list-item><id>error</id> - Log only errors</list-item>
+                                <list-item><id>warn</id> - Log warnings and errors</list-item>
+                                <list-item><id>info</id> - Log info, warnings, and errors</list-item>
+                                <list-item><id>detail</id> - Log detail, info, warnings, and errors</list-item>
+                                <list-item><id>debug</id> - Log debug, detail, info, warnings, and errors</list-item>
+                                <list-item><id>trace</id> - Log trace (very verbose debugging), debug, info, warnings, and errors</list-item>
+                            </list>
+                        </text>
 
                         <example>debug</example>
                     </config-key>
@@ -35,16 +44,19 @@
                     <config-key id="log-level-console" name="Console Log Level">
                         <summary>Level for console logging.</summary>
 
-                        <text>The following log levels are supported:
-                        <ul>
-                            <li><id>off</id> - No logging at all (not recommended)</li>
-                            <li><id>error</id> - Log only errors</li>
-                            <li><id>warn</id> - Log warnings and errors</li>
-                            <li><id>info</id> - Log info, warnings, and errors</li>
-                            <li><id>detail</id> - Log detail, info, warnings, and errors</li>
-                            <li><id>debug</id> - Log debug, detail, info, warnings, and errors</li>
-                            <li><id>trace</id> - Log trace (very verbose debugging), debug, info, warnings, and errors</li>
-                        </ul></text>
+                        <text>
+                            <p>The following log levels are supported:</p>
+
+                            <list>
+                                <list-item><id>off</id> - No logging at all (not recommended)</list-item>
+                                <list-item><id>error</id> - Log only errors</list-item>
+                                <list-item><id>warn</id> - Log warnings and errors</list-item>
+                                <list-item><id>info</id> - Log info, warnings, and errors</list-item>
+                                <list-item><id>detail</id> - Log detail, info, warnings, and errors</list-item>
+                                <list-item><id>debug</id> - Log debug, detail, info, warnings, and errors</list-item>
+                                <list-item><id>trace</id> - Log trace (very verbose debugging), debug, info, warnings, and errors</list-item>
+                            </list>
+                        </text>
 
                         <example>error</example>
                     </config-key>
@@ -53,18 +65,21 @@
                     <config-key id="log-level-stderr" name="Std Error Log Level">
                         <summary>Level for stderr logging.</summary>
 
-                        <text>Specifies which log levels will output to <id>stderr</id> rather than <id>stdout</id> (specified by <br-option>log-level-console</br-option>).  The timestamp and process will not be output to <id>stderr</id>.
+                        <text>
+                            <p>Specifies which log levels will output to <id>stderr</id> rather than <id>stdout</id> (specified by <br-option>log-level-console</br-option>). The timestamp and process will not be output to <id>stderr</id>.</p>
 
-                        The following log levels are supported:
-                        <ul>
-                            <li><id>off</id> - No logging at all (not recommended)</li>
-                            <li><id>error</id> - Log only errors</li>
-                            <li><id>warn</id> - Log warnings and errors</li>
-                            <li><id>info</id> - Log info, warnings, and errors</li>
-                            <li><id>detail</id> - Log detail, info, warnings, and errors</li>
-                            <li><id>debug</id> - Log debug, detail, info, warnings, and errors</li>
-                            <li><id>trace</id> - Log trace (very verbose debugging), debug, info, warnings, and errors</li>
-                        </ul></text>
+                            <p>The following log levels are supported:</p>
+
+                            <list>
+                                <list-item><id>off</id> - No logging at all (not recommended)</list-item>
+                                <list-item><id>error</id> - Log only errors</list-item>
+                                <list-item><id>warn</id> - Log warnings and errors</list-item>
+                                <list-item><id>info</id> - Log info, warnings, and errors</list-item>
+                                <list-item><id>detail</id> - Log detail, info, warnings, and errors</list-item>
+                                <list-item><id>debug</id> - Log debug, detail, info, warnings, and errors</list-item>
+                                <list-item><id>trace</id> - Log trace (very verbose debugging), debug, info, warnings, and errors</list-item>
+                            </list>
+                        </text>
 
                         <example>error</example>
                     </config-key>
@@ -73,7 +88,9 @@
                     <config-key id="log-path" name="Log Path">
                         <summary>Path where log files are stored.</summary>
 
-                        <text>The log path provides a location for <backrest/> to store log files.  Note that if <setting>log-level-file=off</setting> then no log path is required.</text>
+                        <text>
+                            <p>The log path provides a location for <backrest/> to store log files. Note that if <setting>log-level-file=off</setting> then no log path is required.</p>
+                        </text>
 
                         <example>/backup/db/log</example>
                     </config-key>
@@ -82,7 +99,9 @@
                     <config-key id="log-timestamp" name="Log Timestamp">
                         <summary>Enable timestamp in logging.</summary>
 
-                        <text>Enables the timestamp in console and file logging.  This option is disabled in special situations such as generating documentation.</text>
+                        <text>
+                            <p>Enables the timestamp in console and file logging. This option is disabled in special situations such as generating documentation.</p>
+                        </text>
 
                         <example>n</example>
                     </config-key>
@@ -91,7 +110,9 @@
                     <config-key id="log-subprocess" name="Log Subprocesses">
                         <summary>Enable logging in subprocesses.</summary>
 
-                        <text>Enable file logging for any subprocesses created by this process using the log level specified by <br-option>log-level-file</br-option>.</text>
+                        <text>
+                            <p>Enable file logging for any subprocesses created by this process using the log level specified by <br-option>log-level-file</br-option>.</p>
+                        </text>
 
                         <example>y</example>
                     </config-key>
@@ -100,17 +121,21 @@
 
             <!-- CONFIG - GENERAL -->
             <config-section id="general" name="General">
-                <text>The <setting>general</setting> section defines options that are common for many commands.</text>
+                <text>
+                    <p>The <setting>general</setting> section defines options that are common for many commands.</p>
+                </text>
 
                 <config-key-list>
                     <config-key id="buffer-size" name="Buffer Size">
                         <summary>Buffer size for file operations.</summary>
 
-                        <text>Set the buffer size used for copy, compress, and uncompress functions.  A maximum of 3 buffers will be in use at a time per process.  An additional maximum of 256K per process may be used for zlib buffers.
+                        <text>
+                            <p>Set the buffer size used for copy, compress, and uncompress functions. A maximum of 3 buffers will be in use at a time per process. An additional maximum of 256K per process may be used for zlib buffers.</p>
 
-                        Size can be entered in bytes (default) or KB, MB, GB, TB, or PB where the multiplier is a power of 1024. For example, the case-insensitive value 32k (or 32KB) can be used instead of 32768.
+                            <p>Size can be entered in bytes (default) or KB, MB, GB, TB, or PB where the multiplier is a power of 1024. For example, the case-insensitive value 32k (or 32KB) can be used instead of 32768.</p>
 
-                        Allowed values, in bytes, are <id>16384</id>, <id>32768</id>, <id>65536</id>, <id>131072</id>, <id>262144</id>, <id>524288</id>, <id>1048576</id>, <id>2097152</id>, <id>4194304</id>, <id>8388608</id>, and <id>16777216</id>.</text>
+                            <p>Allowed values, in bytes, are <id>16384</id>, <id>32768</id>, <id>65536</id>, <id>131072</id>, <id>262144</id>, <id>524288</id>, <id>1048576</id>, <id>2097152</id>, <id>4194304</id>, <id>8388608</id>, and <id>16777216</id>.</p>
+                        </text>
 
                         <example>32K</example>
                     </config-key>
@@ -119,7 +144,9 @@
                     <config-key id="cmd-ssh" name="SSH client command">
                         <summary>Path to ssh client executable.</summary>
 
-                        <text>Use a specific SSH client when an alternate is desired or the <file>ssh</file> executable is not in $PATH.</text>
+                        <text>
+                            <p>Use a specific SSH client when an alternate is desired or the <file>ssh</file> executable is not in $PATH.</p>
+                        </text>
 
                         <example>/usr/bin/ssh</example>
                     </config-key>
@@ -128,9 +155,11 @@
                     <config-key id="compress" name="Compress">
                         <summary>Use file compression.</summary>
 
-                        <text>Backup files are compatible with command-line compression tools.
+                        <text>
+                            <p>Backup files are compatible with command-line compression tools.</p>
 
-                        This option is now deprecated. The <setting>compress-type</setting> option should be used instead.</text>
+                            <p>This option is now deprecated. The <setting>compress-type</setting> option should be used instead.</p>
+                        </text>
 
                         <example>n</example>
                     </config-key>
@@ -139,14 +168,17 @@
                     <config-key id="compress-type" name="Compress Type">
                         <summary>File compression type.</summary>
 
-                        <text>The following compression types are supported:
-                        <ul>
-                            <li><id>none</id> - no compression</li>
-                            <li><id>bz2</id> - bzip2 compression format</li>
-                            <li><id>gz</id> - gzip compression format</li>
-                            <li><id>lz4</id> - lz4 compression format (not available on all platforms)</li>
-                            <li><id>zst</id> - Zstandard compression format (not available on all platforms)</li>
-                        </ul></text>
+                        <text>
+                            <p>The following compression types are supported:</p>
+
+                            <list>
+                                <list-item><id>none</id> - no compression</list-item>
+                                <list-item><id>bz2</id> - bzip2 compression format</list-item>
+                                <list-item><id>gz</id> - gzip compression format</list-item>
+                                <list-item><id>lz4</id> - lz4 compression format (not available on all platforms)</list-item>
+                                <list-item><id>zst</id> - Zstandard compression format (not available on all platforms)</list-item>
+                            </list>
+                        </text>
 
                         <example>none</example>
                     </config-key>
@@ -155,15 +187,18 @@
                     <config-key id="compress-level" name="Compress Level">
                         <summary>File compression level.</summary>
 
-                        <text>Sets the level to be used for file compression when <setting>compress-type</setting> does not equal <id>none</id> or <setting>compress=y</setting> (deprecated).
+                        <text>
+                            <p>Sets the level to be used for file compression when <setting>compress-type</setting> does not equal <id>none</id> or <setting>compress=y</setting> (deprecated).</p>
 
-                        The following are the defaults levels based on <setting>compress-type</setting> when <setting>compress-level</setting> is not specified:
-                        <ul>
-                            <li><id>bz2</id> - 9</li>
-                            <li><id>gz</id> - 6</li>
-                            <li><id>lz4</id> - 1</li>
-                            <li><id>zst</id> - 3</li>
-                        </ul></text>
+                            <p>The following are the defaults levels based on <setting>compress-type</setting> when <setting>compress-level</setting> is not specified:</p>
+
+                            <list>
+                                <list-item><id>bz2</id> - 9</list-item>
+                                <list-item><id>gz</id> - 6</list-item>
+                                <list-item><id>lz4</id> - 1</list-item>
+                                <list-item><id>zst</id> - 3</list-item>
+                            </list>
+                        </text>
 
                         <allow>0-9</allow>
                         <example>9</example>
@@ -173,7 +208,9 @@
                     <config-key id="compress-level-network" name="Network Compress Level">
                         <summary>Network compression level.</summary>
 
-                        <text>Sets the network compression level when <setting>compress-type=none</setting> and the command is not run on the same host as the repository.  Compression is used to reduce network traffic but can be disabled by setting <setting>compress-level-network=0</setting>.  When <setting>compress-type</setting> does not equal <id>none</id> the <setting>compress-level-network</setting> setting is ignored and <setting>compress-level</setting> is used instead so that the file is only compressed once.  SSH compression is always disabled.</text>
+                        <text>
+                            <p>Sets the network compression level when <setting>compress-type=none</setting> and the command is not run on the same host as the repository. Compression is used to reduce network traffic but can be disabled by setting <setting>compress-level-network=0</setting>. When <setting>compress-type</setting> does not equal <id>none</id> the <setting>compress-level-network</setting> setting is ignored and <setting>compress-level</setting> is used instead so that the file is only compressed once. SSH compression is always disabled.</p>
+                        </text>
 
                         <allow>0-9</allow>
                         <example>1</example>
@@ -183,7 +220,11 @@
                     <config-key id="db-timeout" name="Database Timeout">
                         <summary>Database query timeout.</summary>
 
-                        <text>Sets the timeout, in seconds, for queries against the database.  This includes the <code>pg_start_backup()</code> and <code>pg_stop_backup()</code> functions which can each take a substantial amount of time.  Because of this the timeout should be kept high unless you know that these functions will return quickly (i.e. if you have set <setting>startfast=y</setting> and you know that the database cluster will not generate many WAL segments during the backup). <admonition type="note">The <br-option>db-timeout</br-option> option must be less than the <br-option>protocol-timeout</br-option> option.</admonition></text>
+                        <text>
+                            <p>Sets the timeout, in seconds, for queries against the database. This includes the <code>pg_start_backup()</code> and <code>pg_stop_backup()</code> functions which can each take a substantial amount of time. Because of this the timeout should be kept high unless you know that these functions will return quickly (i.e. if you have set <setting>startfast=y</setting> and you know that the database cluster will not generate many WAL segments during the backup).</p>
+
+                            <admonition type="note">The <br-option>db-timeout</br-option> option must be less than the <br-option>protocol-timeout</br-option> option.</admonition>
+                        </text>
 
                         <example>600</example>
                     </config-key>
@@ -192,9 +233,11 @@
                     <config-key id="delta" name="Delta">
                         <summary>Restore or backup using checksums.</summary>
 
-                        <text>During a restore, by default the <postgres/> data and tablespace directories are expected to be present but empty.  This option performs a delta restore using checksums.
+                        <text>
+                            <p>During a restore, by default the <postgres/> data and tablespace directories are expected to be present but empty. This option performs a delta restore using checksums.</p>
 
-                        During a backup, this option will use checksums instead of the timestamps to determine if files will be copied.</text>
+                            <p>During a backup, this option will use checksums instead of the timestamps to determine if files will be copied.</p>
+                        </text>
 
                         <example>y</example>
                     </config-key>
@@ -203,9 +246,11 @@
                     <config-key id="io-timeout" name="I/O Timeout">
                         <summary>I/O timeout.</summary>
 
-                        <text>Timeout, in seconds, used for connections and read/write operations.
+                        <text>
+                            <p>Timeout, in seconds, used for connections and read/write operations.</p>
 
-                        Note that the entire read/write operation does not need to complete within this timeout but <i>some</i> progress must be made, even if it is only a single byte.</text>
+                            <p>Note that the entire read/write operation does not need to complete within this timeout but <i>some</i> progress must be made, even if it is only a single byte.</p>
+                        </text>
 
                         <example>120</example>
                     </config-key>
@@ -214,7 +259,9 @@
                     <config-key id="job-retry" name="Job Retry Count">
                         <summary>Retry count for local jobs.</summary>
 
-                        <text>The number of retries for jobs run in the local process, e.g. file backup.</text>
+                        <text>
+                            <p>The number of retries for jobs run in the local process, e.g. file backup.</p>
+                        </text>
 
                         <example>5</example>
                     </config-key>
@@ -223,7 +270,9 @@
                     <config-key id="job-retry-interval" name="Job Retry Interval">
                         <summary>Retry interval after first retry.</summary>
 
-                        <text>The first retry is always performed immediately. This option specifies the interval to wait (in seconds) before performing each additional retry.</text>
+                        <text>
+                            <p>The first retry is always performed immediately. This option specifies the interval to wait (in seconds) before performing each additional retry.</p>
+                        </text>
 
                         <example>30</example>
                     </config-key>
@@ -232,7 +281,9 @@
                     <config-key id="lock-path" name="Lock Path">
                         <summary>Path where lock files are stored.</summary>
 
-                        <text>The lock path provides a location for <backrest/> to create lock files to prevent conflicting operations from being run concurrently.</text>
+                        <text>
+                            <p>The lock path provides a location for <backrest/> to create lock files to prevent conflicting operations from being run concurrently.</p>
+                        </text>
 
                         <example>/backup/db/lock</example>
                     </config-key>
@@ -241,9 +292,11 @@
                     <config-key id="neutral-umask" name="Neutral Umask">
                         <summary>Use a neutral umask.</summary>
 
-                        <text>Sets the umask to 0000 so modes in the repository are created in a sensible way.  The default directory mode is 0750 and default file mode is 0640.  The lock and log directories set the directory and file mode to 0770 and 0660 respectively.
+                        <text>
+                            <p>Sets the umask to 0000 so modes in the repository are created in a sensible way. The default directory mode is 0750 and default file mode is 0640. The lock and log directories set the directory and file mode to 0770 and 0660 respectively.</p>
 
-                        To use the executing user's umask instead specify <setting>neutral-umask=n</setting> in the config file or <setting>--no-neutral-umask</setting> on the command line.</text>
+                            <p>To use the executing user's umask instead specify <setting>neutral-umask=n</setting> in the config file or <setting>--no-neutral-umask</setting> on the command line.</p>
+                        </text>
 
                         <example>n</example>
                     </config-key>
@@ -252,15 +305,17 @@
                     <config-key id="spool-path" name="Spool Path">
                         <summary>Path where transient data is stored.</summary>
 
-                        <text>This path is used to store data for the asynchronous <cmd>archive-push</cmd> and <cmd>archive-get</cmd> command.
+                        <text>
+                            <p>This path is used to store data for the asynchronous <cmd>archive-push</cmd> and <cmd>archive-get</cmd> command.</p>
 
-                        The asynchronous <cmd>archive-push</cmd> command writes acknowledgements into the spool path when it has successfully stored WAL in the archive (and errors on failure) so the foreground process can quickly notify <postgres/>. Acknowledgement files are very small (zero on success and a few hundred bytes on error).
+                            <p>The asynchronous <cmd>archive-push</cmd> command writes acknowledgements into the spool path when it has successfully stored WAL in the archive (and errors on failure) so the foreground process can quickly notify <postgres/>. Acknowledgement files are very small (zero on success and a few hundred bytes on error).</p>
 
-                        The asynchronous <cmd>archive-get</cmd> command queues WAL in the spool path so it can be provided very quickly when <postgres/> requests it.  Moving files to <postgres/> is most efficient when the spool path is on the same filesystem as <path>pg_xlog</path>/<path>pg_wal</path>.
+                            <p>The asynchronous <cmd>archive-get</cmd> command queues WAL in the spool path so it can be provided very quickly when <postgres/> requests it. Moving files to <postgres/> is most efficient when the spool path is on the same filesystem as <path>pg_xlog</path>/<path>pg_wal</path>.</p>
 
-                        The data stored in the spool path is not strictly temporary since it can and should survive a reboot.  However, loss of the data in the spool path is not a problem.  <backrest/> will simply recheck each WAL segment to ensure it is safely archived for <cmd>archive-push</cmd> and rebuild the queue for <cmd>archive-get</cmd>.
+                            <p>The data stored in the spool path is not strictly temporary since it can and should survive a reboot. However, loss of the data in the spool path is not a problem. <backrest/> will simply recheck each WAL segment to ensure it is safely archived for <cmd>archive-push</cmd> and rebuild the queue for <cmd>archive-get</cmd>.</p>
 
-                        The spool path is intended to be located on a local Posix-compatible filesystem, not a remote filesystem such as <proper>NFS</proper> or <proper>CIFS</proper>.</text>
+                            <p>The spool path is intended to be located on a local Posix-compatible filesystem, not a remote filesystem such as <proper>NFS</proper> or <proper>CIFS</proper>.</p>
+                        </text>
 
                         <example>/backup/db/spool</example>
                     </config-key>
@@ -269,7 +324,9 @@
                     <config-key id="process-max" name="Process Maximum">
                         <summary>Max processes to use for compress/transfer.</summary>
 
-                        <text>Each process will perform compression and transfer to make the command run faster, but don't set <setting>process-max</setting> so high that it impacts database performance.</text>
+                        <text>
+                            <p>Each process will perform compression and transfer to make the command run faster, but don't set <setting>process-max</setting> so high that it impacts database performance.</p>
+                        </text>
 
                         <example>4</example>
                     </config-key>
@@ -278,7 +335,11 @@
                     <config-key id="protocol-timeout" name="Protocol Timeout">
                         <summary>Protocol timeout.</summary>
 
-                        <text>Sets the timeout, in seconds, that the local or remote process will wait for a new message to be received on the protocol layer.  This prevents processes from waiting indefinitely for a message. <admonition type="note">The <br-option>protocol-timeout</br-option> option must be greater than the <br-option>db-timeout</br-option> option.</admonition></text>
+                        <text>
+                            <p>Sets the timeout, in seconds, that the local or remote process will wait for a new message to be received on the protocol layer. This prevents processes from waiting indefinitely for a message.</p>
+
+                            <admonition type="note">The <br-option>protocol-timeout</br-option> option must be greater than the <br-option>db-timeout</br-option> option.</admonition>
+                        </text>
 
                         <example>630</example>
                     </config-key>
@@ -287,7 +348,9 @@
                     <config-key id="sck-block" name="Socket Blocking">
                         <summary>Socket blocking enable.</summary>
 
-                        <text>Enable blocking on socket connections.</text>
+                        <text>
+                            <p>Enable blocking on socket connections.</p>
+                        </text>
 
                         <example>y</example>
                     </config-key>
@@ -296,7 +359,9 @@
                     <config-key id="sck-keep-alive" name="Keep Alive">
                         <summary>Keep-alive enable.</summary>
 
-                        <text>Enables keep-alive messages on socket connections.</text>
+                        <text>
+                            <p>Enables keep-alive messages on socket connections.</p>
+                        </text>
 
                         <example>n</example>
                     </config-key>
@@ -305,9 +370,11 @@
                     <config-key id="tcp-keep-alive-count" name="Keep Alive Count">
                         <summary>Keep-alive count.</summary>
 
-                        <text>Specifies the number of TCP keep-alive messages that can be lost before the connection is considered dead.
+                        <text>
+                            <p>Specifies the number of TCP keep-alive messages that can be lost before the connection is considered dead.</p>
 
-                        This option is available on systems that support the <code>TCP_KEEPCNT</code> socket option.</text>
+                            <p>This option is available on systems that support the <code>TCP_KEEPCNT</code> socket option.</p>
+                        </text>
 
                         <example>3</example>
                     </config-key>
@@ -316,9 +383,11 @@
                     <config-key id="tcp-keep-alive-idle" name="Keep Alive Idle">
                         <summary>Keep-alive idle time.</summary>
 
-                        <text>Specifies the amount of time (in seconds) with no network activity after which the operating system should send a TCP keep-alive message.
+                        <text>
+                            <p>Specifies the amount of time (in seconds) with no network activity after which the operating system should send a TCP keep-alive message.</p>
 
-                        This option is available on systems that support the <code>TCP_KEEPIDLE</code> socket option.</text>
+                            <p>This option is available on systems that support the <code>TCP_KEEPIDLE</code> socket option.</p>
+                        </text>
 
                         <example>60</example>
                     </config-key>
@@ -327,9 +396,11 @@
                     <config-key id="tcp-keep-alive-interval" name="Keep Alive Interval">
                         <summary>Keep-alive interval time.</summary>
 
-                        <text>Specifies the amount of time (in seconds) after which a TCP keep-alive message that has not been acknowledged should be retransmitted.
+                        <text>
+                            <p>Specifies the amount of time (in seconds) after which a TCP keep-alive message that has not been acknowledged should be retransmitted.</p>
 
-                        This option is available on systems that support the <code>TCP_KEEPINTVL</code> socket option.</text>
+                            <p>This option is available on systems that support the <code>TCP_KEEPINTVL</code> socket option.</p>
+                        </text>
 
                         <example>30</example>
                     </config-key>
@@ -338,18 +409,22 @@
 
             <!-- CONFIG - REPO -->
             <config-section id="repository" name="Repository">
-                <text>The <setting>repository</setting> section defines options used to configure the repository.
+                <text>
+                    <p>The <setting>repository</setting> section defines options used to configure the repository.</p>
 
-                <b>Indexing</b>: All <setting>repo-</setting> options are indexed to allow for configuring multiple repositories. For example, a single repository is configured with the <setting>repo1-path</setting>, <setting>repo1-host</setting>, etc. options. If there is more than one repository configured and the <br-option>{[dash]}-repo</br-option> option is not specified for a command, the repositories will be acted upon in highest priority order (e.g. repo1 then repo2).
+                    <p><b>Indexing</b>: All <setting>repo-</setting> options are indexed to allow for configuring multiple repositories. For example, a single repository is configured with the <setting>repo1-path</setting>, <setting>repo1-host</setting>, etc. options. If there is more than one repository configured and the <br-option>{[dash]}-repo</br-option> option is not specified for a command, the repositories will be acted upon in highest priority order (e.g. repo1 then repo2).</p>
 
-                The <setting>repo-retention-*</setting> options define how long backups will be retained. Expiration only occurs when the count of complete backups exceeds the allowed retention. In other words, if <setting>repo1-retention-full-type</setting> is set to <setting>count</setting> (default) and <setting>repo1-retention-full</setting> is set to 2, then there must be 3 complete backups before the oldest will be expired. If <setting>repo1-retention-full-type</setting> is set to <setting>time</setting> then <setting>repo1-retention-full</setting> represents days so there must be at least that many days worth of full backups before expiration can occur. Make sure you always have enough space for retention + 1 backups.</text>
+                    <p>The <setting>repo-retention-*</setting> options define how long backups will be retained. Expiration only occurs when the count of complete backups exceeds the allowed retention. In other words, if <setting>repo1-retention-full-type</setting> is set to <setting>count</setting> (default) and <setting>repo1-retention-full</setting> is set to 2, then there must be 3 complete backups before the oldest will be expired. If <setting>repo1-retention-full-type</setting> is set to <setting>time</setting> then <setting>repo1-retention-full</setting> represents days so there must be at least that many days worth of full backups before expiration can occur. Make sure you always have enough space for retention + 1 backups.</p>
+                </text>
 
                 <config-key-list>
                     <!-- ======================================================================================================= -->
                     <config-key id="repo-azure-account" name="Azure Repository Account">
                         <summary>Azure repository account.</summary>
 
-                        <text>Azure account used to store the repository.</text>
+                        <text>
+                            <p>Azure account used to store the repository.</p>
+                        </text>
 
                         <example>pg-backup</example>
                     </config-key>
@@ -358,9 +433,11 @@
                     <config-key id="repo-azure-container" name="Azure Repository Container">
                         <summary>Azure repository container.</summary>
 
-                        <text>Azure container used to store the repository.
+                        <text>
+                            <p>Azure container used to store the repository.</p>
 
-                        <backrest/> repositories can be stored in the container root by setting <br-option>repo-path=/</br-option> but it is usually best to specify a prefix, such as <path>/repo</path>, so logs and other Azure-generated content can also be stored in the container.</text>
+                            <p><backrest/> repositories can be stored in the container root by setting <br-option>repo-path=/</br-option> but it is usually best to specify a prefix, such as <path>/repo</path>, so logs and other Azure-generated content can also be stored in the container.</p>
+                        </text>
 
                         <example>pg-backup</example>
                     </config-key>
@@ -369,9 +446,11 @@
                     <config-key id="repo-azure-endpoint" name="Azure Repository Endpoint">
                         <summary>Azure repository endpoint.</summary>
 
-                        <text>Endpoint used to connect to the blob service. The default is generally correct unless using Azure Government.
+                        <text>
+                            <p>Endpoint used to connect to the blob service. The default is generally correct unless using Azure Government.</p>
 
-                        For custom/test configurations the <setting>repo-storage-ca-file</setting>, <setting>repo-storage-ca-path</setting>, <setting>repo-storage-host</setting>, <setting>repo-storage-port</setting>, and <setting>repo-storage-verify-tls</setting> options may be useful.</text>
+                            <p>For custom/test configurations the <setting>repo-storage-ca-file</setting>, <setting>repo-storage-ca-path</setting>, <setting>repo-storage-host</setting>, <setting>repo-storage-port</setting>, and <setting>repo-storage-verify-tls</setting> options may be useful.</p>
+                        </text>
 
                         <example>blob.core.usgovcloudapi.net</example>
                     </config-key>
@@ -380,7 +459,9 @@
                     <config-key id="repo-azure-key" name="Azure Repository Key">
                         <summary>Azure repository key.</summary>
 
-                        <text>A shared key or shared access signature depending on the <br-option>repo-azure-key-type</br-option> option.</text>
+                        <text>
+                            <p>A shared key or shared access signature depending on the <br-option>repo-azure-key-type</br-option> option.</p>
+                        </text>
 
                         <example>T+9+aov82qNhrcXSNGZCzm9mjd4d75/oxxOr6r1JVpgTLA==</example>
                     </config-key>
@@ -389,11 +470,14 @@
                     <config-key id="repo-azure-key-type" name="Azure Repository Key Type">
                         <summary>Azure repository key type.</summary>
 
-                        <text>The following types are supported for authorization:
-                        <ul>
-                            <li><id>shared</id> - Shared key</li>
-                            <li><id>sas</id> - Shared access signature</li>
-                        </ul></text>
+                        <text>
+                            <p>The following types are supported for authorization:</p>
+
+                            <list>
+                                <list-item><id>shared</id> - Shared key</list-item>
+                                <list-item><id>sas</id> - Shared access signature</list-item>
+                            </list>
+                        </text>
 
                         <example>sas</example>
                     </config-key>
@@ -402,9 +486,11 @@
                     <config-key id="repo-gcs-bucket" name="GCS Repository Bucket">
                         <summary>GCS repository bucket.</summary>
 
-                        <text>GCS bucket used to store the repository.
+                        <text>
+                            <p>GCS bucket used to store the repository.</p>
 
-                        <backrest/> repositories can be stored in the bucket root by setting <br-option>repo-path=/</br-option> but it is usually best to specify a prefix, such as <path>/repo</path>, so logs and other GCS-generated content can also be stored in the bucket.</text>
+                            <p><backrest/> repositories can be stored in the bucket root by setting <br-option>repo-path=/</br-option> but it is usually best to specify a prefix, such as <path>/repo</path>, so logs and other GCS-generated content can also be stored in the bucket.</p>
+                        </text>
 
                         <example>/pg-backup</example>
                     </config-key>
@@ -413,7 +499,9 @@
                     <config-key id="repo-gcs-endpoint" name="GCS Repository Endpoint">
                         <summary>GCS repository endpoint.</summary>
 
-                        <text>Endpoint used to connect to the storage service. May be updated to use a local GCS server or alternate endpoint.</text>
+                        <text>
+                            <p>Endpoint used to connect to the storage service. May be updated to use a local GCS server or alternate endpoint.</p>
+                        </text>
 
                         <example>localhost</example>
                     </config-key>
@@ -422,7 +510,9 @@
                     <config-key id="repo-gcs-key" name="GCS Repository Key">
                         <summary>GCS repository key.</summary>
 
-                        <text>A token or service key file depending on the <br-option>repo-gcs-key-type</br-option> option.</text>
+                        <text>
+                            <p>A token or service key file depending on the <br-option>repo-gcs-key-type</br-option> option.</p>
+                        </text>
 
                         <example>/etc/pgbackrest/gcs-key.json</example>
                     </config-key>
@@ -431,12 +521,15 @@
                     <config-key id="repo-gcs-key-type" name="GCS Repository Key Type">
                         <summary>GCS repository key type.</summary>
 
-                        <text>The following types are supported for authorization:
-                        <ul>
-                            <li><id>auto</id> - Authorize using the instance service account.</li>
-                            <li><id>service</id> - Service account from locally stored key.</li>
-                            <li><id>token</id> - For local testing, e.g. <file>fakegcs</file>.</li>
-                        </ul></text>
+                        <text>
+                            <p>The following types are supported for authorization:</p>
+
+                            <list>
+                                <list-item><id>auto</id> - Authorize using the instance service account.</list-item>
+                                <list-item><id>service</id> - Service account from locally stored key.</list-item>
+                                <list-item><id>token</id> - For local testing, e.g. <file>fakegcs</file>.</list-item>
+                            </list>
+                        </text>
 
                         <example>none</example>
                     </config-key>
@@ -445,9 +538,11 @@
                     <config-key id="repo-host" name="Repository Host">
                         <summary>Repository host when operating remotely via SSH.</summary>
 
-                        <text>Make sure that trusted SSH authentication is configured between the <postgres/> host and the repository host.
+                        <text>
+                            <p>Make sure that trusted SSH authentication is configured between the <postgres/> host and the repository host.</p>
 
-                        When backing up and archiving to a locally mounted filesystem this setting is not required.</text>
+                            <p>When backing up and archiving to a locally mounted filesystem this setting is not required.</p>
+                        </text>
 
                         <example>repo1.domain.com</example>
                     </config-key>
@@ -456,7 +551,9 @@
                     <config-key id="repo-host-cmd" name="Repository Host Command">
                         <summary><backrest/> exe path on the repository host.</summary>
 
-                        <text>Required only if the path to <exe/> is different on the local and repository hosts.  If not defined, the repository host exe path will be set the same as the local exe path.</text>
+                        <text>
+                            <p>Required only if the path to <exe/> is different on the local and repository hosts. If not defined, the repository host exe path will be set the same as the local exe path.</p>
+                        </text>
 
                         <default>same as local</default>
                         <example>/usr/lib/backrest/bin/pgbackrest</example>
@@ -466,7 +563,9 @@
                     <config-key id="repo-host-config" name="Repository Host Configuration">
                         <summary><backrest/> repository host configuration file.</summary>
 
-                        <text>Sets the location of the configuration file on the repository host.  This is only required if the repository host configuration file is in a different location than the local configuration file.</text>
+                        <text>
+                            <p>Sets the location of the configuration file on the repository host. This is only required if the repository host configuration file is in a different location than the local configuration file.</p>
+                        </text>
 
                         <example>/conf/pgbackrest/pgbackrest.conf</example>
                     </config-key>
@@ -475,7 +574,9 @@
                     <config-key id="repo-host-config-include-path" name="Repository Host Configuration Include Path">
                         <summary><backrest/> repository host configuration include path.</summary>
 
-                        <text>Sets the location of the configuration include path on the repository host.  This is only required if the repository host configuration include path is in a different location than the local configuration include path.</text>
+                        <text>
+                            <p>Sets the location of the configuration include path on the repository host. This is only required if the repository host configuration include path is in a different location than the local configuration include path.</p>
+                        </text>
 
                         <example>/conf/pgbackrest/conf.d</example>
                     </config-key>
@@ -484,7 +585,9 @@
                     <config-key id="repo-host-config-path" name="Repository Host Configuration Path">
                         <summary><backrest/> repository host configuration path.</summary>
 
-                        <text>Sets the location of the configuration path on the repository host.  This is only required if the repository host configuration path is in a different location than the local configuration path.</text>
+                        <text>
+                            <p>Sets the location of the configuration path on the repository host. This is only required if the repository host configuration path is in a different location than the local configuration path.</p>
+                        </text>
 
                         <example>/conf/pgbackrest</example>
                     </config-key>
@@ -493,7 +596,9 @@
                     <config-key id="repo-host-user" name="Repository Host User">
                         <summary>Repository host user when <setting>repo-host</setting> is set.</summary>
 
-                        <text>Defines the user that will be used for operations on the repository host.  Preferably this is not the <id>postgres</id> user but rather some other user like <id>pgbackrest</id>.  If <postgres/> runs on the repository host the <id>postgres</id> user can be placed in the <id>pgbackrest</id> group so it has read permissions on the repository without being able to damage the contents accidentally.</text>
+                        <text>
+                            <p>Defines the user that will be used for operations on the repository host. Preferably this is not the <id>postgres</id> user but rather some other user like <id>pgbackrest</id>. If <postgres/> runs on the repository host the <id>postgres</id> user can be placed in the <id>pgbackrest</id> group so it has read permissions on the repository without being able to damage the contents accidentally.</p>
+                        </text>
 
                         <example>repo-user</example>
                     </config-key>
@@ -502,7 +607,9 @@
                     <config-key id="repo-host-port" name="Repository Host Port">
                         <summary>Repository host port when <setting>repo-host</setting> is set.</summary>
 
-                        <text>Use this option to specify a non-default port for the repository host protocol.  Currently only SSH is supported</text>
+                        <text>
+                            <p>Use this option to specify a non-default port for the repository host protocol. Currently only SSH is supported.</p>
+                        </text>
 
                         <example>25</example>
                     </config-key>
@@ -511,7 +618,9 @@
                     <config-key id="repo-hardlink" name="Repository Hardlink">
                         <summary>Hardlink files between backups in the repository.</summary>
 
-                        <text>Enable hard-linking of files in differential and incremental backups to their full backups.  This gives the appearance that each backup is a full backup at the file-system level.  Be careful, though, because modifying files that are hard-linked can affect all the backups in the set.</text>
+                        <text>
+                            <p>Enable hard-linking of files in differential and incremental backups to their full backups. This gives the appearance that each backup is a full backup at the file-system level. Be careful, though, because modifying files that are hard-linked can affect all the backups in the set.</p>
+                        </text>
 
                         <example>y</example>
                     </config-key>
@@ -520,7 +629,9 @@
                     <config-key id="repo-local" name="Repository Locality">
                         <summary>Repository is local.</summary>
 
-                        <text>Indicates that the repository for the specified index is local and any repository host settings for that index (e.g. <setting>repo1-host</setting>) should be ignored.</text>
+                        <text>
+                            <p>Indicates that the repository for the specified index is local and any repository host settings for that index (e.g. <setting>repo1-host</setting>) should be ignored.</p>
+                        </text>
 
                         <example>y</example>
                     </config-key>
@@ -529,9 +640,11 @@
                     <config-key id="repo-path" name="Repository Path">
                         <summary>Path where backups and archive are stored.</summary>
 
-                        <text>The repository is where <backrest/> stores backups and archives WAL segments.
+                        <text>
+                            <p>The repository is where <backrest/> stores backups and archives WAL segments.</p>
 
-                        It may be difficult to estimate in advance how much space you'll need.  The best thing to do is take some backups then record the size of different types of backups (full/incr/diff) and measure the amount of WAL generated per day.  This will give you a general idea of how much space you'll need, though of course requirements will likely change over time as your database evolves.</text>
+                            <p>It may be difficult to estimate in advance how much space you'll need. The best thing to do is take some backups then record the size of different types of backups (full/incr/diff) and measure the amount of WAL generated per day. This will give you a general idea of how much space you'll need, though of course requirements will likely change over time as your database evolves.</p>
+                        </text>
 
                         <example>/backup/db/backrest</example>
                     </config-key>
@@ -540,7 +653,9 @@
                     <config-key id="repo-retention-full" name="Full Retention">
                         <summary>Full backup retention count/time.</summary>
 
-                        <text>When a full backup expires, all differential and incremental backups associated with the full backup will also expire.  When the option is not defined a warning will be issued.  If indefinite retention is desired then set the option to the max value.</text>
+                        <text>
+                            <p>When a full backup expires, all differential and incremental backups associated with the full backup will also expire. When the option is not defined a warning will be issued. If indefinite retention is desired then set the option to the max value.</p>
+                        </text>
 
                         <example>2</example>
                     </config-key>
@@ -549,7 +664,9 @@
                     <config-key id="repo-retention-full-type" name="Full Retention Type">
                         <summary>Retention type for full backups.</summary>
 
-                        <text>Determines whether the <setting>repo-retention-full</setting> setting represents a time period (days) or count of full backups to keep. If set to <setting>time</setting> then full backups older than <setting>repo-retention-full</setting> will be removed from the repository if there is at least one backup that is equal to or greater than the <setting>repo-retention-full</setting> setting. For example, if <setting>repo-retention-full</setting> is 30 (days) and there are 2 full backups: one 25 days old and one 35 days old, no full backups will be expired because expiring the 35 day old backup would leave only the 25 day old backup, which would violate the 30 day retention policy of having at least one backup 30 days old before an older one can be expired. Archived WAL older than the oldest full backup remaining will be automatically expired unless <setting>repo-retention-archive-type</setting> and <setting>repo-retention-archive</setting> are explicitly set.</text>
+                        <text>
+                            <p>Determines whether the <setting>repo-retention-full</setting> setting represents a time period (days) or count of full backups to keep. If set to <setting>time</setting> then full backups older than <setting>repo-retention-full</setting> will be removed from the repository if there is at least one backup that is equal to or greater than the <setting>repo-retention-full</setting> setting. For example, if <setting>repo-retention-full</setting> is 30 (days) and there are 2 full backups: one 25 days old and one 35 days old, no full backups will be expired because expiring the 35 day old backup would leave only the 25 day old backup, which would violate the 30 day retention policy of having at least one backup 30 days old before an older one can be expired. Archived WAL older than the oldest full backup remaining will be automatically expired unless <setting>repo-retention-archive-type</setting> and <setting>repo-retention-archive</setting> are explicitly set.</p>
+                        </text>
 
                         <example>time</example>
                     </config-key>
@@ -558,7 +675,9 @@
                     <config-key id="repo-retention-diff" name="Differential Retention">
                         <summary>Number of differential backups to retain.</summary>
 
-                        <text>When a differential backup expires, all incremental backups associated with the differential backup will also expire.  When not defined all differential backups will be kept until the full backups they depend on expire.</text>
+                        <text>
+                            <p>When a differential backup expires, all incremental backups associated with the differential backup will also expire. When not defined all differential backups will be kept until the full backups they depend on expire.</p>
+                        </text>
 
                         <example>3</example>
                     </config-key>
@@ -567,7 +686,9 @@
                     <config-key id="repo-retention-archive-type" name="Archive Retention Type">
                         <summary>Backup type for WAL retention.</summary>
 
-                        <text>If set to <setting>full</setting> <backrest/> will keep archive logs for the number of full backups defined by <setting>repo-retention-archive</setting>.  If set to <setting>diff</setting> (differential) <backrest/> will keep archive logs for the number of full and differential backups defined by <setting>repo-retention-archive</setting>, meaning if the last backup taken was a full backup, it will be counted as a differential for the purpose of repo-retention.  If set to <setting>incr</setting> (incremental) <backrest/> will keep archive logs for the number of full, differential, and incremental backups defined by <setting>repo-retention-archive</setting>. It is recommended that this setting not be changed from the default which will only expire WAL in conjunction with expiring full backups.</text>
+                        <text>
+                            <p>If set to <setting>full</setting> <backrest/> will keep archive logs for the number of full backups defined by <setting>repo-retention-archive</setting>. If set to <setting>diff</setting> (differential) <backrest/> will keep archive logs for the number of full and differential backups defined by <setting>repo-retention-archive</setting>, meaning if the last backup taken was a full backup, it will be counted as a differential for the purpose of repo-retention. If set to <setting>incr</setting> (incremental) <backrest/> will keep archive logs for the number of full, differential, and incremental backups defined by <setting>repo-retention-archive</setting>. It is recommended that this setting not be changed from the default which will only expire WAL in conjunction with expiring full backups.</p>
+                        </text>
 
                         <example>diff</example>
                     </config-key>
@@ -576,9 +697,13 @@
                     <config-key id="repo-retention-archive" name="Archive Retention">
                         <summary>Number of backups worth of continuous WAL to retain.</summary>
 
-                        <text><admonition type="note">WAL segments required to make a backup consistent are always retained until the backup is expired regardless of how this option is configured.</admonition>If this value is not set and <setting>repo-retention-full-type</setting> is <setting>count</setting> (default), then the archive to expire will default to the <setting>repo-retention-full</setting> (or <setting>repo-retention-diff</setting>) value corresponding to the <setting>repo-retention-archive-type</setting> if set to <setting>full</setting> (or <setting>diff</setting>). This will ensure that WAL is only expired for backups that are already expired. If <setting>repo-retention-full-type</setting> is <setting>time</setting>, then this value will default to removing archives that are earlier than the oldest full backup retained after satisfying the <setting>repo-retention-full</setting> setting.
+                        <text>
+                            <admonition type="note">WAL segments required to make a backup consistent are always retained until the backup is expired regardless of how this option is configured.</admonition>
 
-                        This option must be set if <setting>repo-retention-archive-type</setting> is set to <setting>incr</setting>.  If disk space is at a premium, then this setting, in conjunction with <setting>repo-retention-archive-type</setting>, can be used to aggressively expire WAL segments. However, doing so negates the ability to perform PITR from the backups with expired WAL and is therefore <b>not</b> recommended.</text>
+                            <p>If this value is not set and <setting>repo-retention-full-type</setting> is <setting>count</setting> (default), then the archive to expire will default to the <setting>repo-retention-full</setting> (or <setting>repo-retention-diff</setting>) value corresponding to the <setting>repo-retention-archive-type</setting> if set to <setting>full</setting> (or <setting>diff</setting>). This will ensure that WAL is only expired for backups that are already expired. If <setting>repo-retention-full-type</setting> is <setting>time</setting>, then this value will default to removing archives that are earlier than the oldest full backup retained after satisfying the <setting>repo-retention-full</setting> setting.</p>
+
+                            <p>This option must be set if <setting>repo-retention-archive-type</setting> is set to <setting>incr</setting>. If disk space is at a premium, then this setting, in conjunction with <setting>repo-retention-archive-type</setting>, can be used to aggressively expire WAL segments. However, doing so negates the ability to perform PITR from the backups with expired WAL and is therefore <b>not</b> recommended.</p>
+                        </text>
 
                         <example>2</example>
                     </config-key>
@@ -587,11 +712,13 @@
                     <config-key id="repo-retention-history" name="Backup History Retention">
                         <summary>Days of backup history manifests to retain.</summary>
 
-                        <text>A copy of the backup manifest is stored in the <path>backup.history</path> path when a backup completes. By default these files are never expired since they are useful for data mining, e.g. measuring backup and WAL growth over time.
+                        <text>
+                            <p>A copy of the backup manifest is stored in the <path>backup.history</path> path when a backup completes. By default these files are never expired since they are useful for data mining, e.g. measuring backup and WAL growth over time.</p>
 
-                        Set <setting>repo-retention-history</setting> to define the number of days of backup history manifests to retain. Unexpired backups are always kept in the backup history. Specify <br-option>repo-retention-history=0</br-option> to retain the backup history only for unexpired backups.
+                            <p>Set <setting>repo-retention-history</setting> to define the number of days of backup history manifests to retain. Unexpired backups are always kept in the backup history. Specify <br-option>repo-retention-history=0</br-option> to retain the backup history only for unexpired backups.</p>
 
-                        When a full backup history manifest is expired, all differential and incremental backup history manifests associated with the full backup also expire.</text>
+                            <p>When a full backup history manifest is expired, all differential and incremental backup history manifests associated with the full backup also expire.</p>
+                        </text>
 
                         <example>365</example>
                     </config-key>
@@ -600,7 +727,9 @@
                     <config-key id="repo-s3-key" name="S3 Repository Access Key">
                         <summary>S3 repository access key.</summary>
 
-                        <text>AWS key used to access this bucket.</text>
+                        <text>
+                            <p>AWS key used to access this bucket.</p>
+                        </text>
 
                         <example>AKIAIOSFODNN7EXAMPLE</example>
                     </config-key>
@@ -609,7 +738,9 @@
                     <config-key id="repo-s3-key-secret" name="S3 Repository Secret Access Key">
                         <summary>S3 repository secret access key.</summary>
 
-                        <text>AWS secret key used to access this bucket.</text>
+                        <text>
+                            <p>AWS secret key used to access this bucket.</p>
+                        </text>
 
                         <example>wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY</example>
                     </config-key>
@@ -618,11 +749,14 @@
                     <config-key id="repo-s3-key-type" name="S3 Repository Key Type">
                         <summary>S3 repository key type.</summary>
 
-                        <text>The following types are supported:
-                        <ul>
-                            <li><id>shared</id> - Shared keys</li>
-                            <li><id>auto</id> - Automatically retrieve temporary credentials</li>
-                        </ul></text>
+                        <text>
+                            <p>The following types are supported:</p>
+
+                            <list>
+                                <list-item><id>shared</id> - Shared keys</list-item>
+                                <list-item><id>auto</id> - Automatically retrieve temporary credentials</list-item>
+                            </list>
+                        </text>
 
                         <example>auto</example>
                     </config-key>
@@ -631,7 +765,9 @@
                     <config-key id="repo-s3-token" name="S3 Repository Security Token">
                         <summary>S3 repository security token.</summary>
 
-                        <text>AWS security token used with temporary credentials.</text>
+                        <text>
+                            <p>AWS security token used with temporary credentials.</p>
+                        </text>
 
                         <example>AQoDYXdzEPT//////////wEXAMPLEtc764bNrC9SAPBSM22 ...</example>
                     </config-key>
@@ -640,9 +776,11 @@
                     <config-key id="repo-s3-bucket" name="S3 Repository Bucket">
                         <summary>S3 repository bucket.</summary>
 
-                        <text>S3 bucket used to store the repository.
+                        <text>
+                            <p>S3 bucket used to store the repository.</p>
 
-                        <backrest/> repositories can be stored in the bucket root by setting <br-option>repo-path=/</br-option> but it is usually best to specify a prefix, such as <path>/repo</path>, so logs and other AWS generated content can also be stored in the bucket.</text>
+                            <p><backrest/> repositories can be stored in the bucket root by setting <br-option>repo-path=/</br-option> but it is usually best to specify a prefix, such as <path>/repo</path>, so logs and other AWS generated content can also be stored in the bucket.</p>
+                        </text>
 
                         <example>pg-backup</example>
                     </config-key>
@@ -651,9 +789,11 @@
                     <config-key id="repo-s3-endpoint" name="S3 Repository Endpoint">
                         <summary>S3 repository endpoint.</summary>
 
-                        <text>The AWS endpoint should be valid for the selected region.
+                        <text>
+                            <p>The AWS endpoint should be valid for the selected region.</p>
 
-                        For custom/test configurations the <setting>repo-storage-ca-file</setting>, <setting>repo-storage-ca-path</setting>, <setting>repo-storage-host</setting>, <setting>repo-storage-port</setting>, and <setting>repo-storage-verify-tls</setting> options may be useful.</text>
+                            <p>For custom/test configurations the <setting>repo-storage-ca-file</setting>, <setting>repo-storage-ca-path</setting>, <setting>repo-storage-host</setting>, <setting>repo-storage-port</setting>, and <setting>repo-storage-verify-tls</setting> options may be useful.</p>
+                        </text>
 
                         <example>s3.amazonaws.com</example>
                     </config-key>
@@ -662,7 +802,9 @@
                     <config-key id="repo-s3-role" name="S3 Repository Role">
                         <summary>S3 repository role.</summary>
 
-                        <text>The AWS role name (not the full ARN) used to retrieve temporary credentials when <br-option>repo-s3-key-type=auto</br-option>.</text>
+                        <text>
+                            <p>The AWS role name (not the full ARN) used to retrieve temporary credentials when <br-option>repo-s3-key-type=auto</br-option>.</p>
+                        </text>
 
                         <example>authrole</example>
                     </config-key>
@@ -671,7 +813,9 @@
                     <config-key id="repo-s3-region" name="S3 Repository Region">
                         <summary>S3 repository region.</summary>
 
-                        <text>The AWS region where the bucket was created.</text>
+                        <text>
+                            <p>The AWS region where the bucket was created.</p>
+                        </text>
 
                         <example>us-east-1</example>
                     </config-key>
@@ -680,11 +824,14 @@
                     <config-key id="repo-s3-uri-style" name="S3 Repository URI Style">
                         <summary>S3 URI Style.</summary>
 
-                        <text>The following URI styles are supported:
-                        <ul>
-                            <li><id>host</id> - Connect to <id>bucket.endpoint</id> host.</li>
-                            <li><id>path</id> - Connect to <id>endpoint</id> host and prepend bucket to URIs.</li>
-                        </ul></text>
+                        <text>
+                            <p>The following URI styles are supported:</p>
+
+                            <list>
+                                <list-item><id>host</id> - Connect to <id>bucket.endpoint</id> host.</list-item>
+                                <list-item><id>path</id> - Connect to <id>endpoint</id> host and prepend bucket to URIs.</list-item>
+                            </list>
+                        </text>
 
                         <example>path</example>
                     </config-key>
@@ -693,7 +840,9 @@
                     <config-key id="repo-storage-ca-file" name="Repository Storage CA File">
                         <summary>Repository storage CA file.</summary>
 
-                        <text>Use a CA file other than the system default for storage (e.g. S3, Azure) certificates.</text>
+                        <text>
+                            <p>Use a CA file other than the system default for storage (e.g. S3, Azure) certificates.</p>
+                        </text>
 
                         <example>/etc/pki/tls/certs/ca-bundle.crt</example>
                     </config-key>
@@ -702,7 +851,9 @@
                     <config-key id="repo-storage-ca-path" name="Repository Storage TLS CA Path">
                         <summary>Repository storage CA path.</summary>
 
-                        <text>Use a CA path other than the system default for storage (e.g. S3, Azure) certificates.</text>
+                        <text>
+                            <p>Use a CA path other than the system default for storage (e.g. S3, Azure) certificates.</p>
+                        </text>
 
                         <example>/etc/pki/tls/certs</example>
                     </config-key>
@@ -711,7 +862,9 @@
                     <config-key id="repo-storage-host" name="Repository Storage Host">
                         <summary>Repository storage host.</summary>
 
-                        <text>Connect to a host other than the storage (e.g. S3, Azure) endpoint. This is typically used for testing.</text>
+                        <text>
+                            <p>Connect to a host other than the storage (e.g. S3, Azure) endpoint. This is typically used for testing.</p>
+                        </text>
 
                         <example>127.0.0.1</example>
                     </config-key>
@@ -720,7 +873,9 @@
                     <config-key id="repo-storage-port" name="Repository Storage Port">
                         <summary>Repository storage port.</summary>
 
-                        <text>Port to use when connecting to the storage (e.g. S3, Azure) endpoint (or host if specified).</text>
+                        <text>
+                            <p>Port to use when connecting to the storage (e.g. S3, Azure) endpoint (or host if specified).</p>
+                        </text>
 
                         <example>9000</example>
                     </config-key>
@@ -729,7 +884,9 @@
                     <config-key id="repo-storage-verify-tls" name="Repository Storage Certificate Verify">
                         <summary>Repository storage certificate verify.</summary>
 
-                        <text>This option provides the ability to enable/disable verification of the storage (e.g. S3, Azure) server TLS certificate. Disabling should only be used for testing or other scenarios where a certificate has been self-signed.</text>
+                        <text>
+                            <p>This option provides the ability to enable/disable verification of the storage (e.g. S3, Azure) server TLS certificate. Disabling should only be used for testing or other scenarios where a certificate has been self-signed.</p>
+                        </text>
 
                         <example>n</example>
                     </config-key>
@@ -738,14 +895,19 @@
                     <config-key id="repo-type" name="Repository Type">
                         <summary>Type of storage used for the repository.</summary>
 
-                        <text>The following repository types are supported:
-                        <ul>
-                            <li><id>azure</id> - Azure Blob Storage Service</li>
-                            <li><id>cifs</id> - Like <id>posix</id>, but disables links and directory fsyncs</li>
-                            <li><id>gcs</id> - Google Cloud Storage</li>
-                            <li><id>posix</id> - Posix-compliant file systems</li>
-                            <li><id>s3</id> - AWS Simple Storage Service</li>
-                        </ul>When an <proper>NFS</proper> mount is used as a <id>posix</id> repository, the same rules apply to <backrest/> as described in the <postgres/> documentation: <link url="https://www.postgresql.org/docs/current/creating-cluster.html#CREATING-CLUSTER-FILESYSTEM">Creating a Database Cluster - File Systems</link>.</text>
+                        <text>
+                            <p>The following repository types are supported:</p>
+
+                            <list>
+                                <list-item><id>azure</id> - Azure Blob Storage Service</list-item>
+                                <list-item><id>cifs</id> - Like <id>posix</id>, but disables links and directory fsyncs</list-item>
+                                <list-item><id>gcs</id> - Google Cloud Storage</list-item>
+                                <list-item><id>posix</id> - Posix-compliant file systems</list-item>
+                                <list-item><id>s3</id> - AWS Simple Storage Service</list-item>
+                            </list>
+
+                            <p>When an <proper>NFS</proper> mount is used as a <id>posix</id> repository, the same rules apply to <backrest/> as described in the <postgres/> documentation: <link url="https://www.postgresql.org/docs/current/creating-cluster.html#CREATING-CLUSTER-FILESYSTEM">Creating a Database Cluster - File Systems</link>.</p>
+                        </text>
 
                         <example>cifs</example>
                     </config-key>
@@ -754,11 +916,16 @@
                     <config-key id="repo-cipher-type" name="Repository Cipher Type">
                         <summary>Cipher used to encrypt the repository.</summary>
 
-                        <text>The following cipher types are supported:
-                        <ul>
-                            <li><id>none</id> - The repository is not encrypted</li>
-                            <li><id>aes-256-cbc</id> - Advanced Encryption Standard with 256 bit key length</li>
-                        </ul>Note that encryption is always performed client-side even if the repository type (e.g. S3) supports encryption.</text>
+                        <text>
+                            <p>The following cipher types are supported:</p>
+
+                            <list>
+                                <list-item><id>none</id> - The repository is not encrypted</list-item>
+                                <list-item><id>aes-256-cbc</id> - Advanced Encryption Standard with 256 bit key length</list-item>
+                            </list>
+
+                            <p>Note that encryption is always performed client-side even if the repository type (e.g. S3) supports encryption.</p>
+                        </text>
 
                         <default>none</default>
                         <example>aes-256-cbc</example>
@@ -768,7 +935,9 @@
                     <config-key id="repo-cipher-pass" name="Repository Cipher Passphrase">
                         <summary>Repository cipher passphrase.</summary>
 
-                        <text>Passphrase used to encrypt/decrypt files of the repository.</text>
+                        <text>
+                            <p>Passphrase used to encrypt/decrypt files of the repository.</p>
+                        </text>
 
                         <example>zWaf6XtpjIVZC5444yXB+cgFDFl7MxGlgkZSaoPvTGirhPygu4jOKOXf9LO4vjfO</example>
                     </config-key>
@@ -777,16 +946,20 @@
 
             <!-- CONFIG - BACKUP -->
             <config-section id="backup" name="Backup">
-                <text>The <setting>backup</setting> section defines settings related to backup.</text>
+                <text>
+                    <p>The <setting>backup</setting> section defines settings related to backup.</p>
+                </text>
 
                 <config-key-list>
                     <!-- CONFIG - BACKUP SECTION - ARCHIVE-CHECK -->
                     <config-key id="archive-check" name="Check Archive">
                         <summary>Check that WAL segments are in the archive before backup completes.</summary>
 
-                        <text>Checks that all WAL segments required to make the backup consistent are present in the WAL archive.  It's a good idea to leave this as the default unless you are using another method for archiving.
+                        <text>
+                            <p>Checks that all WAL segments required to make the backup consistent are present in the WAL archive. It's a good idea to leave this as the default unless you are using another method for archiving.</p>
 
-                        This option must be enabled if <br-option>archive-copy</br-option> is enabled.</text>
+                            <p>This option must be enabled if <br-option>archive-copy</br-option> is enabled.</p>
+                        </text>
 
                         <example>n</example>
                     </config-key>
@@ -795,13 +968,15 @@
                     <config-key id="archive-copy" name="Copy Archive">
                         <summary>Copy WAL segments needed for consistency to the backup.</summary>
 
-                        <text>This slightly paranoid option protects against corruption in the WAL segment archive by storing the WAL segments required for consistency directly in the backup.  WAL segments are still stored in the archive so this option will use additional space.
+                        <text>
+                            <p>This slightly paranoid option protects against corruption in the WAL segment archive by storing the WAL segments required for consistency directly in the backup. WAL segments are still stored in the archive so this option will use additional space.</p>
 
-                        It is best if the <cmd>archive-push</cmd> and <cmd>backup</cmd> commands have the same <setting>compress-type</setting> (e.g. <id>lz4</id>) when using this option. Otherwise, the WAL segments will need to be recompressed with the <setting>compress-type</setting> used by the backup, which can be fairly expensive depending on how much WAL was generated during the backup.
+                            <p>It is best if the <cmd>archive-push</cmd> and <cmd>backup</cmd> commands have the same <setting>compress-type</setting> (e.g. <id>lz4</id>) when using this option. Otherwise, the WAL segments will need to be recompressed with the <setting>compress-type</setting> used by the backup, which can be fairly expensive depending on how much WAL was generated during the backup.</p>
 
-                        On restore, the WAL segments will be present in <path>pg_xlog/pg_wal</path> and <postgres/> will use them in preference to calling the <code>restore_command</code>.
+                            <p>On restore, the WAL segments will be present in <path>pg_xlog/pg_wal</path> and <postgres/> will use them in preference to calling the <code>restore_command</code>.</p>
 
-                        The <br-option>archive-check</br-option> option must be enabled if <br-option>archive-copy</br-option> is enabled.</text>
+                            <p>The <br-option>archive-check</br-option> option must be enabled if <br-option>archive-copy</br-option> is enabled.</p>
+                        </text>
 
                         <example>y</example>
                     </config-key>
@@ -810,9 +985,11 @@
                     <config-key id="archive-header-check" name="Check WAL Headers">
                         <summary>Check PostgreSQL version/id in WAL headers.</summary>
 
-                        <text>Enabled by default, this option checks the WAL header against the <postgres/> version and system identifier to ensure that the WAL is being copied to the correct stanza. This is in addition to checking <file>pg_control</file> against the stanza and verifying that WAL is being copied from the same <postgres/> data directory where <file>pg_control</file> is located.
+                        <text>
+                            <p>Enabled by default, this option checks the WAL header against the <postgres/> version and system identifier to ensure that the WAL is being copied to the correct stanza. This is in addition to checking <file>pg_control</file> against the stanza and verifying that WAL is being copied from the same <postgres/> data directory where <file>pg_control</file> is located.</p>
 
-                        Therefore, disabling this check is fairly safe but should only be done when needed, e.g. if the WAL is encrypted.</text>
+                            <p>Therefore, disabling this check is fairly safe but should only be done when needed, e.g. if the WAL is encrypted.</p>
+                        </text>
 
                         <example>n</example>
                     </config-key>
@@ -821,11 +998,13 @@
                     <config-key id="archive-mode-check" name="Check Archive Mode">
                         <summary>Check the <postgres/> <setting>archive_mode</setting> setting.</summary>
 
-                        <text>Enabled by default, this option disallows <postgres/> <setting>archive_mode=always</setting>.
+                        <text>
+                            <p>Enabled by default, this option disallows <postgres/> <setting>archive_mode=always</setting>.</p>
 
-                        WAL segments pushed from a standby server might be logically the same as WAL segments pushed from the primary but have different checksums. Disabling archiving from multiple sources is recommended to avoid conflicts.
+                            <p>WAL segments pushed from a standby server might be logically the same as WAL segments pushed from the primary but have different checksums. Disabling archiving from multiple sources is recommended to avoid conflicts.</p>
 
-                        <admonition type="caution">If this option is disabled then it is critical to ensure that only one archiver is writing to the repository via the <cmd>archive-push</cmd> command.</admonition></text>
+                            <admonition type="caution">If this option is disabled then it is critical to ensure that only one archiver is writing to the repository via the <cmd>archive-push</cmd> command.</admonition>
+                        </text>
 
                         <example>n</example>
                     </config-key>
@@ -834,7 +1013,9 @@
                     <config-key id="backup-standby" name="Backup from Standby">
                         <summary>Backup from the standby cluster.</summary>
 
-                        <text>Enable backup from standby to reduce load on the primary cluster.  This option requires that both the <host>primary</host> and <host>standby</host> hosts be configured.</text>
+                        <text>
+                            <p>Enable backup from standby to reduce load on the primary cluster. This option requires that both the <host>primary</host> and <host>standby</host> hosts be configured.</p>
+                        </text>
 
                         <example>y</example>
                     </config-key>
@@ -843,9 +1024,11 @@
                     <config-key id="checksum-page" name="Page Checksums">
                         <summary>Validate data page checksums.</summary>
 
-                        <text>Directs <backrest/> to validate all data page checksums while backing up a cluster.  This option is automatically enabled when data page checksums are enabled on the cluster.
+                        <text>
+                            <p>Directs <backrest/> to validate all data page checksums while backing up a cluster. This option is automatically enabled when data page checksums are enabled on the cluster.</p>
 
-                        Failures in checksum validation will not abort a backup.  Rather, warnings will be emitted in the log (and to the console with default settings) and the list of invalid pages will be stored in the backup manifest.</text>
+                            <p>Failures in checksum validation will not abort a backup. Rather, warnings will be emitted in the log (and to the console with default settings) and the list of invalid pages will be stored in the backup manifest.</p>
+                        </text>
 
                         <example>n</example>
                     </config-key>
@@ -854,13 +1037,19 @@
                     <config-key id="exclude" name="Path/File Exclusions">
                         <summary>Exclude paths/files from the backup.</summary>
 
-                        <text>All exclusions are relative to <path>$PGDATA</path>. If the exclusion ends with / then only files in the specified directory will be excluded, e.g. <br-option>--exclude=junk/</br-option> will exclude all files in the <path>$PGDATA/junk</path> directory but include the directory itself.  If the exclusion does not end with / then the file may match the exclusion exactly or match with / appended to the exclusion, e.g. <br-option>--exclude=junk</br-option> will exclude the <path>$PGDATA/junk</path> directory and all the files it contains.
+                        <text>
+                            <p>All exclusions are relative to <path>$PGDATA</path>. If the exclusion ends with / then only files in the specified directory will be excluded, e.g. <br-option>--exclude=junk/</br-option> will exclude all files in the <path>$PGDATA/junk</path> directory but include the directory itself. If the exclusion does not end with / then the file may match the exclusion exactly or match with / appended to the exclusion, e.g. <br-option>--exclude=junk</br-option> will exclude the <path>$PGDATA/junk</path> directory and all the files it contains.</p>
 
-                        <b>Be careful using this feature -- it is very easy to exclude something critical that will make the backup inconsistent.  Be sure to test your restores!</b>
+                            <p><b>Be careful using this feature -- it is very easy to exclude something critical that will make the backup inconsistent. Be sure to test your restores!</b></p>
 
-                        All excluded files will be logged at <id>info</id> level along with the exclusion rule.  Be sure to audit the list of excluded files to ensure nothing unexpected is being excluded.<admonition type="note">Exclusions are not honored on delta restores.  Any files/directories that were excluded by the backup will be <i>removed</i> on delta restore.</admonition>This option should not be used to exclude <postgres/> logs from a backup.  Logs can be moved out of the <id>PGDATA</id> directory using the <postgres/> <setting>log_directory</setting> setting, which has the benefit of allowing logs to be preserved after a restore.
+                            <p>All excluded files will be logged at <id>info</id> level along with the exclusion rule. Be sure to audit the list of excluded files to ensure nothing unexpected is being excluded.</p>
 
-                        Multiple exclusions may be specified on the command-line or in a configuration file.</text>
+                            <admonition type="note">Exclusions are not honored on delta restores. Any files/directories that were excluded by the backup will be <i>removed</i> on delta restore.</admonition>
+
+                            <p>This option should not be used to exclude <postgres/> logs from a backup. Logs can be moved out of the <id>PGDATA</id> directory using the <postgres/> <setting>log_directory</setting> setting, which has the benefit of allowing logs to be preserved after a restore.</p>
+
+                            <p>Multiple exclusions may be specified on the command-line or in a configuration file.</p>
+                        </text>
 
                         <example>junk/</example>
                     </config-key>
@@ -869,9 +1058,11 @@
                     <config-key id="manifest-save-threshold" name="Manifest Save Threshold">
                         <summary>Manifest save threshold during backup.</summary>
 
-                        <text>Defines how often the manifest will be saved during a backup.  Saving the manifest is important because it stores the checksums and allows the resume function to work efficiently.  The actual threshold used is 1% of the backup size or <setting>manifest-save-threshold</setting>, whichever is greater.
+                        <text>
+                            <p>Defines how often the manifest will be saved during a backup. Saving the manifest is important because it stores the checksums and allows the resume function to work efficiently. The actual threshold used is 1% of the backup size or <setting>manifest-save-threshold</setting>, whichever is greater.</p>
 
-                        Size can be entered in bytes (default) or KB, MB, GB, TB, or PB where the multiplier is a power of 1024.</text>
+                            <p>Size can be entered in bytes (default) or KB, MB, GB, TB, or PB where the multiplier is a power of 1024.</p>
+                        </text>
 
                         <example>5G</example>
                     </config-key>
@@ -880,7 +1071,9 @@
                     <config-key id="expire-auto" name="Expire Auto">
                         <summary>Automatically run the <cmd>expire</cmd> command after a successful backup.</summary>
 
-                        <text>The setting is enabled by default. Use caution when disabling this option as doing so will result in retaining all backups and archives indefinitely, which could cause your repository to run out of space. The <cmd>expire</cmd> command will need to be run regularly to prevent this from happening.</text>
+                        <text>
+                            <p>The setting is enabled by default. Use caution when disabling this option as doing so will result in retaining all backups and archives indefinitely, which could cause your repository to run out of space. The <cmd>expire</cmd> command will need to be run regularly to prevent this from happening.</p>
+                        </text>
 
                         <example>y</example>
                     </config-key>
@@ -889,7 +1082,9 @@
                     <config-key id="resume" name="Resume">
                         <summary>Allow resume of failed backup.</summary>
 
-                        <text>Defines whether the resume feature is enabled.  Resume can greatly reduce the amount of time required to run a backup after a previous backup of the same type has failed.  It adds complexity, however, so it may be desirable to disable in environments that do not require the feature.</text>
+                        <text>
+                            <p>Defines whether the resume feature is enabled. Resume can greatly reduce the amount of time required to run a backup after a previous backup of the same type has failed. It adds complexity, however, so it may be desirable to disable in environments that do not require the feature.</p>
+                        </text>
 
                         <example>n</example>
                     </config-key>
@@ -898,9 +1093,11 @@
                     <config-key id="start-fast" name="Start Fast">
                         <summary>Force a checkpoint to start backup quickly.</summary>
 
-                        <text>Forces a checkpoint (by passing <id>y</id> to the <id>fast</id> parameter of <code>pg_start_backup()</code>) so the backup begins immediately.  Otherwise the backup will start after the next regular checkpoint.
+                        <text>
+                            <p>Forces a checkpoint (by passing <id>y</id> to the <id>fast</id> parameter of <code>pg_start_backup()</code>) so the backup begins immediately. Otherwise the backup will start after the next regular checkpoint.</p>
 
-                        This feature only works in <postgres/> &gt;= <id>8.4</id>.</text>
+                            <p>This feature only works in <postgres/> &gt;= <id>8.4</id>.</p>
+                        </text>
 
                         <example>y</example>
                     </config-key>
@@ -909,13 +1106,15 @@
                     <config-key id="stop-auto" name="Stop Auto">
                         <summary>Stop prior failed backup on new backup.</summary>
 
-                        <text>This will only be done if an exclusive advisory lock can be acquired to demonstrate that the prior failed backup process has really stopped.
+                        <text>
+                            <p>This will only be done if an exclusive advisory lock can be acquired to demonstrate that the prior failed backup process has really stopped.</p>
 
-                        This feature relies on pg_is_in_backup() so only works on <postgres/> >= <id>9.3</id>.
+                            <p>This feature relies on pg_is_in_backup() so only works on <postgres/> >= <id>9.3</id>.</p>
 
-                        This feature is not supported for <postgres/> >= <id>9.6</id> since backups are run in non-exclusive mode.
+                            <p>This feature is not supported for <postgres/> >= <id>9.6</id> since backups are run in non-exclusive mode.</p>
 
-                        The setting is disabled by default because it assumes that <backrest/> is the only process doing exclusive online backups.  It depends on an advisory lock that only <backrest/> sets so it may abort other processes that do exclusive online backups.  Note that <cmd>base_backup</cmd> and <cmd>pg_dump</cmd> are safe to use with this setting because they do not call <code>pg_start_backup()</code> so are not exclusive.</text>
+                            <p>The setting is disabled by default because it assumes that <backrest/> is the only process doing exclusive online backups. It depends on an advisory lock that only <backrest/> sets so it may abort other processes that do exclusive online backups. Note that <cmd>base_backup</cmd> and <cmd>pg_dump</cmd> are safe to use with this setting because they do not call <code>pg_start_backup()</code> so are not exclusive.</p>
+                        </text>
 
                         <example>y</example>
                     </config-key>
@@ -924,16 +1123,20 @@
 
             <!-- CONFIG - ARCHIVE -->
             <config-section id="archive" name="Archive">
-                <text>The <setting>archive</setting> section defines options for the <cmd>archive-push</cmd> and <cmd>archive-get</cmd> commands.</text>
+                <text>
+                    <p>The <setting>archive</setting> section defines options for the <cmd>archive-push</cmd> and <cmd>archive-get</cmd> commands.</p>
+                </text>
 
                 <config-key-list>
                     <!-- CONFIG - ARCHIVE SECTION - ARCHIVE-ASYNC KEY -->
                     <config-key id="archive-async" name="Asynchronous Archiving">
                         <summary>Push/get WAL segments asynchronously.</summary>
 
-                        <text>Enables asynchronous operation for the <cmd>archive-push</cmd> and <cmd>archive-get</cmd> commands.
+                        <text>
+                            <p>Enables asynchronous operation for the <cmd>archive-push</cmd> and <cmd>archive-get</cmd> commands.</p>
 
-                        Asynchronous operation is more efficient because it can reuse connections and take advantage of parallelism.  See the <br-option>spool-path</br-option>, <br-option>archive-get-queue-max</br-option>, and <br-option>archive-push-queue-max</br-option> options for more information.</text>
+                            <p>Asynchronous operation is more efficient because it can reuse connections and take advantage of parallelism. See the <br-option>spool-path</br-option>, <br-option>archive-get-queue-max</br-option>, and <br-option>archive-push-queue-max</br-option> options for more information.</p>
+                        </text>
 
                         <example>y</example>
                     </config-key>
@@ -942,9 +1145,11 @@
                     <config-key id="archive-get-queue-max" name="Maximum Archive Get Queue Size">
                         <summary>Maximum size of the <backrest/> archive-get queue.</summary>
 
-                        <text>Specifies the maximum size of the <cmd>archive-get</cmd> queue when <br-option>archive-async</br-option> is enabled.  The queue is stored in the <br-option>spool-path</br-option> and is used to speed providing WAL to <postgres/>.
+                        <text>
+                            <p>Specifies the maximum size of the <cmd>archive-get</cmd> queue when <br-option>archive-async</br-option> is enabled. The queue is stored in the <br-option>spool-path</br-option> and is used to speed providing WAL to <postgres/>.</p>
 
-                        Size can be entered in bytes (default) or KB, MB, GB, TB, or PB where the multiplier is a power of 1024.</text>
+                            <p>Size can be entered in bytes (default) or KB, MB, GB, TB, or PB where the multiplier is a power of 1024.</p>
+                        </text>
 
                         <example>1073741824</example>
                     </config-key>
@@ -953,18 +1158,22 @@
                     <config-key id="archive-push-queue-max" name="Maximum Archive Push Queue Size">
                         <summary>Maximum size of the <postgres/> archive queue.</summary>
 
-                        <text>After the limit is reached, the following will happen:
-                        <ol>
-                            <li><backrest/> will notify <postgres/> that the WAL was successfully archived, then <b>DROP IT</b>.</li>
-                            <li>A warning will be output to the Postgres log.</li>
+                        <text>
+                            <p>After the limit is reached, the following will happen:</p>
 
-                        </ol>If this occurs then the archive log stream will be interrupted and PITR will not be possible past that point.  A new backup will be required to regain full restore capability.
+                            <list>
+                                <list-item><backrest/> will notify <postgres/> that the WAL was successfully archived, then <b>DROP IT</b>.</list-item>
+                                <list-item>A warning will be output to the Postgres log.</list-item>
+                            </list>
 
-                        In asynchronous mode the entire queue will be dropped to prevent spurts of WAL getting through before the queue limit is exceeded again.
+                            <p>If this occurs then the archive log stream will be interrupted and PITR will not be possible past that point. A new backup will be required to regain full restore capability.</p>
 
-                        The purpose of this feature is to prevent the log volume from filling up at which point Postgres will stop completely.  Better to lose the backup than have <postgres/> go down.
+                            <p>In asynchronous mode the entire queue will be dropped to prevent spurts of WAL getting through before the queue limit is exceeded again.</p>
 
-                        Size can be entered in bytes (default) or KB, MB, GB, TB, or PB where the multiplier is a power of 1024.</text>
+                            <p>The purpose of this feature is to prevent the log volume from filling up at which point Postgres will stop completely. Better to lose the backup than have <postgres/> go down.</p>
+
+                            <p>Size can be entered in bytes (default) or KB, MB, GB, TB, or PB where the multiplier is a power of 1024.</p>
+                        </text>
 
                         <example>1GB</example>
                     </config-key>
@@ -973,7 +1182,9 @@
                     <config-key id="archive-timeout" name="Archive Timeout">
                         <summary>Archive timeout.</summary>
 
-                        <text>Set maximum time, in seconds, to wait for each WAL segment to reach the <backrest/> archive repository.  The timeout applies to the <cmd>check</cmd> and <cmd>backup</cmd> commands when waiting for WAL segments required for backup consistency to be archived.</text>
+                        <text>
+                            <p>Set maximum time, in seconds, to wait for each WAL segment to reach the <backrest/> archive repository. The timeout applies to the <cmd>check</cmd> and <cmd>backup</cmd> commands when waiting for WAL segments required for backup consistency to be archived.</p>
+                        </text>
 
                         <example>30</example>
                     </config-key>
@@ -982,20 +1193,27 @@
 
             <!-- CONFIG - RESTORE -->
             <config-section id="restore" name="Restore">
-                <text>The <setting>restore</setting> section defines settings used for restoring backups.</text>
+                <text>
+                    <p>The <setting>restore</setting> section defines settings used for restoring backups.</p>
+                </text>
 
                 <config-key-list>
                     <!-- ======================================================================================================= -->
                     <config-key id="archive-mode" name="Archive Mode">
                         <summary>Preserve or disable archiving on restored cluster.</summary>
 
-                        <text>This option allows archiving to be preserved or disabled on a restored cluster. This is useful when the cluster must be promoted to do some work but is not intended to become the new primary. In this case it is not a good idea to push WAL from the cluster into the repository.
+                        <text>
+                            <p>This option allows archiving to be preserved or disabled on a restored cluster. This is useful when the cluster must be promoted to do some work but is not intended to become the new primary. In this case it is not a good idea to push WAL from the cluster into the repository.</p>
 
-                        The following modes are supported:
-                        <ul>
-                            <li><id>off</id> - disable archiving by setting <setting>archive_mode=off</setting>.</li>
-                            <li><id>preserve</id> - preserve current <setting>archive_mode</setting> setting.</li>
-                        </ul><b>NOTE</b>: This option is not available on <postgres/> &amp;lt; 12.</text>
+                            <p>The following modes are supported:</p>
+
+                            <list>
+                                <list-item><id>off</id> - disable archiving by setting <setting>archive_mode=off</setting>.</list-item>
+                                <list-item><id>preserve</id> - preserve current <setting>archive_mode</setting> setting.</list-item>
+                            </list>
+
+                            <p><b>NOTE</b>: This option is not available on <postgres/> &amp;lt; 12.</p>
+                        </text>
 
                         <example>off</example>
                     </config-key>
@@ -1004,9 +1222,11 @@
                     <config-key id="db-exclude" name="Exclude Database">
                         <summary>Restore excluding the specified databases.</summary>
 
-                        <text>Databases excluded will be restored as sparse, zeroed files to save space but still allow <postgres/> to perform recovery. After recovery, those databases will not be accessible but can be removed with the <id>drop database</id> command. The <setting>{[dash]}-db-exclude</setting> option can be passed multiple times to specify more than one database to exclude.
+                        <text>
+                            <p>Databases excluded will be restored as sparse, zeroed files to save space but still allow <postgres/> to perform recovery. After recovery, those databases will not be accessible but can be removed with the <id>drop database</id> command. The <setting>{[dash]}-db-exclude</setting> option can be passed multiple times to specify more than one database to exclude.</p>
 
-                        When used in combination with the <setting>{[dash]}-db-include</setting> option, <setting>{[dash]}-db-exclude</setting> will only apply to standard system databases (<id>template0</id>, <id>template1</id>, and <id>postgres</id>).</text>
+                            <p>When used in combination with the <setting>{[dash]}-db-include</setting> option, <setting>{[dash]}-db-exclude</setting> will only apply to standard system databases (<id>template0</id>, <id>template1</id>, and <id>postgres</id>).</p>
+                        </text>
 
                         <example>db_main</example>
                     </config-key>
@@ -1015,9 +1235,15 @@
                     <config-key id="db-include" name="Include Database">
                         <summary>Restore only specified databases.</summary>
 
-                        <text>This feature allows only selected databases to be restored. Databases not specifically included will be restored as sparse, zeroed files to save space but still allow <postgres/> to perform recovery. After recovery, the databases that were not included will not be accessible but can be removed with the <id>drop database</id> command. <admonition type="note">built-in databases (<id>template0</id>, <id>template1</id>, and <id>postgres</id>) are always restored unless specifically excluded.</admonition>The <setting>{[dash]}-db-include</setting> option can be passed multiple times to specify more than one database to include.
+                        <text>
+                            <p>This feature allows only selected databases to be restored. Databases not specifically included will be restored as sparse, zeroed files to save space but still allow <postgres/> to perform recovery. After recovery, the databases that were not included will not be accessible but can be removed with the <id>drop database</id> command.</p>
 
-                        See <link page="user-guide" section="/restore/option-db-include">Restore Selected Databases</link> for additional information and caveats.</text>
+                            <admonition type="note">built-in databases (<id>template0</id>, <id>template1</id>, and <id>postgres</id>) are always restored unless specifically excluded.</admonition>
+
+                            <p>The <setting>{[dash]}-db-include</setting> option can be passed multiple times to specify more than one database to include.</p>
+
+                            <p>See <link page="user-guide" section="/restore/option-db-include">Restore Selected Databases</link> for additional information and caveats.</p>
+                        </text>
 
                         <example>db_main</example>
                     </config-key>
@@ -1026,7 +1252,9 @@
                     <config-key id="link-all" name="Link All">
                         <summary>Restore all symlinks.</summary>
 
-                        <text>By default symlinked directories and files are restored as normal directories and files in $PGDATA.  This is because it may not be safe to restore symlinks to their original destinations on a system other than where the original backup was performed.  This option restores all the symlinks just as they were on the original system where the backup was performed.</text>
+                        <text>
+                            <p>By default symlinked directories and files are restored as normal directories and files in $PGDATA. This is because it may not be safe to restore symlinks to their original destinations on a system other than where the original backup was performed. This option restores all the symlinks just as they were on the original system where the backup was performed.</p>
+                        </text>
 
                         <example>y</example>
                     </config-key>
@@ -1035,7 +1263,9 @@
                     <config-key id="link-map" name="Link Map">
                         <summary>Modify the destination of a symlink.</summary>
 
-                        <text>Allows the destination file or path of a symlink to be changed on restore.  This is useful for restoring to systems that have a different storage layout than the original system where the backup was generated.</text>
+                        <text>
+                            <p>Allows the destination file or path of a symlink to be changed on restore. This is useful for restoring to systems that have a different storage layout than the original system where the backup was generated.</p>
+                        </text>
 
                         <example>pg_xlog=/data/xlog</example>
                     </config-key>
@@ -1044,7 +1274,13 @@
                     <config-key id="recovery-option" name="Recovery Option">
                         <summary>Set an option in <file>recovery.conf</file>.</summary>
 
-                        <text>See http://www.postgresql.org/docs/X.X/static/recovery-config.html for details on recovery.conf options (replace X.X with your <postgres/> version).  This option can be used multiple times.<admonition type="note">The <setting>restore_command</setting> option will be automatically generated but can be overridden with this option.  Be careful about specifying your own <setting>restore_command</setting> as <backrest/> is designed to handle this for you.  Target Recovery options (recovery_target_name, recovery_target_time, etc.) are generated automatically by <backrest/> and should not be set with this option.</admonition>Since <backrest/> does not start <postgres/> after writing the <file>recovery.conf</file> file, it is always possible to edit/check <file>recovery.conf</file> before manually restarting.</text>
+                        <text>
+                            <p>See http://www.postgresql.org/docs/X.X/static/recovery-config.html for details on recovery.conf options (replace X.X with your <postgres/> version). This option can be used multiple times.</p>
+
+                            <admonition type="note">The <setting>restore_command</setting> option will be automatically generated but can be overridden with this option. Be careful about specifying your own <setting>restore_command</setting> as <backrest/> is designed to handle this for you. Target Recovery options (recovery_target_name, recovery_target_time, etc.) are generated automatically by <backrest/> and should not be set with this option.</admonition>
+
+                            <p>Since <backrest/> does not start <postgres/> after writing the <file>recovery.conf</file> file, it is always possible to edit/check <file>recovery.conf</file> before manually restarting.</p>
+                        </text>
 
                         <example>primary_conninfo=db.mydomain.com</example>
                     </config-key>
@@ -1053,9 +1289,11 @@
                     <config-key id="tablespace-map" name="Tablespace Map">
                         <summary>Restore a tablespace into the specified directory.</summary>
 
-                        <text>Moves a tablespace to a new location during the restore.  This is useful when tablespace locations are not the same on a replica, or an upgraded system has different mount points.
+                        <text>
+                            <p>Moves a tablespace to a new location during the restore. This is useful when tablespace locations are not the same on a replica, or an upgraded system has different mount points.</p>
 
-                        Since <postgres/> 9.2 tablespace locations are not stored in pg_tablespace so moving tablespaces can be done with impunity.  However, moving a tablespace to the <setting>data_directory</setting> is not recommended and may cause problems.  For more information on moving tablespaces http://www.databasesoup.com/2013/11/moving-tablespaces.html is a good resource.</text>
+                            <p>Since <postgres/> 9.2 tablespace locations are not stored in pg_tablespace so moving tablespaces can be done with impunity. However, moving a tablespace to the <setting>data_directory</setting> is not recommended and may cause problems. For more information on moving tablespaces http://www.databasesoup.com/2013/11/moving-tablespaces.html is a good resource.</p>
+                        </text>
 
                         <example>ts_01=/db/ts_01</example>
                     </config-key>
@@ -1064,9 +1302,11 @@
                     <config-key id="tablespace-map-all" name="Map All Tablespaces">
                         <summary>Restore all tablespaces into the specified directory.</summary>
 
-                        <text>By default tablespaces are restored into their original locations and while this behavior can be modified by with the <setting>tablespace-map</setting> open it is sometime preferable to remap all tablespaces to a new directory all at once.  This is particularly useful for development or staging systems that may not have the same storage layout as the original system where the backup was generated.
+                        <text>
+                            <p>By default tablespaces are restored into their original locations and while this behavior can be modified by with the <setting>tablespace-map</setting> open it is sometime preferable to remap all tablespaces to a new directory all at once. This is particularly useful for development or staging systems that may not have the same storage layout as the original system where the backup was generated.</p>
 
-                        The path specified will be the parent path used to create all the tablespaces in the backup.</text>
+                            <p>The path specified will be the parent path used to create all the tablespaces in the backup.</p>
+                        </text>
 
                         <example>/data/tablespace</example>
                     </config-key>
@@ -1075,16 +1315,20 @@
 
             <!-- CONFIG - STANZA -->
             <config-section id="stanza" name="Stanza">
-                <text>A stanza defines the backup configuration for a specific <postgres/> database cluster.  The stanza section must define the database cluster path and host/user if the database cluster is remote.  Also, any global configuration sections can be overridden to define stanza-specific settings.
+                <text>
+                    <p>A stanza defines the backup configuration for a specific <postgres/> database cluster. The stanza section must define the database cluster path and host/user if the database cluster is remote. Also, any global configuration sections can be overridden to define stanza-specific settings.</p>
 
-                <b>Indexing</b>: All <setting>pg-</setting> options are indexed to allow for configuring multiple <postgres/> hosts. For example, a single primary is configured with the <setting>pg1-path</setting>, <setting>pg1-port</setting>, etc. options.  If a standby is configured then index the <setting>pg-</setting> options on the repository host as <setting>pg2-</setting> (e.g. pg2-host, pg2-path, etc).</text>
+                    <p><b>Indexing</b>: All <setting>pg-</setting> options are indexed to allow for configuring multiple <postgres/> hosts. For example, a single primary is configured with the <setting>pg1-path</setting>, <setting>pg1-port</setting>, etc. options. If a standby is configured then index the <setting>pg-</setting> options on the repository host as <setting>pg2-</setting> (e.g. pg2-host, pg2-path, etc).</p>
+                </text>
 
                 <config-key-list>
                     <!-- CONFIG - STANZA SECTION - PG-HOST-CMD KEY -->
                     <config-key id="pg-host-cmd" name="PostgreSQL Host Command">
                         <summary><backrest/> exe path on the <postgres/> host.</summary>
 
-                        <text>Required only if the path to <exe/> is different on the local and <postgres/> hosts.  If not defined, the database host exe path will be set the same as the local exe path.</text>
+                        <text>
+                            <p>Required only if the path to <exe/> is different on the local and <postgres/> hosts. If not defined, the database host exe path will be set the same as the local exe path.</p>
+                        </text>
 
                         <default>same as local</default>
                         <example>/usr/lib/backrest/bin/pgbackrest</example>
@@ -1094,7 +1338,9 @@
                     <config-key id="pg-host-config" name="PostgreSQL Host Configuration">
                         <summary><backrest/> database host configuration file.</summary>
 
-                        <text>Sets the location of the configuration file on the <postgres/> host.  This is only required if the <postgres/> host configuration file is in a different location than the local configuration file.</text>
+                        <text>
+                            <p>Sets the location of the configuration file on the <postgres/> host. This is only required if the <postgres/> host configuration file is in a different location than the local configuration file.</p>
+                        </text>
 
                         <example>/conf/pgbackrest/pgbackrest.conf</example>
                     </config-key>
@@ -1103,7 +1349,9 @@
                     <config-key id="pg-host-config-include-path" name="PostgreSQL Host Configuration Include Path">
                         <summary><backrest/> database host configuration include path.</summary>
 
-                        <text>Sets the location of the configuration include path on the <postgres/> host.  This is only required if the <postgres/> host configuration include path is in a different location than the local configuration include path.</text>
+                        <text>
+                            <p>Sets the location of the configuration include path on the <postgres/> host. This is only required if the <postgres/> host configuration include path is in a different location than the local configuration include path.</p>
+                        </text>
 
                         <example>/conf/pgbackrest/conf.d</example>
                     </config-key>
@@ -1112,7 +1360,9 @@
                     <config-key id="pg-host-config-path" name="PostgreSQL Host Configuration Path">
                         <summary><backrest/> database host configuration path.</summary>
 
-                        <text>Sets the location of the configuration path on the <postgres/> host.  This is only required if the <postgres/> host configuration path is in a different location than the local configuration path.</text>
+                        <text>
+                            <p>Sets the location of the configuration path on the <postgres/> host. This is only required if the <postgres/> host configuration path is in a different location than the local configuration path.</p>
+                        </text>
 
                         <example>/conf/pgbackrest</example>
                     </config-key>
@@ -1121,7 +1371,9 @@
                     <config-key id="pg-host" name="PostgreSQL Host">
                         <summary><postgres/> host for operating remotely via SSH.</summary>
 
-                        <text>Used for backups where the <postgres/> host is different from the repository host.</text>
+                        <text>
+                            <p>Used for backups where the <postgres/> host is different from the repository host.</p>
+                        </text>
 
                         <example>db.domain.com</example>
                     </config-key>
@@ -1130,7 +1382,9 @@
                     <config-key id="pg-host-user" name="PostgreSQL Host User">
                         <summary><postgres/> host logon user when <setting>pg-host</setting> is set.</summary>
 
-                        <text>This user will also own the remote <backrest/> process and will initiate connections to <postgres/>.  For this to work correctly the user should be the <postgres/> database cluster owner which is generally <id>postgres</id>, the default.</text>
+                        <text>
+                            <p>This user will also own the remote <backrest/> process and will initiate connections to <postgres/>. For this to work correctly the user should be the <postgres/> database cluster owner which is generally <id>postgres</id>, the default.</p>
+                        </text>
 
                         <example>db_owner</example>
                     </config-key>
@@ -1139,9 +1393,11 @@
                     <config-key id="pg-database" name="PostgreSQL Database">
                         <summary><postgres/> database.</summary>
 
-                        <text>The database name used when connecting to <postgres/>. The default is usually best but some installations may not contain this database.
+                        <text>
+                            <p>The database name used when connecting to <postgres/>. The default is usually best but some installations may not contain this database.</p>
 
-                        Note that for legacy reasons the setting of the <id>PGDATABASE</id> environment variable will be ignored.</text>
+                            <p>Note that for legacy reasons the setting of the <id>PGDATABASE</id> environment variable will be ignored.</p>
+                        </text>
 
                         <example>backupdb</example>
                     </config-key>
@@ -1150,7 +1406,9 @@
                     <config-key id="pg-local" name="PostgreSQL Locality">
                         <summary><postgres/> is local.</summary>
 
-                        <text>Indicates that <postgres/> for the specified index is local and any <postgres/> host settings for that index (e.g. <setting>pg1-host</setting>) should be ignored.</text>
+                        <text>
+                            <p>Indicates that <postgres/> for the specified index is local and any <postgres/> host settings for that index (e.g. <setting>pg1-host</setting>) should be ignored.</p>
+                        </text>
 
                         <example>y</example>
                     </config-key>
@@ -1159,9 +1417,11 @@
                     <config-key id="pg-path" name="PostgreSQL Path">
                         <summary><postgres/> data directory.</summary>
 
-                        <text>This should be the same as the <setting>data_directory</setting> setting in <file>postgresql.conf</file>.  Even though this value can be read from <file>postgresql.conf</file> or <postgres/> it is prudent to set it in case those resources are not available during a restore or offline backup scenario.
+                        <text>
+                            <p>This should be the same as the <setting>data_directory</setting> setting in <file>postgresql.conf</file>. Even though this value can be read from <file>postgresql.conf</file> or <postgres/> it is prudent to set it in case those resources are not available during a restore or offline backup scenario.</p>
 
-                        The <setting>pg-path</setting> option is tested against the value reported by <postgres/> on every online backup so it should always be current.</text>
+                            <p>The <setting>pg-path</setting> option is tested against the value reported by <postgres/> on every online backup so it should always be current.</p>
+                        </text>
 
                         <example>/data/db</example>
                     </config-key>
@@ -1170,7 +1430,9 @@
                     <config-key id="pg-port" name="PostgreSQL Port">
                         <summary><postgres/> port.</summary>
 
-                        <text>Port that <postgres/> is running on.  This usually does not need to be specified as most <postgres/> clusters run on the default port.</text>
+                        <text>
+                            <p>Port that <postgres/> is running on. This usually does not need to be specified as most <postgres/> clusters run on the default port.</p>
+                        </text>
 
                         <example>6543</example>
                     </config-key>
@@ -1179,7 +1441,9 @@
                     <config-key id="pg-socket-path" name="PostgreSQL Socket Path">
                         <summary><postgres/> unix socket path.</summary>
 
-                        <text>The unix socket directory that was specified when <postgres/> was started.  <backrest/> will automatically look in the standard location for your OS so there is usually no need to specify this setting unless the socket directory was explicitly modified with the <setting>unix_socket_directory</setting> setting in <file>postgresql.conf</file>.</text>
+                        <text>
+                            <p>The unix socket directory that was specified when <postgres/> was started. <backrest/> will automatically look in the standard location for your OS so there is usually no need to specify this setting unless the socket directory was explicitly modified with the <setting>unix_socket_directory</setting> setting in <file>postgresql.conf</file>.</p>
+                        </text>
 
                         <example>/var/run/postgresql</example>
                     </config-key>
@@ -1188,7 +1452,9 @@
                     <config-key id="pg-user" name="PostgreSQL Database User">
                         <summary><postgres/> database user.</summary>
 
-                        <text>The database user name used when connecting to <postgres/>.  If not specified <backrest/> will connect with the local OS user or <id>PGUSER</id>.</text>
+                        <text>
+                            <p>The database user name used when connecting to <postgres/>. If not specified <backrest/> will connect with the local OS user or <id>PGUSER</id>.</p>
+                        </text>
 
                         <example>backupuser</example>
                     </config-key>
@@ -1197,7 +1463,9 @@
                     <config-key id="pg-host-port" name="PostgreSQL Host Port">
                         <summary><postgres/> host port when <setting>pg-host</setting> is set.</summary>
 
-                        <text>Use this option to specify a non-default port for the <postgres/> host protocol.  Currently only SSH is supported</text>
+                        <text>
+                            <p>Use this option to specify a non-default port for the <postgres/> host protocol. Currently only SSH is supported.</p>
+                        </text>
 
                         <example>25</example>
                     </config-key>
@@ -1210,15 +1478,17 @@
     <operation title="{[project]} Command Reference">
         <description>The {[project]} Command Reference details all commands and options.</description>
 
-        <text>Commands are used to execute the various <backrest/> functions.  Here the command options are listed exhaustively, that is, each option applicable to a command is listed with that command even if it applies to one or more other commands.  This includes all the options that may also configured in <file>pgbackrest.conf</file>.
+        <text>
+            <p>Commands are used to execute the various <backrest/> functions. Here the command options are listed exhaustively, that is, each option applicable to a command is listed with that command even if it applies to one or more other commands. This includes all the options that may also configured in <file>pgbackrest.conf</file>.</p>
 
-        Non-boolean options configured in <file>pgbackrest.conf</file> can be reset to default on the command-line by using the <id>reset-</id> prefix. This feature may be used to restore a backup directly on a repository host. Normally, <backrest/> will error because it can see that the database host is remote and restores cannot be done remotely. By adding <br-option>--reset-pg1-host</br-option> on the command-line, <backrest/> will ignore the remote database host and restore locally. It may be necessary to pass a new <br-option>--pg1-path</br-option> to force the restore to happen in a specific path, i.e. not the path used on the database host.
+            <p>Non-boolean options configured in <file>pgbackrest.conf</file> can be reset to default on the command-line by using the <id>reset-</id> prefix. This feature may be used to restore a backup directly on a repository host. Normally, <backrest/> will error because it can see that the database host is remote and restores cannot be done remotely. By adding <br-option>--reset-pg1-host</br-option> on the command-line, <backrest/> will ignore the remote database host and restore locally. It may be necessary to pass a new <br-option>--pg1-path</br-option> to force the restore to happen in a specific path, i.e. not the path used on the database host.</p>
 
-        The <id>no-</id> prefix may be used to set a boolean option to false on the command-line.
+            <p>The <id>no-</id> prefix may be used to set a boolean option to false on the command-line.</p>
 
-        Any option may be set in an environment variable using the <id>PGBACKREST_</id> prefix and the option name in all caps replacing <id>-</id> with <id>_</id>, e.g. <br-option>pg1-path</br-option> becomes <id>PGBACKREST_PG1_PATH</id> and <br-option>stanza</br-option> becomes <id>PGBACKREST_STANZA</id>.  Boolean options are represented as they would be in a configuration file, e.g. <id>PGBACKREST_COMPRESS="n"</id>, and <id>reset-*</id> variants are not allowed.  Options that that can be specified multiple times on the command-line or in a config file can be represented by separating the values with colons, e.g. <id>PGBACKREST_DB_INCLUDE="db1:db2"</id>.
+            <p>Any option may be set in an environment variable using the <id>PGBACKREST_</id> prefix and the option name in all caps replacing <id>-</id> with <id>_</id>, e.g. <br-option>pg1-path</br-option> becomes <id>PGBACKREST_PG1_PATH</id> and <br-option>stanza</br-option> becomes <id>PGBACKREST_STANZA</id>. Boolean options are represented as they would be in a configuration file, e.g. <id>PGBACKREST_COMPRESS="n"</id>, and <id>reset-*</id> variants are not allowed. Options that that can be specified multiple times on the command-line or in a config file can be represented by separating the values with colons, e.g. <id>PGBACKREST_DB_INCLUDE="db1:db2"</id>.</p>
 
-        Command-line options override environment options which override config file options.</text>
+            <p>Command-line options override environment options which override config file options.</p>
+        </text>
 
         <operation-general title="General Options">
             <option-list>
@@ -1226,7 +1496,9 @@
                 <option id="cipher-pass" name="Ad Hoc Cipher Passphrase">
                     <summary>Cipher passphrase for current command.</summary>
 
-                    <text>Specify an ad hoc cipher passphrase for the current command.</text>
+                    <text>
+                        <p>Specify an ad hoc cipher passphrase for the current command.</p>
+                    </text>
 
                     <example>zWaf6XtpjIVZC5444yXB+cgFDFl7MxGlgkZSaoPvTGirhPygu4jOKOXf9LO4vjfO</example>
                 </option>
@@ -1235,7 +1507,9 @@
                 <option id="config" name="Config">
                     <summary><backrest/> configuration file.</summary>
 
-                    <text>Use this option to specify a different configuration file than the default.</text>
+                    <text>
+                        <p>Use this option to specify a different configuration file than the default.</p>
+                    </text>
 
                     <example>/conf/pgbackrest/pgbackrest.conf</example>
                 </option>
@@ -1244,7 +1518,9 @@
                 <option id="config-include-path" name="Config Include Path">
                     <summary>Path to additional <backrest/> configuration files.</summary>
 
-                    <text>Configuration files existing in the specified location with extension <file>.conf</file> will be concatenated with the <backrest/> configuration file, resulting in one configuration file.</text>
+                    <text>
+                        <p>Configuration files existing in the specified location with extension <file>.conf</file> will be concatenated with the <backrest/> configuration file, resulting in one configuration file.</p>
+                    </text>
 
                     <example>/conf/pgbackrest/conf.d</example>
                 </option>
@@ -1253,9 +1529,11 @@
                 <option id="config-path" name="Config Path">
                     <summary>Base path of <backrest/> configuration files.</summary>
 
-                    <text>This setting is used to override the default base path setting for the <br-option>--config</br-option> and <br-option>--config-include-path</br-option> options unless they are explicitly set on the command-line.
+                    <text>
+                        <p>This setting is used to override the default base path setting for the <br-option>--config</br-option> and <br-option>--config-include-path</br-option> options unless they are explicitly set on the command-line.</p>
 
-                    For example, passing only <code>--config-path=/conf/pgbackrest</code> results in the  <br-option>--config</br-option> default being set to <code>/conf/pgbackrest/pgbackrest.conf</code> and the <br-option>--config-include-path</br-option> default being set to  <code>/conf/pgbackrest/conf.d</code>.</text>
+                        <p>For example, passing only <code>--config-path=/conf/pgbackrest</code> results in the <br-option>--config</br-option> default being set to <code>/conf/pgbackrest/pgbackrest.conf</code> and the <br-option>--config-include-path</br-option> default being set to <code>/conf/pgbackrest/conf.d</code>.</p>
+                    </text>
 
                     <example>/conf/pgbackrest</example>
                 </option>
@@ -1264,7 +1542,9 @@
                 <option id="dry-run" name="Dry Run">
                     <summary>Execute a dry-run for the command.</summary>
 
-                    <text>The <br-option>{[dash]}-dry-run</br-option> option is a command-line only option and can be passed when it is desirable to determine what modifications will be made by the command without the command actually making any modifications.</text>
+                    <text>
+                        <p>The <br-option>{[dash]}-dry-run</br-option> option is a command-line only option and can be passed when it is desirable to determine what modifications will be made by the command without the command actually making any modifications.</p>
+                    </text>
 
                     <example>y</example>
                 </option>
@@ -1273,9 +1553,11 @@
                 <option id="exec-id" name="Execution Identifier">
                     <summary>Unique identifier for the process.</summary>
 
-                    <text>A locally unique identifier used to identify a process when resolving locks on a remote host.
+                    <text>
+                        <p>A locally unique identifier used to identify a process when resolving locks on a remote host.</p>
 
-                    The <setting>exec-id</setting> option is generated automatically when needed but it is possible to set it explicitly, which saves a bit of time at startup but introduces the problem of selecting a unique value.</text>
+                        <p>The <setting>exec-id</setting> option is generated automatically when needed but it is possible to set it explicitly, which saves a bit of time at startup but introduces the problem of selecting a unique value.</p>
+                    </text>
 
                     <example>y</example>
                 </option>
@@ -1284,7 +1566,9 @@
                 <option id="raw" name="Raw Data">
                     <summary>Do not transform data.</summary>
 
-                    <text>Do not transform (i.e, encrypt, decompress, etc.) data for the current command.</text>
+                    <text>
+                        <p>Do not transform (i.e, encrypt, decompress, etc.) data for the current command.</p>
+                    </text>
 
                     <example>y</example>
                 </option>
@@ -1293,9 +1577,11 @@
                 <option id="repo" section="repository" name="Set Repository">
                     <summary>Set repository.</summary>
 
-                    <text>Set the repository for a command to operate on.
+                    <text>
+                        <p>Set the repository for a command to operate on.</p>
 
-                    For example, this option may be used to perform a restore from a specific repository, rather than letting <backrest/> choose.</text>
+                        <p>For example, this option may be used to perform a restore from a specific repository, rather than letting <backrest/> choose.</p>
+                    </text>
 
                     <example>1</example>
                 </option>
@@ -1304,9 +1590,11 @@
                 <option id="stanza" name="Stanza">
                     <summary>Defines the stanza.</summary>
 
-                    <text>A stanza is the configuration for a <postgres/> database cluster that defines where it is located, how it will be backed up, archiving options, etc.  Most db servers will only have one Postgres database cluster and therefore one stanza, whereas backup servers will have a stanza for every database cluster that needs to be backed up.
+                    <text>
+                        <p>A stanza is the configuration for a <postgres/> database cluster that defines where it is located, how it will be backed up, archiving options, etc. Most db servers will only have one Postgres database cluster and therefore one stanza, whereas backup servers will have a stanza for every database cluster that needs to be backed up.</p>
 
-                    It is tempting to name the stanza after the primary cluster but a better name describes the databases contained in the cluster.  Because the stanza name will be used for the primary and all replicas it is more appropriate to choose a name that describes the actual function of the cluster, such as app or dw, rather than the local cluster name, such as main or prod.</text>
+                        <p>It is tempting to name the stanza after the primary cluster but a better name describes the databases contained in the cluster. Because the stanza name will be used for the primary and all replicas it is more appropriate to choose a name that describes the actual function of the cluster, such as app or dw, rather than the local cluster name, such as main or prod.</p>
+                    </text>
 
                     <example>main</example>
                 </option>
@@ -1318,23 +1606,28 @@
             <command id="backup" name="Backup">
                 <summary>Backup a database cluster.</summary>
 
-                <text>When multiple repositories are configured, <backrest/> will backup to the highest priority repository (e.g. <id>repo1</id>) unless the <br-option>{[dash]}-repo</br-option> option is specified.
+                <text>
+                    <p>When multiple repositories are configured, <backrest/> will backup to the highest priority repository (e.g. <id>repo1</id>) unless the <br-option>{[dash]}-repo</br-option> option is specified.</p>
 
-                <backrest/> does not have a built-in scheduler so it's best to run it from cron or some other scheduling mechanism.
+                    <p><backrest/> does not have a built-in scheduler so it's best to run it from cron or some other scheduling mechanism.</p>
 
-                See <link page="user-guide" section="/quickstart/perform-backup">Perform a Backup</link> for more details and examples.</text>
+                    <p>See <link page="user-guide" section="/quickstart/perform-backup">Perform a Backup</link> for more details and examples.</p>
+                </text>
 
                 <option-list>
                     <!-- OPERATION - BACKUP COMMAND - TYPE OPTION -->
                     <option id="type" name="Type">
                         <summary>Backup type.</summary>
 
-                        <text>The following backup types are supported:
-                            <ul>
-                                <li><id>full</id> - all database cluster files will be copied and there will be no dependencies on previous backups.</li>
-                                <li><id>incr</id> - incremental from the last successful backup.</li>
-                                <li><id>diff</id> - like an incremental backup but always based on the last full backup.</li>
-                            </ul></text>
+                        <text>
+                            <p>The following backup types are supported:</p>
+
+                            <list>
+                                <list-item><id>full</id> - all database cluster files will be copied and there will be no dependencies on previous backups.</list-item>
+                                <list-item><id>incr</id> - incremental from the last successful backup.</list-item>
+                                <list-item><id>diff</id> - like an incremental backup but always based on the last full backup.</list-item>
+                            </list>
+                        </text>
 
                         <example>full</example>
                     </option>
@@ -1343,9 +1636,11 @@
                     <option id="force" name="Force">
                         <summary>Force an offline backup.</summary>
 
-                        <text>When used with <br-option>--no-start-stop</br-option> a backup will be run even if <backrest/> thinks that <postgres/> is running.  <b>This option should be used with extreme care as it will likely result in a bad backup.</b>
+                        <text>
+                            <p>When used with <br-option>--no-start-stop</br-option> a backup will be run even if <backrest/> thinks that <postgres/> is running. <b>This option should be used with extreme care as it will likely result in a bad backup.</b></p>
 
-                        There are some scenarios where a backup might still be desirable under these conditions.  For example, if a server crashes and the database cluster volume can only be mounted read-only, it would be a good idea to take a backup even if <file>postmaster.pid</file> is present.  In this case it would be better to revert to the prior backup and replay WAL, but possibly there is a very important transaction in a WAL segment that did not get archived.</text>
+                            <p>There are some scenarios where a backup might still be desirable under these conditions. For example, if a server crashes and the database cluster volume can only be mounted read-only, it would be a good idea to take a backup even if <file>postmaster.pid</file> is present. In this case it would be better to revert to the prior backup and replay WAL, but possibly there is a very important transaction in a WAL segment that did not get archived.</p>
+                        </text>
 
                         <example>y</example>
                     </option>
@@ -1354,9 +1649,11 @@
                     <option id="online" name="Online">
                         <summary>Perform an online backup.</summary>
 
-                        <text>Specifying --no-online prevents <backrest/> from running <code>pg_start_backup()</code> and <code>pg_stop_backup()</code> on the database cluster.  In order for this to work <postgres/> should be shut down and <backrest/> will generate an error if it is not.
+                        <text>
+                            <p>Specifying --no-online prevents <backrest/> from running <code>pg_start_backup()</code> and <code>pg_stop_backup()</code> on the database cluster. In order for this to work <postgres/> should be shut down and <backrest/> will generate an error if it is not.</p>
 
-                        The purpose of this option is to allow offline backups.  The <path>pg_xlog</path>/<path>pg_wal</path> directory is copied as-is and <setting>archive-check</setting> is automatically disabled for the backup.</text>
+                            <p>The purpose of this option is to allow offline backups. The <path>pg_xlog</path>/<path>pg_wal</path> directory is copied as-is and <setting>archive-check</setting> is automatically disabled for the backup.</p>
+                        </text>
 
                         <example>n</example>
                     </option>
@@ -1367,46 +1664,60 @@
             <command id="archive-push" name="Archive Push">
                 <summary>Push a WAL segment to the archive.</summary>
 
-                <text>Accepts a WAL segment from <postgres/> and archives it in each repository defined by the indexed <setting>repo-path</setting> option (see the <link page="configuration" section="/section-repository">Repository</link> section for information on configuring repositories). The WAL segment may be pushed immediately to the archive or stored locally depending on the value of <setting>archive-async</setting>. With multiple repositories configured, <cmd>archive-push</cmd> will attempt to push to as many repositories as possible.
+                <text>
+                    <p>Accepts a WAL segment from <postgres/> and archives it in each repository defined by the indexed <setting>repo-path</setting> option (see the <link page="configuration" section="/section-repository">Repository</link> section for information on configuring repositories). The WAL segment may be pushed immediately to the archive or stored locally depending on the value of <setting>archive-async</setting>. With multiple repositories configured, <cmd>archive-push</cmd> will attempt to push to as many repositories as possible.</p>
 
-                The <cmd>archive-push</cmd> is intended to be configured and called by <postgres/>. See <link page="user-guide" section="/quickstart/configure-archiving">Configure Archiving</link> for an example.</text>
+                    <p>The <cmd>archive-push</cmd> is intended to be configured and called by <postgres/>. See <link page="user-guide" section="/quickstart/configure-archiving">Configure Archiving</link> for an example.</p>
+                </text>
             </command>
 
             <!-- OPERATION - ARCHIVE-GET COMMAND -->
             <command id="archive-get" name="Archive Get">
                 <summary>Get a WAL segment from the archive.</summary>
 
-                <text>This command is used by <postgres/> to restore a backup, perform PITR, or as an alternative to streaming for keeping a replica up to date. WAL segments are required for <postgres/> recovery or to maintain a replica.
+                <text>
+                    <p>This command is used by <postgres/> to restore a backup, perform PITR, or as an alternative to streaming for keeping a replica up to date. WAL segments are required for <postgres/> recovery or to maintain a replica.</p>
 
-                When multiple repositories are configured, WAL will be fetched from the repositories in priority order (e.g. <id>repo1</id>, <id>repo2</id>, etc.). In general it is better if faster/cheaper storage has higher priority. If a repository is specified with the <br-option>{[dash]}-repo</br-option> option then only that repository will be searched.
+                    <p>When multiple repositories are configured, WAL will be fetched from the repositories in priority order (e.g. <id>repo1</id>, <id>repo2</id>, etc.). In general it is better if faster/cheaper storage has higher priority. If a repository is specified with the <br-option>{[dash]}-repo</br-option> option then only that repository will be searched.</p>
 
-                The <cmd>archive-get</cmd> command is configured and generated by <backrest/> during a restore for use by <postgres/>. See <link page="user-guide" section="/pitr">Point-in-Time Recovery</link> for an example.</text>
+                    <p>The <cmd>archive-get</cmd> command is configured and generated by <backrest/> during a restore for use by <postgres/>. See <link page="user-guide" section="/pitr">Point-in-Time Recovery</link> for an example.</p>
+                </text>
             </command>
 
             <!-- OPERATION - CHECK COMMAND -->
             <command id="check" name="Check">
                 <summary>Check the configuration.</summary>
 
-                <text>The <cmd>check</cmd> command validates that <backrest/> and the <pg-setting>archive_command</pg-setting> setting are configured correctly for archiving and backups for the specified stanza. It will attempt to check all repositories and databases that are configured for the host on which the command is run. It detects misconfigurations, particularly in archiving, that result in incomplete backups because required WAL segments did not reach the archive. The command can be run on the <postgres/> or repository host. The command may also be run on the standby host, however, since <code>pg_switch_xlog()</code>/<code>pg_switch_wal()</code> cannot be performed on the standby, the command will only test the repository configuration.
+                <text>
+                    <p>The <cmd>check</cmd> command validates that <backrest/> and the <pg-setting>archive_command</pg-setting> setting are configured correctly for archiving and backups for the specified stanza. It will attempt to check all repositories and databases that are configured for the host on which the command is run. It detects misconfigurations, particularly in archiving, that result in incomplete backups because required WAL segments did not reach the archive. The command can be run on the <postgres/> or repository host. The command may also be run on the standby host, however, since <code>pg_switch_xlog()</code>/<code>pg_switch_wal()</code> cannot be performed on the standby, the command will only test the repository configuration.</p>
 
-                Note that <code>pg_create_restore_point('pgBackRest Archive Check')</code> and <code>pg_switch_xlog()</code>/<code>pg_switch_wal()</code> are called to force <postgres/> to archive a WAL segment.  Restore points are only supported in <postgres/> &gt;= 9.1 so for older versions the <cmd>check</cmd> command may fail if there has been no write activity since the last log rotation, therefore it is recommended that activity be generated by the user if there have been no writes since the last WAL switch before running the <cmd>check</cmd> command.</text>
-                <!-- Note, linking to the User Guide is limited since it can cause a cyclical reference -->
+                    <p>Note that <code>pg_create_restore_point('pgBackRest Archive Check')</code> and <code>pg_switch_xlog()</code>/<code>pg_switch_wal()</code> are called to force <postgres/> to archive a WAL segment. Restore points are only supported in <postgres/> &gt;= 9.1 so for older versions the <cmd>check</cmd> command may fail if there has been no write activity since the last log rotation, therefore it is recommended that activity be generated by the user if there have been no writes since the last WAL switch before running the <cmd>check</cmd> command.</p>
+
+                    <!-- Note, linking to the User Guide is limited since it can cause a cyclical reference -->
+                </text>
             </command>
 
             <!-- OPERATION - EXPIRE COMMAND -->
             <command id="expire" name="Expire">
                 <summary>Expire backups that exceed retention.</summary>
 
-                <text><backrest/> does full backup rotation based on the retention type which can be a count or a time period. When a count is specified, then expiration is not concerned with when the backups were created but with how many must be retained. Differential and Incremental backups are count-based but will always be expired when the backup they depend on is expired. See sections <link page="user-guide" section="/retention/full">Full Backup Retention</link> and <link page="user-guide" section="/retention/diff">Differential Backup Retention</link> for details and examples. Archived WAL is retained by default for backups that have not expired, however, although not recommended, this schedule can be modified per repository with the retention-archive options. See section <link page="user-guide" section="/retention/archive">Archive Retention</link> for details and examples.
+                <text>
+                    <p><backrest/> does full backup rotation based on the retention type which can be a count or a time period. When a count is specified, then expiration is not concerned with when the backups were created but with how many must be retained. Differential and Incremental backups are count-based but will always be expired when the backup they depend on is expired. See sections <link page="user-guide" section="/retention/full">Full Backup Retention</link> and <link page="user-guide" section="/retention/diff">Differential Backup Retention</link> for details and examples. Archived WAL is retained by default for backups that have not expired, however, although not recommended, this schedule can be modified per repository with the retention-archive options. See section <link page="user-guide" section="/retention/archive">Archive Retention</link> for details and examples.</p>
 
-                The <cmd>expire</cmd> command is run automatically after each successful backup and can also be run by the user. When run by the user, expiration will occur as defined by the retention settings for each configured repository. If the <br-option>{[dash]}-repo</br-option> option is provided, expiration will occur only on the specified repository. Expiration can also be limited by the user to a specific backup set with the <br-option>--set</br-option> option and, unless the <br-option>{[dash]}-repo</br-option> option is specified, all repositories will be searched and any matching the set criteria will be expired. It should be noted that the archive retention schedule will be checked and performed any time the <cmd>expire</cmd> command is run.</text>
+                    <p>The <cmd>expire</cmd> command is run automatically after each successful backup and can also be run by the user. When run by the user, expiration will occur as defined by the retention settings for each configured repository. If the <br-option>{[dash]}-repo</br-option> option is provided, expiration will occur only on the specified repository. Expiration can also be limited by the user to a specific backup set with the <br-option>--set</br-option> option and, unless the <br-option>{[dash]}-repo</br-option> option is specified, all repositories will be searched and any matching the set criteria will be expired. It should be noted that the archive retention schedule will be checked and performed any time the <cmd>expire</cmd> command is run.</p>
+                </text>
 
                 <option-list>
                     <!-- OPERATION - EXPIRE COMMAND - SET OPTION -->
                     <option id="set" name="Set">
                         <summary>Backup set to expire.</summary>
 
-                        <text>The specified backup set (i.e. the backup label provided and all of its dependent backups, if any) will be expired regardless of backup retention rules except that at least one full backup must remain in the repository. <admonition type="warning">Use this option with extreme caution &amp;mdash; it will permanently remove all backups and archives not required to make a backup consistent from the <backrest/> repository for the specified backup set. This process may negate the ability to perform PITR. If <br-option>--repo-retention-full</br-option> and/or <br-option>--repo-retention-archive</br-option> options are configured, then it is recommended that you override these options by setting their values to the maximum while performing adhoc expiration in order to prevent an unintended expiration of archives.</admonition></text>
+                        <text>
+                            <p>The specified backup set (i.e. the backup label provided and all of its dependent backups, if any) will be expired regardless of backup retention rules except that at least one full backup must remain in the repository.</p>
+
+                            <admonition type="warning">Use this option with extreme caution &amp;mdash; it will permanently remove all backups and archives not required to make a backup consistent from the <backrest/> repository for the specified backup set. This process may negate the ability to perform PITR. If <br-option>--repo-retention-full</br-option> and/or <br-option>--repo-retention-archive</br-option> options are configured, then it is recommended that you override these options by setting their values to the maximum while performing adhoc expiration in order to prevent an unintended expiration of archives.</admonition>
+                        </text>
+
                         <example>20150131-153358F_20150131-153401I</example>
                     </option>
                 </option-list>
@@ -1416,26 +1727,31 @@
             <command id="repo-create" name="Create Repository">
                 <summary>Create the repository.</summary>
 
-                <text>Create the repository (path, bucket, etc.) on the default repository. If more than one repository is configured, the command will default to the highest priority repository (e.g. <id>repo1</id>) unless the <br-option>{[dash]}-repo</br-option> option is specified. If <setting>repo-type=s3</setting> the bucket will be created.</text>
-
+                <text>
+                    <p>Create the repository (path, bucket, etc.) on the default repository. If more than one repository is configured, the command will default to the highest priority repository (e.g. <id>repo1</id>) unless the <br-option>{[dash]}-repo</br-option> option is specified. If <setting>repo-type=s3</setting> the bucket will be created.</p>
+                </text>
             </command>
 
             <!-- OPERATION - REPO-GET COMMAND -->
             <command id="repo-get" name="Repository Get">
                 <summary>Get a file from a repository.</summary>
 
-                <text>Similar to the unix <cmd>cat</cmd> command but works on any supported repository type. This command requires a fully qualified file name and is primarily for administration, investigation, and testing. It is not a required part of a normal <backrest/> setup.
+                <text>
+                    <p>Similar to the unix <cmd>cat</cmd> command but works on any supported repository type. This command requires a fully qualified file name and is primarily for administration, investigation, and testing. It is not a required part of a normal <backrest/> setup.</p>
 
-                If the repository is encrypted then <cmd>repo-get</cmd> will automatically decrypt the file. Files are not automatically decompressed but the output can be piped through the appropriate decompression command, e.g. <id>gzip -d</id>.
+                    <p>If the repository is encrypted then <cmd>repo-get</cmd> will automatically decrypt the file. Files are not automatically decompressed but the output can be piped through the appropriate decompression command, e.g. <id>gzip -d</id>.</p>
 
-                If more than one repository is configured, the command will default to the highest priority repository (e.g. <id>repo1</id>) unless the <br-option>{[dash]}-repo</br-option> option is specified.</text>
+                    <p>If more than one repository is configured, the command will default to the highest priority repository (e.g. <id>repo1</id>) unless the <br-option>{[dash]}-repo</br-option> option is specified.</p>
+                </text>
 
                 <option-list>
                     <!-- OPERATION - REPO-GET COMMAND - IGNORE-MISSING OPTION -->
                     <option id="ignore-missing" name="Ignore Missing">
                         <summary>Ignore missing source file.</summary>
 
-                        <text>Exit with 1 if the source file is missing but don't throw an error.</text>
+                        <text>
+                            <p>Exit with 1 if the source file is missing but don't throw an error.</p>
+                        </text>
 
                         <example>y</example>
                     </option>
@@ -1446,18 +1762,22 @@
             <command id="repo-ls" name="Repository List">
                 <summary>List files in a repository.</summary>
 
-                <text>Similar to the unix <cmd>ls</cmd> command but works on any supported repository type. This command accepts a path, absolute or relative to the repository path defined by the <br-option>{[dash]}-repo-path</br-option> option, and is primarily for administration, investigation, and testing. It is not a required part of a normal <backrest/> setup.
+                <text>
+                    <p>Similar to the unix <cmd>ls</cmd> command but works on any supported repository type. This command accepts a path, absolute or relative to the repository path defined by the <br-option>{[dash]}-repo-path</br-option> option, and is primarily for administration, investigation, and testing. It is not a required part of a normal <backrest/> setup.</p>
 
-                The default text output prints one file name per line. JSON output is available by specifying <br-option>--output=json</br-option>.
+                    <p>The default text output prints one file name per line. JSON output is available by specifying <br-option>--output=json</br-option>.</p>
 
-                If more than one repository is configured, the command will default to the highest priority repository (e.g. <id>repo1</id>) unless the <br-option>{[dash]}-repo</br-option> option is specified.</text>
+                    <p>If more than one repository is configured, the command will default to the highest priority repository (e.g. <id>repo1</id>) unless the <br-option>{[dash]}-repo</br-option> option is specified.</p>
+                </text>
 
                 <option-list>
                     <!-- OPERATION - LS COMMAND - FILTER OPTION -->
                     <option id="filter" name="Filter Output">
                         <summary>Filter output with a regular expression.</summary>
 
-                        <text>The filter is applied against the file/path names before they are output.</text>
+                        <text>
+                            <p>The filter is applied against the file/path names before they are output.</p>
+                        </text>
 
                         <example>"(F|D|I)$"</example>
                     </option>
@@ -1466,18 +1786,24 @@
                     <option id="output" name="Output">
                         <summary>Output format.</summary>
 
-                        <text>The following output types are supported:
-                        <ul>
-                            <li><id>text</id> - Simple list with one file/link/path name on each line.</li>
-                            <li><id>json</id> - Detailed file/link/path information in JSON format.</li>
-                        </ul>In JSON format the available fields are:
-                        <ul>
-                            <li><id>name</id> - file/link/path name (and partial path when recursing).</li>
-                            <li><id>type</id> - <id>file</id>, <id>path</id>, or <id>link</id>.</li>
-                            <li><id>size</id> - size in bytes (files only).</li>
-                            <li><id>time</id> - time last modified (files only).</li>
-                            <li><id>destination</id> - link destination (links only).</li>
-                        </ul></text>
+                        <text>
+                            <p>The following output types are supported:</p>
+
+                            <list>
+                                <list-item><id>text</id> - Simple list with one file/link/path name on each line.</list-item>
+                                <list-item><id>json</id> - Detailed file/link/path information in JSON format.</list-item>
+                            </list>
+
+                            <p>In JSON format the available fields are:</p>
+
+                            <list>
+                                <list-item><id>name</id> - file/link/path name (and partial path when recursing).</list-item>
+                                <list-item><id>type</id> - <id>file</id>, <id>path</id>, or <id>link</id>.</list-item>
+                                <list-item><id>size</id> - size in bytes (files only).</list-item>
+                                <list-item><id>time</id> - time last modified (files only).</list-item>
+                                <list-item><id>destination</id> - link destination (links only).</list-item>
+                            </list>
+                        </text>
 
                         <example>json</example>
                     </option>
@@ -1486,7 +1812,9 @@
                     <option id="recurse" name="Recurse Subpaths">
                         <summary>Include all subpaths in output.</summary>
 
-                        <text>All subpaths and their files will be included in the output.</text>
+                        <text>
+                            <p>All subpaths and their files will be included in the output.</p>
+                        </text>
 
                         <example>y</example>
                     </option>
@@ -1495,12 +1823,15 @@
                     <option id="sort" name="Sort Output">
                         <summary>Sort output ascending, descending, or none.</summary>
 
-                        <text>The following sort types are supported:
-                        <ul>
-                            <li><id>asc</id> - sort ascending.</li>
-                            <li><id>desc</id> - sort descending.</li>
-                            <li><id>none</id> - no sorting.</li>
-                        </ul></text>
+                        <text>
+                            <p>The following sort types are supported:</p>
+
+                            <list>
+                                <list-item><id>asc</id> - sort ascending.</list-item>
+                                <list-item><id>desc</id> - sort descending.</list-item>
+                                <list-item><id>none</id> - no sorting.</list-item>
+                            </list>
+                        </text>
 
                         <example>desc</example>
                     </option>
@@ -1511,25 +1842,31 @@
             <command id="repo-put" name="Repository Put File">
                 <summary>Put a file in the repository.</summary>
 
-                <text>Similar to the unix <cmd>tee</cmd> command by copying from stdin to a file but options and behavior are different. This command requires a fully qualified file name and is primarily for administration, investigation, and testing. It is not a required part of a normal <backrest/> setup.
+                <text>
+                    <p>Similar to the unix <cmd>tee</cmd> command by copying from stdin to a file but options and behavior are different. This command requires a fully qualified file name and is primarily for administration, investigation, and testing. It is not a required part of a normal <backrest/> setup.</p>
 
-                If more than one repository is configured, the command will default to the highest priority repository (e.g. <id>repo1</id>) unless the <br-option>{[dash]}-repo</br-option> option is specified.</text>
+                    <p>If more than one repository is configured, the command will default to the highest priority repository (e.g. <id>repo1</id>) unless the <br-option>{[dash]}-repo</br-option> option is specified.</p>
+                </text>
             </command>
 
             <!-- OPERATION - REPO-RM COMMAND -->
             <command id="repo-rm" name="Repository Remove Paths/Files">
                 <summary>Remove paths/files in the repository.</summary>
 
-                <text>Similar to the unix <cmd>rm</cmd> command but options are different. This command accepts a path, absolute or relative to the repository path defined by the <br-option>{[dash]}-repo-path</br-option> option, and is primarily for administration, investigation, and testing. It is not a required part of a normal <backrest/> setup.
+                <text>
+                    <p>Similar to the unix <cmd>rm</cmd> command but options are different. This command accepts a path, absolute or relative to the repository path defined by the <br-option>{[dash]}-repo-path</br-option> option, and is primarily for administration, investigation, and testing. It is not a required part of a normal <backrest/> setup.</p>
 
-                If more than one repository is configured, the command will default to the highest priority repository (e.g. <id>repo1</id>) unless the <br-option>{[dash]}-repo</br-option> option is specified.</text>
+                    <p>If more than one repository is configured, the command will default to the highest priority repository (e.g. <id>repo1</id>) unless the <br-option>{[dash]}-repo</br-option> option is specified.</p>
+                </text>
 
                 <option-list>
                     <!-- OPERATION - REPO-RM COMMAND - RECURSE OPTION -->
                     <option id="recurse" name="Recurse Subpaths">
                         <summary>Remove all sub file/paths.</summary>
 
-                        <text>All subpaths and their files will be removed.</text>
+                        <text>
+                            <p>All subpaths and their files will be removed.</p>
+                        </text>
 
                         <example>y</example>
                     </option>
@@ -1540,16 +1877,21 @@
             <command id="restore" name="Restore">
                 <summary>Restore a database cluster.</summary>
 
-                <text>The restore command automatically defaults to selecting the latest backup from the first repository where backups exist (see <link page="user-guide" section="/quickstart/perform-restore">Quick Start - Restore a Backup</link>). The order in which the repositories are checked is dictated by the <file>pgbackrest.conf</file> (e.g. repo1 will be checked before repo2). To select from a specific repository, the <br-option>{[dash]}-repo</br-option> option can be passed (e.g. <br-option>{[dash]}-repo=1</br-option>). The <br-option>{[dash]}-set</br-option> option can be passed if a backup other than the latest is desired.
+                <text>
+                    <p>The restore command automatically defaults to selecting the latest backup from the first repository where backups exist (see <link page="user-guide" section="/quickstart/perform-restore">Quick Start - Restore a Backup</link>). The order in which the repositories are checked is dictated by the <file>pgbackrest.conf</file> (e.g. repo1 will be checked before repo2). To select from a specific repository, the <br-option>{[dash]}-repo</br-option> option can be passed (e.g. <br-option>{[dash]}-repo=1</br-option>). The <br-option>{[dash]}-set</br-option> option can be passed if a backup other than the latest is desired.</p>
 
-                When PITR of <br-option>{[dash]}-type=time</br-option> is specified, then the target time must be specified with the <br-option>{[dash]}-target</br-option> option. If a backup is not specified via the <br-option>{[dash]}-set</br-option> option, then the configured repositories will be checked, in order, for a backup that contains the requested time. If no backup can be found, the latest backup from the first repository containing backups will be used. For other types of PITR, e.g. <id>xid</id>, the <br-option>{[dash]}-set</br-option> option must be provided if the target is prior to the latest backup. See <link page="user-guide" section="/pitr">Point-in-Time Recovery</link> for more details and examples.</text>
+                    <p>When PITR of <br-option>{[dash]}-type=time</br-option> is specified, then the target time must be specified with the <br-option>{[dash]}-target</br-option> option. If a backup is not specified via the <br-option>{[dash]}-set</br-option> option, then the configured repositories will be checked, in order, for a backup that contains the requested time. If no backup can be found, the latest backup from the first repository containing backups will be used. For other types of PITR, e.g. <id>xid</id>, the <br-option>{[dash]}-set</br-option> option must be provided if the target is prior to the latest backup. See <link page="user-guide" section="/pitr">Point-in-Time Recovery</link> for more details and examples.</p>
+                </text>
 
                 <option-list>
                     <!-- OPERATION - RESTORE COMMAND - SET OPTION -->
                     <option id="set" name="Set">
                         <summary>Backup set to restore.</summary>
 
-                        <text>The backup set to be restored.  <id>latest</id> will restore the latest backup, otherwise provide the name of the backup to restore.</text>
+                        <text>
+                            <p>The backup set to be restored. <id>latest</id> will restore the latest backup, otherwise provide the name of the backup to restore.</p>
+                        </text>
+
                         <example>20150131-153358F_20150131-153401I</example>
                     </option>
 
@@ -1557,7 +1899,9 @@
                     <option id="force" name="Force">
                         <summary>Force a restore.</summary>
 
-                        <text>By itself this option forces the <postgres/> data and tablespace paths to be completely overwritten.  In combination with <br-option>--delta</br-option> a timestamp/size delta will be performed instead of using checksums.</text>
+                        <text>
+                            <p>By itself this option forces the <postgres/> data and tablespace paths to be completely overwritten. In combination with <br-option>--delta</br-option> a timestamp/size delta will be performed instead of using checksums.</p>
+                        </text>
 
                         <example>y</example>
                     </option>
@@ -1566,18 +1910,22 @@
                     <option id="type" name="Type">
                         <summary>Recovery type.</summary>
 
-                        <text>The following recovery types are supported:
-                        <ul>
-                            <li><id>default</id> - recover to the end of the archive stream.</li>
-                            <li><id>immediate</id> - recover only until the database becomes consistent. This option is only supported on <postgres/> &gt;= 9.4.</li>
-                            <li><id>lsn</id> - recover to the LSN (Log Sequence Number) specified in <br-option>--target</br-option>. This option is only supported on <postgres/> &gt;= 10.</li>
-                            <li><id>name</id> - recover the restore point specified in <br-option>--target</br-option>.</li>
-                            <li><id>xid</id> - recover to the transaction id specified in <br-option>--target</br-option>.</li>
-                            <li><id>time</id> - recover to the time specified in <br-option>--target</br-option>.</li>
-                            <li><id>preserve</id> - preserve the existing <file>recovery.conf</file> file.</li>
-                            <li><id>standby</id> - add <setting>standby_mode=on</setting> to <file>recovery.conf</file> file so cluster will start in standby mode.</li>
-                            <li><id>none</id> - no <file>recovery.conf</file> file is written so <postgres/> will attempt to achieve consistency using WAL segments present in <path>pg_xlog</path>/<path>pg_wal</path>.  Provide the required WAL segments or use the <setting>archive-copy</setting> setting to include them with the backup.</li>
-                        </ul></text>
+                        <text>
+                            <p>The following recovery types are supported:</p>
+
+                            <list>
+                                <list-item><id>default</id> - recover to the end of the archive stream.</list-item>
+                                <list-item><id>immediate</id> - recover only until the database becomes consistent. This option is only supported on <postgres/> &gt;= 9.4.</list-item>
+                                <list-item><id>lsn</id> - recover to the LSN (Log Sequence Number) specified in <br-option>--target</br-option>. This option is only supported on <postgres/> &gt;= 10.</list-item>
+                                <list-item><id>name</id> - recover the restore point specified in <br-option>--target</br-option>.</list-item>
+                                <list-item><id>xid</id> - recover to the transaction id specified in <br-option>--target</br-option>.</list-item>
+                                <list-item><id>time</id> - recover to the time specified in <br-option>--target</br-option>.</list-item>
+                                <list-item><id>preserve</id> - preserve the existing <file>recovery.conf</file> file.</list-item>
+                                <list-item><id>standby</id> - add <setting>standby_mode=on</setting> to <file>recovery.conf</file> file so cluster will start in standby mode.</list-item>
+                                <list-item><id>none</id> - no <file>recovery.conf</file> file is written so <postgres/> will attempt to achieve consistency using WAL segments present in <path>pg_xlog</path>/<path>pg_wal</path>. Provide the required WAL segments or use the <setting>archive-copy</setting> setting to include them with the backup.</list-item>
+                            </list>
+                        </text>
+
                         <example>xid</example>
                     </option>
 
@@ -1585,7 +1933,10 @@
                     <option id="target" name="Target">
                         <summary>Recovery target.</summary>
 
-                        <text>Defines the recovery target when <br-option>--type</br-option> is <id>lsn</id>, <id>name</id>, <id>xid</id>, or <id>time</id>. If the target is prior to the latest backup and <br-option>--type</br-option> is not <id>time</id>, then use the <br-option>--set</br-option> option to specify the backup set.</text>
+                        <text>
+                            <p>Defines the recovery target when <br-option>--type</br-option> is <id>lsn</id>, <id>name</id>, <id>xid</id>, or <id>time</id>. If the target is prior to the latest backup and <br-option>--type</br-option> is not <id>time</id>, then use the <br-option>--set</br-option> option to specify the backup set.</p>
+                        </text>
+
                         <example>2015-01-30 14:15:11 EST</example>
                     </option>
 
@@ -1593,7 +1944,9 @@
                     <option id="target-exclusive" name="Target Exclusive">
                         <summary>Stop just before the recovery target is reached.</summary>
 
-                        <text>Defines whether recovery to the target would be exclusive (the default is inclusive) and is only valid when <br-option>--type</br-option> is <id>lsn</id>, <id>time</id> or <id>xid</id>. For example, using <br-option>--target-exclusive</br-option> would exclude the contents of transaction <id>1007</id> when <br-option>--type=xid</br-option> and <br-option>--target=1007</br-option>.  See the <setting>recovery_target_inclusive</setting> option in the <postgres/> docs for more information.</text>
+                        <text>
+                            <p>Defines whether recovery to the target would be exclusive (the default is inclusive) and is only valid when <br-option>--type</br-option> is <id>lsn</id>, <id>time</id> or <id>xid</id>. For example, using <br-option>--target-exclusive</br-option> would exclude the contents of transaction <id>1007</id> when <br-option>--type=xid</br-option> and <br-option>--target=1007</br-option>. See the <setting>recovery_target_inclusive</setting> option in the <postgres/> docs for more information.</p>
+                        </text>
 
                         <example>n</example>
                     </option>
@@ -1602,14 +1955,17 @@
                     <option id="target-action" name="Target Action">
                         <summary>Action to take when recovery target is reached.</summary>
 
-                        <text>This option is effective when <setting>hot_standby=on</setting> is configured in <file>postgresql.conf</file>, otherwise the cluster will be promoted when the target is reached or there is no more WAL in the archive.
+                        <text>
+                            <p>This option is effective when <setting>hot_standby=on</setting> is configured in <file>postgresql.conf</file>, otherwise the cluster will be promoted when the target is reached or there is no more WAL in the archive.</p>
 
-                            The following actions are supported:
-                        <ul>
-                            <li><id>pause</id> - pause when recovery target is reached. (<postgres/> &gt;= 9.1)</li>
-                            <li><id>promote</id> - promote and switch timeline when recovery target is reached. (<postgres/> &gt;= 9.1)</li>
-                            <li><id>shutdown</id> - shutdown server when recovery target is reached. (<postgres/> &gt;= 9.5)</li>
-                        </ul></text>
+                            <p>The following actions are supported:</p>
+
+                            <list>
+                                <list-item><id>pause</id> - pause when recovery target is reached. (<postgres/> &gt;= 9.1)</list-item>
+                                <list-item><id>promote</id> - promote and switch timeline when recovery target is reached. (<postgres/> &gt;= 9.1)</list-item>
+                                <list-item><id>shutdown</id> - shutdown server when recovery target is reached. (<postgres/> &gt;= 9.5)</list-item>
+                            </list>
+                        </text>
 
                         <example>promote</example>
                     </option>
@@ -1618,7 +1974,9 @@
                     <option id="target-timeline" name="Target Timeline">
                         <summary>Recover along a timeline.</summary>
 
-                        <text>See <setting>recovery_target_timeline</setting> in the <postgres/> docs for more information.</text>
+                        <text>
+                            <p>See <setting>recovery_target_timeline</setting> in the <postgres/> docs for more information.</p>
+                        </text>
 
                         <example>3</example>
                     </option>
@@ -1629,37 +1987,43 @@
             <command id="info" name="Info">
                 <summary>Retrieve information about backups.</summary>
 
-                <text>The <cmd>info</cmd> command operates on a single stanza or all stanzas.  Text output is the default and gives a human-readable summary of backups for the stanza(s) requested.  This format is subject to change with any release.
+                <text>
+                    <p>The <cmd>info</cmd> command operates on a single stanza or all stanzas. Text output is the default and gives a human-readable summary of backups for the stanza(s) requested. This format is subject to change with any release.</p>
 
-                For machine-readable output use <br-option>--output=json</br-option>.  The JSON output contains far more information than the text output and is kept stable unless a bug is found.
+                    <p>For machine-readable output use <br-option>--output=json</br-option>. The JSON output contains far more information than the text output and is kept stable unless a bug is found.</p>
 
-                Each stanza has a separate section and it is possible to limit output to a single stanza with the <br-option>--stanza</br-option> option. The stanza '<id>status</id>' gives a brief indication of the stanza's health. If this is '<id>ok</id>' then <backrest/> is functioning normally. If there are multiple repositories, then a status of '<id>mixed</id>' indicates that the stanza is not in a healthy state on one or more of the repositories; in this case the state of the stanza will be detailed per repository. For cases in which an error on a repository occurred that is not one of the known error codes, then an error code of '<id>other</id>' will be used and the full error details will be provided. The '<id>wal archive min/max</id>' shows the minimum and maximum WAL currently stored in the archive and, in the case of multiple repositories, will be reported across all repositories unless the <br-option>{[dash]}-repo</br-option> option is set. Note that there may be gaps due to archive retention policies or other reasons.
+                    <p>Each stanza has a separate section and it is possible to limit output to a single stanza with the <br-option>--stanza</br-option> option. The stanza '<id>status</id>' gives a brief indication of the stanza's health. If this is '<id>ok</id>' then <backrest/> is functioning normally. If there are multiple repositories, then a status of '<id>mixed</id>' indicates that the stanza is not in a healthy state on one or more of the repositories; in this case the state of the stanza will be detailed per repository. For cases in which an error on a repository occurred that is not one of the known error codes, then an error code of '<id>other</id>' will be used and the full error details will be provided. The '<id>wal archive min/max</id>' shows the minimum and maximum WAL currently stored in the archive and, in the case of multiple repositories, will be reported across all repositories unless the <br-option>{[dash]}-repo</br-option> option is set. Note that there may be gaps due to archive retention policies or other reasons.</p>
 
-                The '<id>backup/expire running</id>' message will appear beside the '<id>status</id>' information if one of those commands is currently running on the host.
+                    <p>The '<id>backup/expire running</id>' message will appear beside the '<id>status</id>' information if one of those commands is currently running on the host.</p>
 
-                The backups are displayed oldest to newest.  The oldest backup will <i>always</i> be a full backup (indicated by an <id>F</id> at the end of the label) but the newest backup can be full, differential (ends with <id>D</id>), or incremental (ends with <id>I</id>).
+                    <p>The backups are displayed oldest to newest. The oldest backup will <i>always</i> be a full backup (indicated by an <id>F</id> at the end of the label) but the newest backup can be full, differential (ends with <id>D</id>), or incremental (ends with <id>I</id>).</p>
 
-                The '<id>timestamp start/stop</id>' defines the time period when the backup ran.  The '<id>timestamp stop</id>' can be used to determine the backup to use when performing Point-In-Time Recovery.  More information about Point-In-Time Recovery can be found in the <link page="user-guide" section="/pitr">Point-In-Time Recovery</link> section.
+                    <p>The '<id>timestamp start/stop</id>' defines the time period when the backup ran. The '<id>timestamp stop</id>' can be used to determine the backup to use when performing Point-In-Time Recovery. More information about Point-In-Time Recovery can be found in the <link page="user-guide" section="/pitr">Point-In-Time Recovery</link> section.</p>
 
-                The '<id>wal start/stop</id>' defines the WAL range that is required to make the database consistent when restoring.  The <cmd>backup</cmd> command will ensure that this WAL range is in the archive before completing.
+                    <p>The '<id>wal start/stop</id>' defines the WAL range that is required to make the database consistent when restoring. The <cmd>backup</cmd> command will ensure that this WAL range is in the archive before completing.</p>
 
-                The '<id>database size</id>' is the full uncompressed size of the database while '<id>database backup size</id>' is the amount of data in the database to actually back up (these will be the same for full backups).
+                    <p>The '<id>database size</id>' is the full uncompressed size of the database while '<id>database backup size</id>' is the amount of data in the database to actually back up (these will be the same for full backups).</p>
 
-                The '<id>repo</id>' indicates in which repository this backup resides. The '<id>backup set size</id>' includes all the files from this backup and any referenced backups in the repository that are required to restore the database from this backup while '<id>backup size</id>' includes only the files in this backup (these will also be the same for full backups). Repository sizes reflect compressed file sizes if compression is enabled in <backrest/> or the filesystem.
+                    <p>The '<id>repo</id>' indicates in which repository this backup resides. The '<id>backup set size</id>' includes all the files from this backup and any referenced backups in the repository that are required to restore the database from this backup while '<id>backup size</id>' includes only the files in this backup (these will also be the same for full backups). Repository sizes reflect compressed file sizes if compression is enabled in <backrest/> or the filesystem.</p>
 
-                The '<id>backup reference list</id>' contains the additional backups that are required to restore this backup.</text>
-                <!-- Note, linking to the User Guide is limited since it can cause a cyclical reference -->
+                    <p>The '<id>backup reference list</id>' contains the additional backups that are required to restore this backup.</p>
+
+                    <!-- Note, linking to the User Guide is limited since it can cause a cyclical reference -->
+                </text>
 
                 <option-list>
                     <!-- OPERATION - INFO COMMAND - OUTPUT OPTION -->
                     <option id="output" name="Output">
                         <summary>Output format.</summary>
 
-                        <text>The following output types are supported:
-                        <ul>
-                            <li><id>text</id> - Human-readable summary of backup information.</li>
-                            <li><id>json</id> - Exhaustive machine-readable backup information in JSON format.</li>
-                        </ul></text>
+                        <text>
+                            <p>The following output types are supported:</p>
+
+                            <list>
+                                <list-item><id>text</id> - Human-readable summary of backup information.</list-item>
+                                <list-item><id>json</id> - Exhaustive machine-readable backup information in JSON format.</list-item>
+                            </list>
+                        </text>
 
                         <example>json</example>
                     </option>
@@ -1667,7 +2031,10 @@
                     <option id="set" name="Set">
                         <summary>Backup set to detail.</summary>
 
-                        <text>Details include a list of databases (with OIDs) in the backup set (excluding template databases), tablespaces (with OIDs) with the destination where they will be restored by default, and symlinks with the destination where they will be restored when <setting>--link-all</setting> is specified.</text>
+                        <text>
+                            <p>Details include a list of databases (with OIDs) in the backup set (excluding template databases), tablespaces (with OIDs) with the destination where they will be restored by default, and symlinks with the destination where they will be restored when <setting>--link-all</setting> is specified.</p>
+                        </text>
+
                         <example>20150131-153358F_20150131-153401I</example>
                     </option>
                 </option-list>
@@ -1677,30 +2044,38 @@
             <command id="help" name="Help">
                 <summary>Get help.</summary>
 
-                <text>Three levels of help are provided.  If no command is specified then general help will be displayed.  If a command is specified (e.g. <cmd>pgbackrest help backup</cmd>) then a full description of the command will be displayed along with a list of valid options.  If an option is specified in addition to a command (e.g. <cmd>pgbackrest help backup type</cmd>) then a full description of the option as it applies to the command will be displayed.</text>
+                <text>
+                    <p>Three levels of help are provided. If no command is specified then general help will be displayed. If a command is specified (e.g. <cmd>pgbackrest help backup</cmd>) then a full description of the command will be displayed along with a list of valid options. If an option is specified in addition to a command (e.g. <cmd>pgbackrest help backup type</cmd>) then a full description of the option as it applies to the command will be displayed.</p>
+                </text>
             </command>
 
             <!-- OPERATION - START COMMAND -->
             <command id="start" name="Start">
                 <summary>Allow <backrest/> processes to run.</summary>
 
-                <text>If the <backrest/> processes were previously stopped using the <cmd>stop</cmd> command then they can be started again using the <cmd>start</cmd> command.  Note that this will not immediately start up any <backrest/> processes but they are allowed to run. See <link page="user-guide" section="/start-stop">Starting and Stopping</link> for more information and examples.</text>
+                <text>
+                    <p>If the <backrest/> processes were previously stopped using the <cmd>stop</cmd> command then they can be started again using the <cmd>start</cmd> command. Note that this will not immediately start up any <backrest/> processes but they are allowed to run. See <link page="user-guide" section="/start-stop">Starting and Stopping</link> for more information and examples.</p>
+                </text>
             </command>
 
             <!-- OPERATION - STOP COMMAND -->
             <command id="stop" name="Stop">
                 <summary>Stop <backrest/> processes from running.</summary>
 
-                <text>Does not allow any new <backrest/> processes to run.  By default running processes will be allowed to complete successfully.  Use the <setting>--force</setting> option to terminate running processes.
+                <text>
+                    <p>Does not allow any new <backrest/> processes to run. By default running processes will be allowed to complete successfully. Use the <setting>--force</setting> option to terminate running processes.</p>
 
-                <backrest/> processes will return an error if they are run after the stop command completes. See <link page="user-guide" section="/start-stop">Starting and Stopping</link> for more information and examples.</text>
+                    <p><backrest/> processes will return an error if they are run after the stop command completes. See <link page="user-guide" section="/start-stop">Starting and Stopping</link> for more information and examples.</p>
+                </text>
 
                 <option-list>
                     <!-- OPERATION - STOP COMMAND - FORCE OPTION -->
                     <option id="force" name="Force">
                         <summary>Force all <backrest/> processes to stop.</summary>
 
-                        <text>This option will send TERM signals to all running <backrest/> processes to effect a graceful but immediate shutdown.  Note that this will also shutdown processes that were initiated on another system but have remotes running on the current system.  For instance, if a backup was started on the backup server then running <cmd>stop --force</cmd> on the database server will shutdown the backup process on the backup server.</text>
+                        <text>
+                            <p>This option will send TERM signals to all running <backrest/> processes to effect a graceful but immediate shutdown. Note that this will also shutdown processes that were initiated on another system but have remotes running on the current system. For instance, if a backup was started on the backup server then running <cmd>stop --force</cmd> on the database server will shutdown the backup process on the backup server.</p>
+                        </text>
 
                         <example>y</example>
                     </option>
@@ -1711,14 +2086,19 @@
             <command id="verify" name="Verify">
                 <summary>Verify the contents of the repository.</summary>
 
-                <text>Verify will attempt to determine if the backups and archives in the repository are valid.</text>
+                <text>
+                    <p>Verify will attempt to determine if the backups and archives in the repository are valid.</p>
+                </text>
 
                 <option-list>
                     <!-- OPERATION - VERIFY COMMAND - SET OPTION -->
                     <option id="set" name="Set">
                         <summary>Backup set to verify.</summary>
 
-                        <text>Verify all database and archive files associated with the specified backup set.</text>
+                        <text>
+                            <p>Verify all database and archive files associated with the specified backup set.</p>
+                        </text>
+
                         <example>20150131-153358F_20150131-153401I</example>
                     </option>
                 </option-list>
@@ -1728,21 +2108,27 @@
             <command id="version" name="Version">
                 <summary>Get version.</summary>
 
-                <text>Displays installed <backrest/> version.</text>
+                <text>
+                    <p>Displays installed <backrest/> version.</p>
+                </text>
             </command>
 
             <!-- OPERATION - STANZA-CREATE COMMAND -->
             <command id="stanza-create" name="Stanza Create">
                 <summary>Create the required stanza data.</summary>
 
-                <text>The <cmd>stanza-create</cmd> command must be run after the stanza has been configured in <file>pgbackrest.conf</file>. If there is more than one repository configured, the stanza will be created on each. See <link page="user-guide" section="/quickstart/create-stanza">Create the Stanza</link> for more information and an example.</text>
+                <text>
+                    <p>The <cmd>stanza-create</cmd> command must be run after the stanza has been configured in <file>pgbackrest.conf</file>. If there is more than one repository configured, the stanza will be created on each. See <link page="user-guide" section="/quickstart/create-stanza">Create the Stanza</link> for more information and an example.</p>
+                </text>
 
                 <option-list>
                     <!-- OPERATION - STANZA-CREATE COMMAND - FORCE OPTION -->
                     <option id="force" name="Force">
                         <summary>Force stanza creation.</summary>
 
-                        <text>This option is no longer supported.</text>
+                        <text>
+                            <p>This option is no longer supported.</p>
+                        </text>
 
                         <example>n</example>
                     </option>
@@ -1751,7 +2137,9 @@
                     <option id="online" name="Online">
                         <summary>Create on an online cluster.</summary>
 
-                        <text>Specifying --no-online prevents <backrest/> from connecting to <postgres/> when creating the stanza.</text>
+                        <text>
+                            <p>Specifying --no-online prevents <backrest/> from connecting to <postgres/> when creating the stanza.</p>
+                        </text>
 
                         <example>n</example>
                     </option>
@@ -1762,15 +2150,20 @@
             <command id="stanza-upgrade" name="Stanza Upgrade">
                 <summary>Upgrade a stanza.</summary>
 
-                <text>Immediately after upgrading <postgres/> to a newer major version, the <br-option>pg-path</br-option> for all <backrest/> configurations must be set to the new database location and the <cmd>stanza-upgrade</cmd> command run. If there is more than one repository configured on the host, the stanza will be created on each. If the database is offline use the <br-option>--no-online</br-option> option.</text>
-                <!-- Note, linking to the User Guide is limited since it can cause a cyclical reference -->
+                <text>
+                    <p>Immediately after upgrading <postgres/> to a newer major version, the <br-option>pg-path</br-option> for all <backrest/> configurations must be set to the new database location and the <cmd>stanza-upgrade</cmd> command run. If there is more than one repository configured on the host, the stanza will be created on each. If the database is offline use the <br-option>--no-online</br-option> option.</p>
+
+                    <!-- Note, linking to the User Guide is limited since it can cause a cyclical reference -->
+                </text>
 
                 <option-list>
                     <!-- ======================================================================================================= -->
                     <option id="online" name="Online">
                         <summary>Update an online cluster.</summary>
 
-                        <text>Specifying --no-online prevents <backrest/> from connecting to <postgres/> when upgrading the stanza.</text>
+                        <text>
+                            <p>Specifying --no-online prevents <backrest/> from connecting to <postgres/> when upgrading the stanza.</p>
+                        </text>
 
                         <example>n</example>
                     </option>
@@ -1781,23 +2174,34 @@
             <command id="stanza-delete" name="Stanza Delete">
                 <summary>Delete a stanza.</summary>
 
-                <text>The <cmd>stanza-delete</cmd> command removes data in the repository associated with a stanza.<admonition type="warning">Use this command with caution &amp;mdash; it will permanently remove all backups and archives from the <backrest/> repository for the specified stanza.</admonition>
-                To delete a stanza:
-                <ul>
-                    <li>Shut down the <postgres/> cluster associated with the stanza (or use --force to override).</li>
-                    <li>Run the <cmd>stop</cmd> command on the host where the <cmd>stanza-delete</cmd> command will be run.</li>
-                    <li>Run the <cmd>stanza-delete</cmd> command.</li>
-                </ul>Once the command successfully completes, it is the responsibility of the user to remove the stanza from all <backrest/> configuration files and/or environment variables.
+                <text>
+                    <p>The <cmd>stanza-delete</cmd> command removes data in the repository associated with a stanza.</p>
 
-                A stanza may only be deleted from one repository at a time. To delete the stanza from multiple repositories, repeat the <cmd>stanza-delete</cmd> command for each repository while specifying the <br-option>{[dash]}-repo</br-option> option.</text>
-                <!-- Note, linking to the User Guide is limited since it can cause a cyclical reference -->
+                    <admonition type="warning">Use this command with caution &amp;mdash; it will permanently remove all backups and archives from the <backrest/> repository for the specified stanza.</admonition>
+
+                    <p>To delete a stanza:</p>
+
+                    <list>
+                        <list-item>Shut down the <postgres/> cluster associated with the stanza (or use --force to override).</list-item>
+                        <list-item>Run the <cmd>stop</cmd> command on the host where the <cmd>stanza-delete</cmd> command will be run.</list-item>
+                        <list-item>Run the <cmd>stanza-delete</cmd> command.</list-item>
+                    </list>
+
+                    <p>Once the command successfully completes, it is the responsibility of the user to remove the stanza from all <backrest/> configuration files and/or environment variables.</p>
+
+                    <p>A stanza may only be deleted from one repository at a time. To delete the stanza from multiple repositories, repeat the <cmd>stanza-delete</cmd> command for each repository while specifying the <br-option>{[dash]}-repo</br-option> option.</p>
+
+                    <!-- Note, linking to the User Guide is limited since it can cause a cyclical reference -->
+                </text>
 
                 <option-list>
                     <!-- OPERATION - STANZA-CREATE COMMAND - FORCE OPTION -->
                     <option id="force" name="Force">
                         <summary>Force stanza delete.</summary>
 
-                        <text>If <postgres/> is still running for the stanza, then this option can be used to force the stanza to be deleted from the repository.</text>
+                        <text>
+                            <p>If <postgres/> is still running for the stanza, then this option can be used to force the stanza to be deleted from the repository.</p>
+                        </text>
 
                         <example>n</example>
                     </option>
diff --git a/doc/xml/release.xml b/doc/xml/release.xml
index 36fad2158..06868797c 100644
--- a/doc/xml/release.xml
+++ b/doc/xml/release.xml
@@ -4,11 +4,13 @@
     <description>The {[project]} Releases detail each version of the software and lists the changes made in each version.</description>
 
     <intro>
-        <text><backrest/> release numbers consist of two parts, major and minor.  A major release <i>may</i> break compatibility with the prior major release, but <proper>v2</proper> releases are fully compatible with <proper>v1</proper> repositories and will accept all <proper>v1</proper> options.  Minor releases can include bug fixes and features but do not change the repository format and strive to avoid changing options and naming.
+        <text>
+            <p><backrest/> release numbers consist of two parts, major and minor.  A major release <i>may</i> break compatibility with the prior major release, but <proper>v2</proper> releases are fully compatible with <proper>v1</proper> repositories and will accept all <proper>v1</proper> options.  Minor releases can include bug fixes and features but do not change the repository format and strive to avoid changing options and naming.</p>
 
-        Documentation for the <proper>v1</proper> release can be found <link url="{[backrest-url-base]}/1">here</link>.
+            <p>Documentation for the <proper>v1</proper> release can be found <link url="{[backrest-url-base]}/1">here</link>.</p>
 
-        The notes for a release may also contain <quote>Additional Notes</quote> but changes in this section are only to documentation or the test suite and have no direct impact on the <backrest/> codebase.</text>
+            <p>The notes for a release may also contain <quote>Additional Notes</quote> but changes in this section are only to documentation or the test suite and have no direct impact on the <backrest/> codebase.</p>
+        </text>
     </intro>
 
     <release-list>
@@ -31,7 +33,10 @@
 
         <release date="2021-08-23" version="2.35" title="Binary Protocol">
             <release-core-list>
-                <p><b>IMPORTANT NOTE</b>: The log level for copied files in the <cmd>backup</cmd>/<cmd>restore</cmd> commands has been changed to <id>detail</id>. This makes the <id>info</id> log level less noisy but if these messages are required then set the log level for the <cmd>backup</cmd>/<cmd>restore</cmd> commands to <id>detail</id>.</p>
+                <text>
+                    <p><b>IMPORTANT NOTE</b>: The log level for copied files in the <cmd>backup</cmd>/<cmd>restore</cmd> commands has been changed to <id>detail</id>. This makes the <id>info</id> log level less noisy but if these messages are required then set the log level for the <cmd>backup</cmd>/<cmd>restore</cmd> commands to <id>detail</id>.
+                    </p>
+                </text>
 
                 <release-bug-list>
                     <release-item>
@@ -3266,7 +3271,9 @@
 
         <release date="2019-04-11" version="2.12" title="C Implementation of Archive Push">
             <release-core-list>
-                <p><b>IMPORTANT NOTE</b>: The new <proper>TLS</proper>/<proper>SSL</proper> implementation forbids dots in <proper>S3</proper> bucket names per RFC-2818.  This security fix is required for compliant hostname verification.</p>
+                <text>
+                    <p><b>IMPORTANT NOTE</b>: The new <proper>TLS</proper>/<proper>SSL</proper> implementation forbids dots in <proper>S3</proper> bucket names per RFC-2818.  This security fix is required for compliant hostname verification.</p>
+                </text>
 
                 <release-bug-list>
                     <release-item>
@@ -5020,7 +5027,9 @@
 
         <release date="2018-07-05" version="2.04" title="Critical Bug Fix for Backup Resume">
             <release-core-list>
-                <p><b>IMPORTANT NOTE</b>: This release fixes a critical bug in the backup resume feature. All resumed backups prior to this release should be considered inconsistent. A backup will be resumed after a prior backup fails, unless <br-option>resume=n</br-option> has been specified. A resumed backup can be identified by checking the backup log for the message <quote>aborted backup of same type exists, will be cleaned to remove invalid files and resumed</quote>. If the message exists, do not use this backup or any backup in the same set for a restore and check the restore logs to see if a resumed backup was restored. If so, there may be inconsistent data in the cluster.</p>
+                <text>
+                    <p><b>IMPORTANT NOTE</b>: This release fixes a critical bug in the backup resume feature. All resumed backups prior to this release should be considered inconsistent. A backup will be resumed after a prior backup fails, unless <br-option>resume=n</br-option> has been specified. A resumed backup can be identified by checking the backup log for the message <quote>aborted backup of same type exists, will be cleaned to remove invalid files and resumed</quote>. If the message exists, do not use this backup or any backup in the same set for a restore and check the restore logs to see if a resumed backup was restored. If so, there may be inconsistent data in the cluster.</p>
+                </text>
 
                 <release-bug-list>
                     <release-item>
@@ -5948,7 +5957,9 @@
 
         <release date="2018-07-05" version="1.29" title="Critical Bug Fix for Backup Resume">
             <release-core-list>
-                <p><b>IMPORTANT NOTE</b>: This release fixes a critical bug in the backup resume feature. All resumed backups prior to this release should be considered inconsistent. A backup will be resumed after a prior backup fails, unless <br-option>resume=n</br-option> has been specified. A resumed backup can be identified by checking the backup log for the message <quote>aborted backup of same type exists, will be cleaned to remove invalid files and resumed</quote>. If the message exists, do not use this backup or any backup in the same set for a restore and check the restore logs to see if a resumed backup was restored. If so, there may be inconsistent data in the cluster.</p>
+                <text>
+                    <p><b>IMPORTANT NOTE</b>: This release fixes a critical bug in the backup resume feature. All resumed backups prior to this release should be considered inconsistent. A backup will be resumed after a prior backup fails, unless <br-option>resume=n</br-option> has been specified. A resumed backup can be identified by checking the backup log for the message <quote>aborted backup of same type exists, will be cleaned to remove invalid files and resumed</quote>. If the message exists, do not use this backup or any backup in the same set for a restore and check the restore logs to see if a resumed backup was restored. If so, there may be inconsistent data in the cluster.</p>
+                </text>
 
                 <release-bug-list>
                     <release-item>
@@ -6928,7 +6939,10 @@
 
         <release date="2017-06-27" version="1.20" title="Critical 8.3/8.4 Bug Fix">
             <release-core-list>
-                <p><b>IMPORTANT NOTE</b>: <postgres/> <proper>8.3</proper> and <proper>8.4</proper> installations utilizing tablespaces should upgrade immediately from any <proper>v1</proper> release and run a full backup.  A bug prevented tablespaces from being backed up on these versions only.  <postgres/> &amp;ge; <proper>9.0</proper> is not affected.</p>
+                <text>
+                    <p><b>IMPORTANT NOTE</b>: <postgres/> <proper>8.3</proper> and <proper>8.4</proper> installations utilizing tablespaces should upgrade immediately from any <proper>v1</proper> release and run a full backup.  A bug prevented tablespaces from being backed up on these versions only.  <postgres/> &amp;ge; <proper>9.0</proper>
+                    is not affected.</p>
+                </text>
 
                 <release-bug-list>
                     <release-item>
@@ -7522,11 +7536,13 @@
 
         <release date="2017-02-05" version="1.13" title="Parallel Archiving, Stanza Create, Improved Info and Check">
             <release-core-list>
-                <p><b>IMPORTANT NOTE</b>: The new implementation of asynchronous archiving no longer copies WAL to a separate queue. If there is any WAL left over in the old queue after upgrading to <id>1.13</id>, it will be abandoned and <b>not</b> pushed to the repository.
+                <text>
+                    <p><b>IMPORTANT NOTE</b>: The new implementation of asynchronous archiving no longer copies WAL to a separate queue. If there is any WAL left over in the old queue after upgrading to <id>1.13</id>, it will be abandoned and <b>not</b> pushed to the repository.</p>
 
-                To prevent this outcome, stop archiving by setting <setting>archive_command = false</setting>. Next, drain the async queue by running <code>pgbackrest --stanza=[stanza-name] archive-push</code> and wait for the process to complete.  Check that the queue in <path>[spool-path]/archive/[stanza-name]/out</path> is empty. Finally, install <code>1.13</code> and restore the original <setting>archive_command</setting>.
+                    <p>To prevent this outcome, stop archiving by setting <setting>archive_command = false</setting>. Next, drain the async queue by running <code>pgbackrest --stanza=[stanza-name] archive-push</code> and wait for the process to complete.  Check that the queue in <path>[spool-path]/archive/[stanza-name]/out</path> is empty. Finally, install <code>1.13</code> and restore the original <setting>archive_command</setting>.</p>
 
-                <b>IMPORTANT NOTE</b>: The <cmd>stanza-create</cmd> command is not longer optional and must be executed before backup or archiving can be performed on a <b>new</b> stanza.  Pre-existing stanzas do not require <cmd>stanza-create</cmd> to be executed.</p>
+                    <p><b>IMPORTANT NOTE</b>: The <cmd>stanza-create</cmd> command is not longer optional and must be executed before backup or archiving can be performed on a <b>new</b> stanza.  Pre-existing stanzas do not require <cmd>stanza-create</cmd> to be executed.</p>
+                </text>
 
                 <release-bug-list>
                     <release-item>
@@ -7762,7 +7778,9 @@
 
         <release date="2016-12-12" version="1.12" title="Page Checksums, Configuration, and Bug Fixes">
             <release-core-list>
-                <p><b>IMPORTANT NOTE</b>: In prior releases it was possible to specify options on the command-line that were invalid for the current command without getting an error.  An error will now be generated for invalid options so it is important to carefully check command-line options in your environment to prevent disruption.</p>
+                <text>
+                    <p><b>IMPORTANT NOTE</b>: In prior releases it was possible to specify options on the command-line that were invalid for the current command without getting an error.  An error will now be generated for invalid options so it is important to carefully check command-line options in your environment to prevent disruption.</p>
+                </text>
 
                 <release-bug-list>
                     <release-item>
@@ -8919,7 +8937,9 @@
 
         <release date="2016-04-14" version="1.00" title="New Repository Format and Configuration Scheme, Link Support">
             <release-core-list>
-                <p><b>IMPORTANT NOTE</b>: This flag day release breaks compatibility with older versions of <backrest/>.  The manifest format, on-disk structure, configuration scheme, and the exe/path names have all changed.  You must create a new repository to hold backups for this version of <backrest/> and keep your older repository for a time in case you need to do a restore.  Restores from the prior repository will require the prior version of <backrest/> but because of name changes it is possible to have <id>1.00</id> and a prior version of <backrest/> installed at the same time.  See the notes below for more detailed information on what has changed.</p>
+                <text>
+                    <p><b>IMPORTANT NOTE</b>: This flag day release breaks compatibility with older versions of <backrest/>.  The manifest format, on-disk structure, configuration scheme, and the exe/path names have all changed.  You must create a new repository to hold backups for this version of <backrest/> and keep your older repository for a time in case you need to do a restore.  Restores from the prior repository will require the prior version of <backrest/> but because of name changes it is possible to have <id>1.00</id> and a prior version of <backrest/> installed at the same time.  See the notes below for more detailed information on what has changed.</p>
+                </text>
 
                 <release-feature-list>
                     <release-item>
@@ -9013,7 +9033,9 @@
 
         <release date="2016-03-22" version="0.91" title="Tablespace Bug Fix and Minor Enhancements">
             <release-core-list>
-                <p><b>IMPORTANT BUG FIX FOR TABLESPACES</b>: A change to the repository format was accidentally introduced in 0.90 which means the on-disk backup was no longer a valid <postgres/> cluster when the backup contained tablespaces.  This only affected users who directly copied the backups to restore <postgres/> clusters rather than using the restore command.  However, the fix breaks compatibility with older backups that contain tablespaces no matter how they are being restored (<backrest/> will throw errors and refuse to restore).  New full backups should be taken immediately after installing version 0.91 for any clusters that contain tablespaces.  If older backups need to be restored then use a version of <backrest/> that matches the backup version.</p>
+                <text>
+                    <p><b>IMPORTANT BUG FIX FOR TABLESPACES</b>: A change to the repository format was accidentally introduced in 0.90 which means the on-disk backup was no longer a valid <postgres/> cluster when the backup contained tablespaces.  This only affected users who directly copied the backups to restore <postgres/> clusters rather than using the restore command.  However, the fix breaks compatibility with older backups that contain tablespaces no matter how they are being restored (<backrest/> will throw errors and refuse to restore).  New full backups should be taken immediately after installing version 0.91 for any clusters that contain tablespaces.  If older backups need to be restored then use a version of <backrest/> that matches the backup version.</p>
+                </text>
 
                 <release-bug-list>
                     <release-item>
@@ -9511,7 +9533,9 @@
 
         <release date="2015-06-14" version="0.75" title="New Repository Format, Info Command and Experimental 9.5 Support">
             <release-core-list>
-                <p><b>IMPORTANT NOTE</b>: This flag day release breaks compatibility with older versions of <backrest/>.  The manifest format, on-disk structure, and the binary names have all changed.  You must create a new repository to hold backups for this version of <backrest/> and keep your older repository for a time in case you need to do a restore.  The <file>pg_backrest.conf</file> file has not changed but you'll need to change any references to <file>pg_backrest.pl</file> in cron (or elsewhere) to <file>pg_backrest</file> (without the <file>.pl</file> extension).</p>
+                <text>
+                    <p><b>IMPORTANT NOTE</b>: This flag day release breaks compatibility with older versions of <backrest/>.  The manifest format, on-disk structure, and the binary names have all changed.  You must create a new repository to hold backups for this version of <backrest/> and keep your older repository for a time in case you need to do a restore.  The <file>pg_backrest.conf</file> file has not changed but you'll need to change any references to <file>pg_backrest.pl</file> in cron (or elsewhere) to <file>pg_backrest</file> (without the <file>.pl</file> extension).</p>
+                </text>
 
                 <release-feature-list>
                     <release-item>
diff --git a/src/command/help/help.auto.c b/src/command/help/help.auto.c
index 386791862..b583137aa 100644
--- a/src/command/help/help.auto.c
+++ b/src/command/help/help.auto.c
@@ -678,7 +678,7 @@ static const unsigned char helpDataPack[] =
             0x6D, 0x6D, 0x61, 0x6E, 0x64, 0x20, 0x72, 0x65, 0x6D, 0x6F, 0x76, 0x65, 0x73, 0x20, 0x64, 0x61, 0x74, 0x61, 0x20, 0x69,
             0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x61, 0x73, 0x73,
             0x6F, 0x63, 0x69, 0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x61, 0x20, 0x73, 0x74, 0x61, 0x6E, 0x7A,
-            0x61, 0x2E, 0x0A,
+            0x61, 0x2E, 0x0A, 0x0A,
             0x57, 0x41, 0x52, 0x4E, 0x49, 0x4E, 0x47, 0x3A, 0x20, 0x55, 0x73, 0x65, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x63, 0x6F,
             0x6D, 0x6D, 0x61, 0x6E, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x63, 0x61, 0x75, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x2D,
             0x2D, 0x20, 0x69, 0x74, 0x20, 0x77, 0x69, 0x6C, 0x6C, 0x20, 0x70, 0x65, 0x72, 0x6D, 0x61, 0x6E, 0x65, 0x6E, 0x74, 0x6C,
@@ -686,7 +686,7 @@ static const unsigned char helpDataPack[] =
             0x20, 0x61, 0x6E, 0x64, 0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x73, 0x20, 0x66, 0x72, 0x6F, 0x6D, 0x20, 0x74,
             0x68, 0x65, 0x20, 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69,
             0x74, 0x6F, 0x72, 0x79, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69,
-            0x65, 0x64, 0x20, 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, 0x2E, 0x0A, 0x0A, 0x0A,
+            0x65, 0x64, 0x20, 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, 0x2E, 0x0A, 0x0A,
             0x54, 0x6F, 0x20, 0x64, 0x65, 0x6C, 0x65, 0x74, 0x65, 0x20, 0x61, 0x20, 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, 0x3A, 0x0A,
             0x0A,
             0x2A, 0x20, 0x53, 0x68, 0x75, 0x74, 0x20, 0x64, 0x6F, 0x77, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x50, 0x6F, 0x73, 0x74,
@@ -1015,7 +1015,7 @@ static const unsigned char helpDataPack[] =
             0x43, 0x68, 0x65, 0x63, 0x6B, 0x20, 0x74, 0x68, 0x65, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C,
             0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x5F, 0x6D, 0x6F, 0x64, 0x65, 0x20, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6E,
             0x67, 0x2E,
-        0x78, 0xB9, 0x03, // Description
+        0x78, 0xB8, 0x03, // Description
             0x45, 0x6E, 0x61, 0x62, 0x6C, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x2C, 0x20,
             0x74, 0x68, 0x69, 0x73, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x64, 0x69, 0x73, 0x61, 0x6C, 0x6C, 0x6F, 0x77,
             0x73, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65,
@@ -1030,7 +1030,7 @@ static const unsigned char helpDataPack[] =
             0x44, 0x69, 0x73, 0x61, 0x62, 0x6C, 0x69, 0x6E, 0x67, 0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x69, 0x6E, 0x67, 0x20,
             0x66, 0x72, 0x6F, 0x6D, 0x20, 0x6D, 0x75, 0x6C, 0x74, 0x69, 0x70, 0x6C, 0x65, 0x20, 0x73, 0x6F, 0x75, 0x72, 0x63, 0x65,
             0x73, 0x20, 0x69, 0x73, 0x20, 0x72, 0x65, 0x63, 0x6F, 0x6D, 0x6D, 0x65, 0x6E, 0x64, 0x65, 0x64, 0x20, 0x74, 0x6F, 0x20,
-            0x61, 0x76, 0x6F, 0x69, 0x64, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x6C, 0x69, 0x63, 0x74, 0x73, 0x2E, 0x0A, 0x0A, 0x0A,
+            0x61, 0x76, 0x6F, 0x69, 0x64, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x6C, 0x69, 0x63, 0x74, 0x73, 0x2E, 0x0A, 0x0A,
             0x43, 0x41, 0x55, 0x54, 0x49, 0x4F, 0x4E, 0x3A, 0x20, 0x49, 0x66, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x6F, 0x70, 0x74,
             0x69, 0x6F, 0x6E, 0x20, 0x69, 0x73, 0x20, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6C, 0x65, 0x64, 0x20, 0x74, 0x68, 0x65, 0x6E,
             0x20, 0x69, 0x74, 0x20, 0x69, 0x73, 0x20, 0x63, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6C, 0x20, 0x74, 0x6F, 0x20, 0x65,
@@ -1446,7 +1446,7 @@ static const unsigned char helpDataPack[] =
             0x20, 0x62, 0x65, 0x20, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x6C, 0x65, 0x20, 0x62, 0x75, 0x74, 0x20, 0x63,
             0x61, 0x6E, 0x20, 0x62, 0x65, 0x20, 0x72, 0x65, 0x6D, 0x6F, 0x76, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x74,
             0x68, 0x65, 0x20, 0x64, 0x72, 0x6F, 0x70, 0x20, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x20, 0x63, 0x6F, 0x6D,
-            0x6D, 0x61, 0x6E, 0x64, 0x2E, 0x20, 0x0A,
+            0x6D, 0x61, 0x6E, 0x64, 0x2E, 0x0A, 0x0A,
             0x4E, 0x4F, 0x54, 0x45, 0x3A, 0x20, 0x62, 0x75, 0x69, 0x6C, 0x74, 0x2D, 0x69, 0x6E, 0x20, 0x64, 0x61, 0x74, 0x61, 0x62,
             0x61, 0x73, 0x65, 0x73, 0x20, 0x28, 0x74, 0x65, 0x6D, 0x70, 0x6C, 0x61, 0x74, 0x65, 0x30, 0x2C, 0x20, 0x74, 0x65, 0x6D,
             0x70, 0x6C, 0x61, 0x74, 0x65, 0x31, 0x2C, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x70, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x73,
@@ -1491,7 +1491,7 @@ static const unsigned char helpDataPack[] =
             0x65, 0x20, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x20, 0x63, 0x6C, 0x75, 0x73, 0x74, 0x65, 0x72, 0x20, 0x77,
             0x69, 0x6C, 0x6C, 0x20, 0x6E, 0x6F, 0x74, 0x20, 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x74, 0x65, 0x20, 0x6D, 0x61, 0x6E,
             0x79, 0x20, 0x57, 0x41, 0x4C, 0x20, 0x73, 0x65, 0x67, 0x6D, 0x65, 0x6E, 0x74, 0x73, 0x20, 0x64, 0x75, 0x72, 0x69, 0x6E,
-            0x67, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x29, 0x2E, 0x20, 0x0A,
+            0x67, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x29, 0x2E, 0x0A, 0x0A,
             0x4E, 0x4F, 0x54, 0x45, 0x3A, 0x20, 0x54, 0x68, 0x65, 0x20, 0x64, 0x62, 0x2D, 0x74, 0x69, 0x6D, 0x65, 0x6F, 0x75, 0x74,
             0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x6D, 0x75, 0x73, 0x74, 0x20, 0x62, 0x65, 0x20, 0x6C, 0x65, 0x73, 0x73,
             0x20, 0x74, 0x68, 0x61, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x70, 0x72, 0x6F, 0x74, 0x6F, 0x63, 0x6F, 0x6C, 0x2D, 0x74,
@@ -1548,7 +1548,7 @@ static const unsigned char helpDataPack[] =
         0x78, 0x24, // Summary
             0x45, 0x78, 0x63, 0x6C, 0x75, 0x64, 0x65, 0x20, 0x70, 0x61, 0x74, 0x68, 0x73, 0x2F, 0x66, 0x69, 0x6C, 0x65, 0x73, 0x20,
             0x66, 0x72, 0x6F, 0x6D, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x2E,
-        0x78, 0xD8, 0x09, // Description
+        0x78, 0xD9, 0x09, // Description
             0x41, 0x6C, 0x6C, 0x20, 0x65, 0x78, 0x63, 0x6C, 0x75, 0x73, 0x69, 0x6F, 0x6E, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x72,
             0x65, 0x6C, 0x61, 0x74, 0x69, 0x76, 0x65, 0x20, 0x74, 0x6F, 0x20, 0x24, 0x50, 0x47, 0x44, 0x41, 0x54, 0x41, 0x2E, 0x20,
             0x49, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x65, 0x78, 0x63, 0x6C, 0x75, 0x73, 0x69, 0x6F, 0x6E, 0x20, 0x65, 0x6E, 0x64,
@@ -1588,7 +1588,7 @@ static const unsigned char helpDataPack[] =
             0x6C, 0x69, 0x73, 0x74, 0x20, 0x6F, 0x66, 0x20, 0x65, 0x78, 0x63, 0x6C, 0x75, 0x64, 0x65, 0x64, 0x20, 0x66, 0x69, 0x6C,
             0x65, 0x73, 0x20, 0x74, 0x6F, 0x20, 0x65, 0x6E, 0x73, 0x75, 0x72, 0x65, 0x20, 0x6E, 0x6F, 0x74, 0x68, 0x69, 0x6E, 0x67,
             0x20, 0x75, 0x6E, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64, 0x20, 0x69, 0x73, 0x20, 0x62, 0x65, 0x69, 0x6E, 0x67,
-            0x20, 0x65, 0x78, 0x63, 0x6C, 0x75, 0x64, 0x65, 0x64, 0x2E, 0x0A,
+            0x20, 0x65, 0x78, 0x63, 0x6C, 0x75, 0x64, 0x65, 0x64, 0x2E, 0x0A, 0x0A,
             0x4E, 0x4F, 0x54, 0x45, 0x3A, 0x20, 0x45, 0x78, 0x63, 0x6C, 0x75, 0x73, 0x69, 0x6F, 0x6E, 0x73, 0x20, 0x61, 0x72, 0x65,
             0x20, 0x6E, 0x6F, 0x74, 0x20, 0x68, 0x6F, 0x6E, 0x6F, 0x72, 0x65, 0x64, 0x20, 0x6F, 0x6E, 0x20, 0x64, 0x65, 0x6C, 0x74,
             0x61, 0x20, 0x72, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x73, 0x2E, 0x20, 0x41, 0x6E, 0x79, 0x20, 0x66, 0x69, 0x6C, 0x65,
@@ -2421,13 +2421,13 @@ static const unsigned char helpDataPack[] =
             0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x70, 0x6F, 0x72, 0x74,
             0x20, 0x77, 0x68, 0x65, 0x6E, 0x20, 0x70, 0x67, 0x2D, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x69, 0x73, 0x20, 0x73, 0x65, 0x74,
             0x2E,
-        0x78, 0x6F, // Description
+        0x78, 0x70, // Description
             0x55, 0x73, 0x65, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x74, 0x6F, 0x20, 0x73,
             0x70, 0x65, 0x63, 0x69, 0x66, 0x79, 0x20, 0x61, 0x20, 0x6E, 0x6F, 0x6E, 0x2D, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74,
             0x20, 0x70, 0x6F, 0x72, 0x74, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72,
             0x65, 0x53, 0x51, 0x4C, 0x20, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x70, 0x72, 0x6F, 0x74, 0x6F, 0x63, 0x6F, 0x6C, 0x2E, 0x20,
             0x43, 0x75, 0x72, 0x72, 0x65, 0x6E, 0x74, 0x6C, 0x79, 0x20, 0x6F, 0x6E, 0x6C, 0x79, 0x20, 0x53, 0x53, 0x48, 0x20, 0x69,
-            0x73, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64,
+            0x73, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64, 0x2E,
 
         0x10, // Deprecated names begin
             0x78, 0x0B, // db-ssh-port
@@ -2616,7 +2616,7 @@ static const unsigned char helpDataPack[] =
             0x6C, 0x20, 0x6C, 0x61, 0x79, 0x65, 0x72, 0x2E, 0x20, 0x54, 0x68, 0x69, 0x73, 0x20, 0x70, 0x72, 0x65, 0x76, 0x65, 0x6E,
             0x74, 0x73, 0x20, 0x70, 0x72, 0x6F, 0x63, 0x65, 0x73, 0x73, 0x65, 0x73, 0x20, 0x66, 0x72, 0x6F, 0x6D, 0x20, 0x77, 0x61,
             0x69, 0x74, 0x69, 0x6E, 0x67, 0x20, 0x69, 0x6E, 0x64, 0x65, 0x66, 0x69, 0x6E, 0x69, 0x74, 0x65, 0x6C, 0x79, 0x20, 0x66,
-            0x6F, 0x72, 0x20, 0x61, 0x20, 0x6D, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2E, 0x20, 0x0A,
+            0x6F, 0x72, 0x20, 0x61, 0x20, 0x6D, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2E, 0x0A, 0x0A,
             0x4E, 0x4F, 0x54, 0x45, 0x3A, 0x20, 0x54, 0x68, 0x65, 0x20, 0x70, 0x72, 0x6F, 0x74, 0x6F, 0x63, 0x6F, 0x6C, 0x2D, 0x74,
             0x69, 0x6D, 0x65, 0x6F, 0x75, 0x74, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x6D, 0x75, 0x73, 0x74, 0x20, 0x62,
             0x65, 0x20, 0x67, 0x72, 0x65, 0x61, 0x74, 0x65, 0x72, 0x20, 0x74, 0x68, 0x61, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x64,
@@ -2642,7 +2642,7 @@ static const unsigned char helpDataPack[] =
         0x78, 0x1F, // Summary
             0x53, 0x65, 0x74, 0x20, 0x61, 0x6E, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x69, 0x6E, 0x20, 0x72, 0x65, 0x63,
             0x6F, 0x76, 0x65, 0x72, 0x79, 0x2E, 0x63, 0x6F, 0x6E, 0x66, 0x2E,
-        0x78, 0xC8, 0x05, // Description
+        0x78, 0xC9, 0x05, // Description
             0x53, 0x65, 0x65, 0x20, 0x68, 0x74, 0x74, 0x70, 0x3A, 0x2F, 0x2F, 0x77, 0x77, 0x77, 0x2E, 0x70, 0x6F, 0x73, 0x74, 0x67,
             0x72, 0x65, 0x73, 0x71, 0x6C, 0x2E, 0x6F, 0x72, 0x67, 0x2F, 0x64, 0x6F, 0x63, 0x73, 0x2F, 0x58, 0x2E, 0x58, 0x2F, 0x73,
             0x74, 0x61, 0x74, 0x69, 0x63, 0x2F, 0x72, 0x65, 0x63, 0x6F, 0x76, 0x65, 0x72, 0x79, 0x2D, 0x63, 0x6F, 0x6E, 0x66, 0x69,
@@ -2652,7 +2652,7 @@ static const unsigned char helpDataPack[] =
             0x68, 0x20, 0x79, 0x6F, 0x75, 0x72, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x76, 0x65,
             0x72, 0x73, 0x69, 0x6F, 0x6E, 0x29, 0x2E, 0x20, 0x54, 0x68, 0x69, 0x73, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20,
             0x63, 0x61, 0x6E, 0x20, 0x62, 0x65, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x6D, 0x75, 0x6C, 0x74, 0x69, 0x70, 0x6C, 0x65,
-            0x20, 0x74, 0x69, 0x6D, 0x65, 0x73, 0x2E, 0x0A,
+            0x20, 0x74, 0x69, 0x6D, 0x65, 0x73, 0x2E, 0x0A, 0x0A,
             0x4E, 0x4F, 0x54, 0x45, 0x3A, 0x20, 0x54, 0x68, 0x65, 0x20, 0x72, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x5F, 0x63, 0x6F,
             0x6D, 0x6D, 0x61, 0x6E, 0x64, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x77, 0x69, 0x6C, 0x6C, 0x20, 0x62, 0x65,
             0x20, 0x61, 0x75, 0x74, 0x6F, 0x6D, 0x61, 0x74, 0x69, 0x63, 0x61, 0x6C, 0x6C, 0x79, 0x20, 0x67, 0x65, 0x6E, 0x65, 0x72,
@@ -3105,13 +3105,13 @@ static const unsigned char helpDataPack[] =
             0x52, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x70, 0x6F, 0x72, 0x74,
             0x20, 0x77, 0x68, 0x65, 0x6E, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x2D, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x69, 0x73, 0x20, 0x73,
             0x65, 0x74, 0x2E,
-        0x78, 0x6F, // Description
+        0x78, 0x70, // Description
             0x55, 0x73, 0x65, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x74, 0x6F, 0x20, 0x73,
             0x70, 0x65, 0x63, 0x69, 0x66, 0x79, 0x20, 0x61, 0x20, 0x6E, 0x6F, 0x6E, 0x2D, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74,
             0x20, 0x70, 0x6F, 0x72, 0x74, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69,
             0x74, 0x6F, 0x72, 0x79, 0x20, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x70, 0x72, 0x6F, 0x74, 0x6F, 0x63, 0x6F, 0x6C, 0x2E, 0x20,
             0x43, 0x75, 0x72, 0x72, 0x65, 0x6E, 0x74, 0x6C, 0x79, 0x20, 0x6F, 0x6E, 0x6C, 0x79, 0x20, 0x53, 0x53, 0x48, 0x20, 0x69,
-            0x73, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64,
+            0x73, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64, 0x2E,
 
         0x10, // Deprecated names begin
             0x78, 0x0F, // backup-ssh-port
@@ -3820,7 +3820,7 @@ static const unsigned char helpDataPack[] =
                     0x74, 0x20, 0x61, 0x74, 0x20, 0x6C, 0x65, 0x61, 0x73, 0x74, 0x20, 0x6F, 0x6E, 0x65, 0x20, 0x66, 0x75, 0x6C,
                     0x6C, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x6D, 0x75, 0x73, 0x74, 0x20, 0x72, 0x65, 0x6D, 0x61,
                     0x69, 0x6E, 0x20, 0x69, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F,
-                    0x72, 0x79, 0x2E, 0x20, 0x0A,
+                    0x72, 0x79, 0x2E, 0x0A, 0x0A,
                     0x57, 0x41, 0x52, 0x4E, 0x49, 0x4E, 0x47, 0x3A, 0x20, 0x55, 0x73, 0x65, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20,
                     0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x65, 0x78, 0x74, 0x72, 0x65, 0x6D,
                     0x65, 0x20, 0x63, 0x61, 0x75, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x2D, 0x2D, 0x20, 0x69, 0x74, 0x20, 0x77, 0x69,