diff --git a/doc/xml/release.xml b/doc/xml/release.xml
index d2ccb1a99..f4cada8d2 100644
--- a/doc/xml/release.xml
+++ b/doc/xml/release.xml
@@ -137,6 +137,18 @@
                 </release-refactor-list>
             </release-core-list>
 
+            <release-doc-list>
+                <release-feature-list>
+                    <release-item>
+                        <release-item-contributor-list>
+                            <release-item-contributor id="shang.cynthia"/>
+                        </release-item-contributor-list>
+
+                        <p>Added <br-option>archive-timeout</br-option> option documentation to the user guide.</p>
+                    </release-item>
+                </release-feature-list>
+            </release-doc-list>
+
             <release-test-list>
                 <release-bug-list>
                     <release-item>
diff --git a/doc/xml/user-guide.xml b/doc/xml/user-guide.xml
index def3e533a..4bcdd6e4c 100644
--- a/doc/xml/user-guide.xml
+++ b/doc/xml/user-guide.xml
@@ -400,6 +400,8 @@
                     <exe-cmd>{[db-cluster-wait]}</exe-cmd>
                 </execute>
             </execute-list>
+
+            <p>When archiving a WAL segment is expected to take more than 60 seconds (the default) then the <br-option>archive-timeout</br-option> option should be increased.</p>
         </section>
 
         <!-- SECTION => QUICKSTART - CHECK CONFIGURATION -->
@@ -690,6 +692,13 @@
 
             <p>Note that <id>pg_dump</id> and <id>pg_base_backup</id> do not take online backups so are not affected.  It is safe to run them in conjunction with <backrest/>.</p>
         </section>
+
+        <!-- SECTION => BACKUP - ARCHIVE-TIMEOUT -->
+        <section id="option-archive-timeout">
+            <title>Archive Timeout</title>
+
+            <p>During an online backup, <backrest/> waits for WAL segments that are required to make the backup consistent to be archived. This wait time is governed by the <br-option>archive-timeout</br-option> option which defaults to 60 seconds. If archiving an individual segment is known to take longer, then this option should be increased.</p>
+        </section>
     </section>
 
     <!-- SECTION => RETENTION -->