You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gi...@apache.org on 2024/05/24 08:21:29 UTC

(logging-log4j2) branch 2.x-site-stg-out updated: Add website content generated from `e214a04dbe7d80577148d6e14fe0dad8efe28140`

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch 2.x-site-stg-out
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/2.x-site-stg-out by this push:
     new 5c25736f4a Add website content generated from `e214a04dbe7d80577148d6e14fe0dad8efe28140`
5c25736f4a is described below

commit 5c25736f4ad2f5689fa3686fc6bc92ac2aaf55c8
Author: ASF Logging Services RM <pr...@logging.apache.org>
AuthorDate: Fri May 24 08:21:23 2024 +0000

    Add website content generated from `e214a04dbe7d80577148d6e14fe0dad8efe28140`
---
 404.html                              |   3 +
 5min.html                             | 134 +++---
 articles.html                         |  83 ++--
 development.html                      |  83 ++--
 download.html                         |  83 ++--
 faq.html                              |  83 ++--
 index.html                            | 113 ++---
 javadoc.html                          |  83 ++--
 log4j-1.2-api.html                    |  83 ++--
 log4j-api.html                        |  83 ++--
 log4j-appserver.html                  |  83 ++--
 log4j-cassandra.html                  |  83 ++--
 log4j-couchdb.html                    |  83 ++--
 log4j-docker.html                     |  83 ++--
 log4j-flume-ng.html                   |  83 ++--
 log4j-iostreams.html                  |  83 ++--
 log4j-jakarta-web.html                |  83 ++--
 log4j-jcl.html                        |  83 ++--
 log4j-jmx-gui.html                    |  83 ++--
 log4j-jpl.html                        |  83 ++--
 log4j-jul.html                        |  83 ++--
 log4j-mongodb3.html                   |  83 ++--
 log4j-mongodb4.html                   |  83 ++--
 log4j-slf4j-impl.html                 |  83 ++--
 log4j-slf4j2-impl.html                |  83 ++--
 log4j-spring-boot.html                |  83 ++--
 log4j-spring-cloud-config-client.html |  83 ++--
 log4j-spring-cloud-config.html        |  83 ++--
 log4j-taglib.html                     |  83 ++--
 log4j-to-jul.html                     |  83 ++--
 log4j-to-slf4j.html                   |  83 ++--
 log4j-web.html                        |  83 ++--
 manual/api-separation.html            | 636 --------------------------
 manual/api.html                       | 826 +++++++++++++++++++++++++++-------
 manual/appenders.html                 |  83 ++--
 manual/architecture.html              |  83 ++--
 manual/async.html                     |  83 ++--
 manual/cloud.html                     |  85 ++--
 manual/compatibility.html             |  83 ++--
 manual/configuration.html             |  83 ++--
 manual/customconfig.html              |  85 ++--
 manual/customloglevels.html           | 563 ++++++++---------------
 manual/eventlogging.html              |  95 ++--
 manual/extending.html                 |  85 ++--
 manual/filters.html                   |  83 ++--
 manual/flowtracing.html               |  89 ++--
 manual/garbagefree.html               |  83 ++--
 manual/index.html                     | 113 ++---
 manual/installation.html              |  83 ++--
 manual/jmx.html                       |  86 ++--
 manual/json-template-layout.html      |  83 ++--
 manual/layouts.html                   |  83 ++--
 manual/logbuilder.html                |  85 ++--
 manual/logsep.html                    |  84 ++--
 manual/lookups.html                   |  83 ++--
 manual/markers.html                   |  91 ++--
 manual/messages.html                  | 183 ++++----
 manual/migration.html                 |  91 ++--
 manual/performance.html               |  83 ++--
 manual/plugins.html                   |  86 ++--
 manual/resource-logger.html           |  91 ++--
 manual/scoped-context.html            |  87 ++--
 manual/scripts.html                   |  83 ++--
 manual/systemproperties.html          |  83 ++--
 manual/thread-context.html            |  87 ++--
 manual/usage.html                     | 624 -------------------------
 manual/webapp.html                    |  83 ++--
 plugin-reference.html                 |  85 ++--
 release-notes.html                    |  83 ++--
 runtime-dependencies.html             |  83 ++--
 sitemap.xml                           | 144 +++---
 thanks.html                           |  83 ++--
 72 files changed, 2902 insertions(+), 5650 deletions(-)

diff --git a/404.html b/404.html
index 57a1ecdcc4..a4ccd59dd2 100644
--- a/404.html
+++ b/404.html
@@ -20,6 +20,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
diff --git a/5min.html b/5min.html
index 9c11979893..2087662944 100644
--- a/5min.html
+++ b/5min.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item is-current-page" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
@@ -514,12 +487,9 @@ In addition, we will need the <code>log4j-api</code> dependency itself.</p>
 <h2 id="logging"><a class="anchor" href="#logging"></a>How do I write logs using Log4j?</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>To write logs, you need a <code>Logger</code> instance which you will retrieve from the <code>LogManager</code>.
-The <code>Logger</code> instance is thread-safe and reusable.</p>
-</div>
-<div class="paragraph">
-<p>Second, you can use the <code>Logger</code> instance to write logs by using methods like <code>info()</code>, <code>warn()</code>, <code>error()</code>, etc.
-These methods are named after the log levels they represent, a way to categorize log events by severity.
+<p>To write logs, you need a <a href="../javadoc/log4j-api/org/apache/logging/log4j/Logger.html"><code>Logger</code></a> instance which you will retrieve from the <a href="../javadoc/log4j-api/org/apache/logging/log4j/LogManager.html"><code>LogManager</code></a>.
+You can use the <code>Logger</code> instance to write logs by using methods like <code>info()</code>, <code>warn()</code>, <code>error()</code>, etc.
+These methods are named after the <em>log levels</em> they represent, a way to categorize log events by severity.
 The log message can also contain placeholders written as <code>{}</code> that will be replaced by the arguments passed to the method.</p>
 </div>
 <div class="listingblock">
@@ -543,7 +513,8 @@ public class DbTableService {
 <table>
 <tr>
 <td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>This is a thread-safe, reusable <code>Logger</code> instance.</td>
+<td>The returned <code>Logger</code> instance is thread-safe and reusable.
+Unless explicitly provided as an argument, <code>getLogger()</code> associates the returned <code>Logger</code> with the enclosing class, that is, <code>DbTableService</code> in this example.</td>
 </tr>
 <tr>
 <td><i class="conum" data-value="2"></i><b>2</b></td>
@@ -552,20 +523,24 @@ public class DbTableService {
 </table>
 </div>
 <div class="paragraph">
-<p>The generated <strong>log event</strong> will be enriched with the <strong>log level</strong> (i.e., <code>WARN</code>),
-but also timestamp, class &amp; method name, line number, and several other information.</p>
+<p>The <em>generated</em> <strong>log event</strong>, which contain the <em>user-provided</em> <strong>log message</strong> and <strong>log level</strong> (i.e., <code>WARN</code>), will be enriched with several other implicitly derived contextual information: timestamp, class &amp; method name, line number, etc.</p>
+</div>
+<div class="paragraph">
+<p><strong>What happens to the generated log event will vary significantly depending on the configuration used.</strong>
+It can be pretty-printed to the console, written to a file, or get totally ignored due to insufficient severity or some other filtering.</p>
 </div>
 <div class="paragraph">
-<p>As already mentioned Log levels are used to categorize log events by severity and control the verbosity of the logs.
-Log4j knows various levels, but the most common are <code>DEBUG</code>, <code>INFO</code>, <code>WARN</code>, and <code>ERROR</code>.
+<p>Log levels are used to categorize log events by severity and control the verbosity of the logs.
+Log4j contains various predefined levels, but the most common are <code>DEBUG</code>, <code>INFO</code>, <code>WARN</code>, and <code>ERROR</code>.
 With them, you can filter out less important logs and focus on the most critical ones.
-Previously we used <code>LOGGER.warn()</code> to log a warning message, which could mean that something is not right, but the application can continue.
+Previously we used <code>Logger#warn()</code> to log a warning message, which could mean that something is not right, but the application can continue.
 Log levels have a priority, and <code>WARN</code> is less severe than <code>ERROR</code>.</p>
 </div>
 <div class="paragraph">
 <p>Exceptions are often also errors.
 In this case, we might use the <code>ERROR</code> log level.
-Make sure to log exceptions that have diagnostics value - we can simply pass the exception as the last argument to the log method.</p>
+Make sure to log exceptions that have diagnostics value.
+This is simply done by passing the exception as the last argument to the log method:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -591,13 +566,14 @@ try {
 Log4j will attach the last extra argument of type <code>Throwable</code> in a separate field to the generated log event.</p>
 </div>
 <div class="sect2">
-<h3 id="pitfalls"><a class="anchor" href="#pitfalls"></a>Common pitfalls</h3>
+<h3 id="best-practice"><a class="anchor" href="#best-practice"></a>Best practices</h3>
 <div class="paragraph">
-<p>There are several widespread bad practices.
-Let&#8217;s try to walk through the most common ones.</p>
+<p>There are several widespread bad practices while using Log4j API.
+Below we will walk through the most common ones and see how to fix them.
+For a complete list, refer to <a href="manual/api.html#best-practice" class="xref page">the Log4j API best practices page</a>.</p>
 </div>
 <div class="sect3">
-<h4 id="pitfal-toString"><a class="anchor" href="#pitfal-toString"></a>Don&#8217;t use <code>toString()</code></h4>
+<h4 id="best-practice-toString"><a class="anchor" href="#best-practice-toString"></a>Don&#8217;t use <code>toString()</code></h4>
 <div class="ulist checklist">
 <ul class="checklist">
 <li>
@@ -620,7 +596,7 @@ Let&#8217;s try to walk through the most common ones.</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="pitfall-exception"><a class="anchor" href="#pitfall-exception"></a>Pass exception as the last extra argument</h4>
+<h4 id="best-practice-exception"><a class="anchor" href="#best-practice-exception"></a>Pass exception as the last extra argument</h4>
 <div class="ulist checklist">
 <ul class="checklist">
 <li>
@@ -664,7 +640,7 @@ This bloats the log message with a duplicate exception message.</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="pitfal-concat"><a class="anchor" href="#pitfal-concat"></a>Don&#8217;t use string concatenation</h4>
+<h4 id="best-practice-concat"><a class="anchor" href="#best-practice-concat"></a>Don&#8217;t use string concatenation</h4>
 <div class="paragraph">
 <p>If you are using <code>String</code> concatenation while logging, you are doing something very wrong and dangerous!</p>
 </div>
@@ -697,7 +673,7 @@ Imagine <code>userId</code> being provided by the user with the following conten
 </div>
 </div>
 <div class="sect1">
-<h2 id="basic-log4j-architecture"><a class="anchor" href="#basic-log4j-architecture"></a>Basic Log4j Architecture</h2>
+<h2 id="architecture"><a class="anchor" href="#architecture"></a>Architecture</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>In a nutshell, Log4j operates with two main parts: the API and the Core.
@@ -853,7 +829,7 @@ Finally, the <code>&lt;root&gt;</code> logger defines that log events of level <
                        https://logging.apache.org/xml/ns/log4j-config-2.xsd"&gt;
 
   &lt;appenders&gt;<i class="conum" data-value="1"></i><b>(1)</b>
-    &lt;Console name="console"&gt;<i class="conum" data-value="2"></i><b>(2)</b>
+    &lt;Console name="CONSOLE"&gt;<i class="conum" data-value="2"></i><b>(2)</b>
       &lt;JsonTemplateLayout/&gt;<i class="conum" data-value="3"></i><b>(3)</b>
     &lt;/Console&gt;
   &lt;/appenders&gt;
@@ -861,7 +837,7 @@ Finally, the <code>&lt;root&gt;</code> logger defines that log events of level <
   &lt;loggers&gt;
     &lt;logger name="com.mycompany" level="INFO"/&gt;<i class="conum" data-value="4"></i><b>(4)</b>
     &lt;root level="WARN"&gt;<i class="conum" data-value="5"></i><b>(5)</b>
-      &lt;AppenderRef ref="console"/&gt;<i class="conum" data-value="6"></i><b>(6)</b>
+      &lt;AppenderRef ref="CONSOLE"/&gt;<i class="conum" data-value="6"></i><b>(6)</b>
     &lt;/root&gt;
   &lt;/loggers&gt;
 
@@ -1110,7 +1086,7 @@ which level and the <code>&lt;root&gt;</code> logger serves as a default configu
                        https://logging.apache.org/xml/ns/log4j-config-2.xsd"&gt;
 
   &lt;appenders&gt;
-    &lt;Console name="console"&gt;
+    &lt;Console name="CONSOLE"&gt;
       &lt;PatternLayout pattern="%d [%t] %5p %c{1.} - %m%n"/&gt;<i class="conum" data-value="1"></i><b>(1)</b>
     &lt;/Console&gt;
   &lt;/appenders&gt;
@@ -1118,7 +1094,7 @@ which level and the <code>&lt;root&gt;</code> logger serves as a default configu
   &lt;loggers&gt;
     &lt;logger name="com.mycompany" level="DEBUG"/&gt;<i class="conum" data-value="2"></i><b>(2)</b>
     &lt;root level="WARN"&gt;
-      &lt;AppenderRef ref="console"/&gt;
+      &lt;AppenderRef ref="CONSOLE"/&gt;
     &lt;/root&gt;
   &lt;/loggers&gt;
 
diff --git a/articles.html b/articles.html
index c372c21f4c..bc74d2e0ed 100644
--- a/articles.html
+++ b/articles.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/development.html b/development.html
index 85bfd74d3b..bb49101714 100644
--- a/development.html
+++ b/development.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item is-current-page" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/download.html b/download.html
index e3f7050b3d..c989659363 100644
--- a/download.html
+++ b/download.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/faq.html b/faq.html
index ea815a5218..3ef3a3019d 100644
--- a/faq.html
+++ b/faq.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/index.html b/index.html
index e3bd16cc9b..cf6a0245d8 100644
--- a/index.html
+++ b/index.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
@@ -347,8 +320,7 @@
 <div class="sectionbody">
 <div class="paragraph">
 <p>Apache Log4j is a versatile, industrial-grade Java logging framework composed of an API, its implementation,  and components to assist the deployment for various use cases.
-Log4j is <a href="https://security.googleblog.com/2021/12/apache-log4j-vulnerability.html">used by 8% of the Maven ecosystem</a> and listed as one of <a href="https://docs.google.com/spreadsheets/d/1ONZ4qeMq8xmeCHX03lIgIYE4MEXVfVL6oj05lbuXTDM/edit#gid=1024997528">the top 100 critical open source software projects</a>.
-The project is actively maintained by a <a href="https://logging.apache.org/team-list.html">team</a> of several volunteers and <a href="https://logging.apache.org/support">support</a>ed by a big community.</p>
+The project is actively maintained by a <a href="https://logging.apache.org/team-list.html">team</a> of volunteers and <a href="https://logging.apache.org/support">support</a>ed by a big community.</p>
 </div>
 </div>
 </div>
@@ -404,18 +376,6 @@ The project is actively maintained by a <a href="https://logging.apache.org/team
 </ul>
 </div>
 </dd>
-<dt class="hdlist1">API separation</dt>
-<dd>
-<p>The API for Log4j (i.e., <code>log4j-api</code>) is separate from the implementation (i.e., <code>log4j-core</code>), making it straightforward for application developers which classes and methods to use while ensuring forward compatibility.
-(See <a href="manual/api-separation.html" class="xref page">API Separation</a> for details.)
-The Log4j API also provides the most feature-rich logging facade in the market; support for various <code>Message</code> types (such as <code>Object</code> or <code>Map</code>) besides plain <code>String</code>, lambda expressions, parametrized logging, markers, levels, diagnostic contexts (aka. MDC/NDC), etc.
-Check out the <a href="manual/api.html" class="xref page">Java API</a>, <a href="https://logging.apache.org/log4j/kotlin">Kotlin API</a>, and <a href="https://logging.apache.org/log4j/scala">Scala API</a> pages for further information.</p>
-</dd>
-<dt class="hdlist1">No vendor lock-in</dt>
-<dd>
-<p>Even though Log4j implements the Log4j API at its fullest, users can use another logging backend.
-This can be achieved by either using another backend implementing the Log4j API or forwarding Log4j API calls to another logging facade (e.g., SLF4J) and using a backend for that particular facade.</p>
-</dd>
 <dt class="hdlist1">Reliability</dt>
 <dd>
 <p>Log4j is built with solid reliability in mind.
@@ -424,15 +384,26 @@ It can automatically reload its configuration upon modification and will do so w
 <dt class="hdlist1">Performance</dt>
 <dd>
 <p>When configured correctly, Log4j can deliver excelling performance without almost any burden on the Java garbage collector, and it will do so without sacrificing reliability.
-This is made possible via an asynchronous logger founded on the <a href="https://lmax-exchange.github.io/disruptor/">LMAX Disruptor</a> technology (having its roots in the demanding industry of financial trading) and the garbage-free features baked at hot paths.
 Check out the <a href="manual/performance.html" class="xref page">Performance</a> page for details.</p>
 </dd>
 <dt class="hdlist1">Extensibility</dt>
 <dd>
 <p>Log4j contains a fully-fledged <a href="manual/plugins.html" class="xref page">plugin support</a> that users can leverage to extend functionality.
-You can easily add your components (layouts, appenders, filters, etc.) or customize existing ones (e.g., adding new directives to the <a href="manual/layouts.html#PatternLayout" class="xref page">Pattern</a> or <a href="manual/json-template-layout.html#extending" class="xref page">JSON Template Layout</a>).
+You can easily add your components (layouts, appenders, filters, etc.) or customize existing ones (e.g., adding new directives to <a href="manual/extending.html#PatternConverters" class="xref page">Pattern Layout</a> or <a href="manual/json-template-layout.html#extending" class="xref page">JSON Template Layout</a>).
 Check out the <a href="manual/extending.html" class="xref page">Extending Log4j</a> page.</p>
 </dd>
+<dt class="hdlist1">Powerful API</dt>
+<dd>
+<p>Log4j is a logging system where the API (called Log4j API) and its implementation (called Log4j Core) is distinctly separate from each other.
+<a href="manual/api.html" class="xref page">Log4j API</a> provides the most feature-rich logging facade in the market; support for various <code>Message</code> types (such as <code>Object</code> or <code>Map</code>) besides plain <code>String</code>, lambda expressions, parameterized logging, markers, levels, diagnostic contexts (aka. MDC/NDC), etc.
+Log4j team takes backward compatibility very seriously and makes sure people relying on Log4j API gets a logging facade that is straightforward to use in a correct and future-proof way.
+Check out the <a href="manual/api.html" class="xref page">Java API</a>, <a href="https://logging.apache.org/log4j/kotlin">Kotlin API</a>, and <a href="https://logging.apache.org/log4j/scala">Scala API</a> pages for further information.</p>
+</dd>
+<dt class="hdlist1">No vendor lock-in</dt>
+<dd>
+<p>Log4j API is a generic logging facade for various logging frameworks.
+While Log4j Core implements it at its fullest, you can easily switch to other implementations such as Logback or JUL (<code>java.util.logging</code>).</p>
+</dd>
 </dl>
 </div>
 </div>
diff --git a/javadoc.html b/javadoc.html
index c7125cff10..1b1e0aa210 100644
--- a/javadoc.html
+++ b/javadoc.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/log4j-1.2-api.html b/log4j-1.2-api.html
index 2327dc162c..1a9e7b6b44 100644
--- a/log4j-1.2-api.html
+++ b/log4j-1.2-api.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/log4j-api.html b/log4j-api.html
index fe4265ba59..89e84b6740 100644
--- a/log4j-api.html
+++ b/log4j-api.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/log4j-appserver.html b/log4j-appserver.html
index ff7d5bb03a..bf433f1a5a 100644
--- a/log4j-appserver.html
+++ b/log4j-appserver.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/log4j-cassandra.html b/log4j-cassandra.html
index bd393abd07..53221591b9 100644
--- a/log4j-cassandra.html
+++ b/log4j-cassandra.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/log4j-couchdb.html b/log4j-couchdb.html
index 22808eb77f..1397765a12 100644
--- a/log4j-couchdb.html
+++ b/log4j-couchdb.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/log4j-docker.html b/log4j-docker.html
index 0d315c98a3..19cf4e7acb 100644
--- a/log4j-docker.html
+++ b/log4j-docker.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/log4j-flume-ng.html b/log4j-flume-ng.html
index b57ab27225..56422f6c88 100644
--- a/log4j-flume-ng.html
+++ b/log4j-flume-ng.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/log4j-iostreams.html b/log4j-iostreams.html
index e360fb7dab..1b88b8ec29 100644
--- a/log4j-iostreams.html
+++ b/log4j-iostreams.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/log4j-jakarta-web.html b/log4j-jakarta-web.html
index 95ca0818ee..fa41cd029d 100644
--- a/log4j-jakarta-web.html
+++ b/log4j-jakarta-web.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/log4j-jcl.html b/log4j-jcl.html
index 3ddf81605c..9613509228 100644
--- a/log4j-jcl.html
+++ b/log4j-jcl.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/log4j-jmx-gui.html b/log4j-jmx-gui.html
index 2feb3e87d6..78cecb0566 100644
--- a/log4j-jmx-gui.html
+++ b/log4j-jmx-gui.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/log4j-jpl.html b/log4j-jpl.html
index 3213561e7c..01fff54b31 100644
--- a/log4j-jpl.html
+++ b/log4j-jpl.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/log4j-jul.html b/log4j-jul.html
index 338c730eb8..ee76e1f36c 100644
--- a/log4j-jul.html
+++ b/log4j-jul.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/log4j-mongodb3.html b/log4j-mongodb3.html
index 6206987a71..f1bf1df036 100644
--- a/log4j-mongodb3.html
+++ b/log4j-mongodb3.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/log4j-mongodb4.html b/log4j-mongodb4.html
index 6899cdb2c5..d294528c36 100644
--- a/log4j-mongodb4.html
+++ b/log4j-mongodb4.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/log4j-slf4j-impl.html b/log4j-slf4j-impl.html
index b270af257d..46c2a51759 100644
--- a/log4j-slf4j-impl.html
+++ b/log4j-slf4j-impl.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/log4j-slf4j2-impl.html b/log4j-slf4j2-impl.html
index 16d2f5d6bb..61288f5424 100644
--- a/log4j-slf4j2-impl.html
+++ b/log4j-slf4j2-impl.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/log4j-spring-boot.html b/log4j-spring-boot.html
index ff17855290..a09b1433c0 100644
--- a/log4j-spring-boot.html
+++ b/log4j-spring-boot.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/log4j-spring-cloud-config-client.html b/log4j-spring-cloud-config-client.html
index c42162d63d..1646de2cb9 100644
--- a/log4j-spring-cloud-config-client.html
+++ b/log4j-spring-cloud-config-client.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/log4j-spring-cloud-config.html b/log4j-spring-cloud-config.html
index 304126e3d3..e5e2a3723a 100644
--- a/log4j-spring-cloud-config.html
+++ b/log4j-spring-cloud-config.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/log4j-taglib.html b/log4j-taglib.html
index b54d9a1f5a..4217dc1b32 100644
--- a/log4j-taglib.html
+++ b/log4j-taglib.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/log4j-to-jul.html b/log4j-to-jul.html
index b6acb5f878..45bafc03bc 100644
--- a/log4j-to-jul.html
+++ b/log4j-to-jul.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/log4j-to-slf4j.html b/log4j-to-slf4j.html
index 8d2f5747b8..feba265b68 100644
--- a/log4j-to-slf4j.html
+++ b/log4j-to-slf4j.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/log4j-web.html b/log4j-web.html
index 94a5239233..5c905c81d4 100644
--- a/log4j-web.html
+++ b/log4j-web.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/api.html">Log4j API</a>
+    <a class="nav-link" href="manual/api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="manual/customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="manual/logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/thread-context.html">Thread Context</a>
+    <a class="nav-link" href="manual/flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="manual/eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="manual/resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="manual/filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="manual/scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="manual/jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="manual/extending.html">Extending Log4j</a>
+    <a class="nav-link" href="manual/extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/manual/api-separation.html b/manual/api-separation.html
deleted file mode 100644
index 69cf0daf9a..0000000000
--- a/manual/api-separation.html
+++ /dev/null
@@ -1,636 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width,initial-scale=1">
-    <title>API Separation :: Apache Log4j</title>
-    <link rel="canonical" href="https://logging.apache.org/log4j/2.x/manual/api-separation.html">
-    <meta name="generator" content="Antora 3.2.0-alpha.4">
-<link rel="stylesheet" href="../_/css/site.css">
-<link rel="icon" href="../_/../_images/favicon.ico" type="image/x-icon">
-<!-- `@asciidoctor/tabs` extension styles -->
-<link rel="stylesheet" href="../_/css/vendor/tabs.css">
-<style>
-  /* Default `h4` and `h5` are smaller than the normal text, fix header font sizing: */
-  .doc h1 { font-size: 1.9rem; }
-  .doc h2 { font-size: 1.7rem; }
-  .doc h3 { font-size: 1.5rem; font-weight: 400; }
-  .doc h4 { font-size: 1.3rem; font-weight: 500; }
-  .doc h5 { font-size: 1.1rem; font-weight: 500; text-decoration: underline; }
-  /* Default `code`, `pre`, and `.colist` (source code annotations) fonts are too big, adjust them: */
-  .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
-  .doc pre { font-size: 0.7rem; }
-  .doc .colist { font-size: 0.75rem; }
-  /* Tab header fonts aren't rendered good, adjusting the font weight: */
-  .tablist > ul li { font-weight: 500; }
-  /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
-  .toc .toc-menu li[data-level="4"] a {
-    padding-left: 2.75rem;
-  }
-  /* Replace the default highlight.js color for strings from red (unnecessarily signaling something negative) to green: */
-  .hljs-string {
-    color: #0f8532;
-  }
-</style>
-  </head>
-  <body class="article">
-<header class="header">
-  <nav class="navbar">
-    <div class="navbar-brand">
-      <div class="navbar-item">
-        <img src="../_/../_images/logo-small-white.png" alt="Apache Log4j"/>
-      </div>
-    </div>
-    <div id="topbar-nav" class="navbar-menu">
-      <div class="navbar-end">
-        <a class="navbar-item" href="https://logging.apache.org">a subproject of&nbsp;<strong>Apache Logging Services</strong></a>
-      </div>
-    </div>
-  </nav>
-</header>
-<div class="body">
-<div class="nav-container" data-component="ROOT" data-version="">
-  <aside class="nav">
-    <div class="panels">
-<div class="nav-panel-menu is-active" data-panel="menu">
-  <nav class="nav-menu">
-    <button class="nav-menu-toggle" aria-label="Toggle expand/collapse all" style="display: none"></button>
-    <h3 class="title"><a href="../index.html">Home</a></h3>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../download.html">Download</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../runtime-dependencies.html">Runtime Dependencies</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../release-notes.html">Release Notes</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="https://logging.apache.org/support">Support</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="https://logging.apache.org/security">Security</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../thanks.html">Thanks</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-    <button class="nav-item-toggle"></button>
-    <span class="nav-text">Resources</span>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../faq.html">F.A.Q.</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../5min.html">Log4j explained in 5 minutes</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../development.html">Development</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="index.html">Manual</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="installation.html">Installation</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="architecture.html">Architecture</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="api.html">Log4j API</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="logbuilder.html">Fluent API</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="markers.html">Markers</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="eventlogging.html">Event Logging with Log4j</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="messages.html">Messages</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="thread-context.html">Thread Context</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="resource-logger.html">Resource Logging</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <span class="nav-text">Configuration</span>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="configuration.html">Configuration file</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="json-template-layout.html">JSON Template Layout</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="filters.html">Filters</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="scripts.html">Scripts</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="json-template-layout.html">JSON Template Layout</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="filters.html">Filters</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="extending.html">Extending Log4j</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="plugins.html">Plugins</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="logsep.html">Logging Separation</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="performance.html">Performance</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="async.html">Asynchronous loggers</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="garbagefree.html">Garbage-free logging</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-    <button class="nav-item-toggle"></button>
-    <span class="nav-text">References</span>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../plugin-reference.html">Plugin reference</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../javadoc.html">Java API reference</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-    <button class="nav-item-toggle"></button>
-    <span class="nav-text">Components</span>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../log4j-api.html">Log4j API</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../log4j-1.2-api.html">Log4j 1.2 Bridge</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../log4j-slf4j-impl.html">Log4j SLF4J Binding</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../log4j-jul.html">Log4j JDK Logging Adapter</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../log4j-jpl.html">Log4j JDK Platform Logging Adapter</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../log4j-to-slf4j.html">Log4j to SLF4J Adapter</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../log4j-flume-ng.html">Flume Appender</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../log4j-mongodb3.html">MongoDB 3 appender</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../log4j-mongodb4.html">MongoDB 4 appender</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../log4j-iostreams.html">Log4j IOStreams</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../log4j-docker.html">Log4j Docker Support</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../log4j-spring-cloud-config-client.html">Log4j Spring Cloud Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-    <button class="nav-item-toggle"></button>
-    <span class="nav-text">Related projects</span>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="/log4j/jakarta">Log4j Jakarta EE</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="/log4j/jmx-gui">Log4j JMX GUI</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="/log4j/kotlin">Log4j Kotlin</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="/log4j/scala">Log4j Scala</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="/log4j/tools">Log4j Tools</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="/log4j/transform">Log4j Transformation Tools</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </nav>
-</div>
-    </div>
-  </aside>
-</div>
-<main class="article">
-<div class="toolbar" role="navigation">
-<button class="nav-toggle"></button>
-  <a href="../index.html" class="home-link"></a>
-<nav class="breadcrumbs" aria-label="breadcrumbs">
-  <ul>
-    <li><a href="../index.html">Home</a></li>
-    <li><a href="api-separation.html">API Separation</a></li>
-  </ul>
-</nav>
-<div class="edit-this-page"><a href="https://github.com/apache/logging-log4j2/edit/2.x/src/site/antora/modules/ROOT/pages/manual/api-separation.adoc">Edit this Page</a></div>
-</div>
-  <div class="content">
-<aside class="toc sidebar" data-title="Contents" data-levels="4">
-  <div class="toc-menu"></div>
-</aside>
-<article class="doc">
-<h1 class="page">API Separation</h1>
-<div id="preamble">
-<div class="sectionbody">
-<div class="paragraph">
-<p>When selecting a logging library, some care must be taken in order to ensure that multiple different logging libraries are properly accounted for.
-For example, library code that you depend on may use slf4j, while other libraries may simply use java.util.logging.
-All of these can be routed to the log4j core in order to be logged.</p>
-</div>
-<div class="paragraph">
-<p>If however you want to use a different logging implementation (such as logback), it is possible to route messages from the Log4j API to logback, ensuring that your application is not tied to a specific logging framework.</p>
-</div>
-<div class="paragraph">
-<p>A typical class using the Log4j2 API looks like the following:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-public class Log4j2Test {
-    private static final Logger logger = LogManager.getLogger();
-
-    public Log4j2Test(){
-        logger.info( "Hello World!" );
-    }
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>In order to use the API portion of Log4j2, we only need to provide a single dependency, log4j-api.
-Using Maven, you would add the following to your dependencies:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code class="language-xml hljs" data-lang="xml">&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.logging.log4j&lt;/groupId&gt;
-    &lt;artifactId&gt;log4j-api&lt;/artifactId&gt;
-    &lt;version&gt;2.17.0&lt;/version&gt;
-&lt;/dependency&gt;</code></pre>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_using_log4j2_api_and_core"><a class="anchor" href="#_using_log4j2_api_and_core"></a>Using Log4j2 API and Core</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Using the Log4j2 API and the implementation (Core) together means that log messages will be routed through the Log4j2 Core.
-The Log4j2 core implementation is responsible for the following (note: this is not an exhaustive list):</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Configuration of the system (via an XML file for example)</p>
-</li>
-<li>
-<p>Routing messages to Appenders</p>
-</li>
-<li>
-<p>Opening files and other resources for logging (e.g.
-network sockets)</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The <a href="configuration.html" class="xref page">configuration</a> page in the manual describes the configuration format supported by the Log4j2 core implementation.</p>
-</div>
-<div class="paragraph">
-<p>To use both the API and the core implementation, you would add the following to your dependencies (assuming that you are using Maven):</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code class="language-xml hljs" data-lang="xml">&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.logging.log4j&lt;/groupId&gt;
-    &lt;artifactId&gt;log4j-api&lt;/artifactId&gt;
-    &lt;version&gt;2.17.0&lt;/version&gt;
-&lt;/dependency&gt;
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.logging.log4j&lt;/groupId&gt;
-    &lt;artifactId&gt;log4j-core&lt;/artifactId&gt;
-    &lt;version&gt;2.17.0&lt;/version&gt;
-&lt;/dependency&gt;</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Note that having two different versions of log4j-api and log4j-core on your classpath is not guaranteed to work correctly (e.g., log4j-api version 2.15 and   log4j-core version 2.17 are not guaranteed to work correctly together).</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_using_log4j2_api_with_logback"><a class="anchor" href="#_using_log4j2_api_with_logback"></a>Using Log4j2 API with Logback</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Since the Log4j2 API is generic, we can use it to send messages via SLF4J and then have Logback do the actual logging of the messages.
-This means that you can write your code tied to the Log4j2 API, but users of your code do not need to use the Log4j2 core if they are already using Logback.</p>
-</div>
-<div class="paragraph">
-<p>To switch to using Logback as your logging backend, you will need to add the following to your dependencies (assuming that you are using Maven):</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code class="language-xml hljs" data-lang="xml">&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.logging.log4j&lt;/groupId&gt;
-    &lt;artifactId&gt;log4j-api&lt;/artifactId&gt;
-    &lt;version&gt;2.17.0&lt;/version&gt;
-&lt;/dependency&gt;
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.logging.log4j&lt;/groupId&gt;
-    &lt;artifactId&gt;log4j-to-slf4j&lt;/artifactId&gt;
-    &lt;version&gt;2.17.0&lt;/version&gt;
-&lt;/dependency&gt;
-&lt;dependency&gt;
-      &lt;groupId&gt;ch.qos.logback&lt;/groupId&gt;
-      &lt;artifactId&gt;logback-classic&lt;/artifactId&gt;
-      &lt;version&gt;1.2.10&lt;/version&gt;
-&lt;/dependency&gt;</code></pre>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_using_log4j2_as_an_slf4j_implementation"><a class="anchor" href="#_using_log4j2_as_an_slf4j_implementation"></a>Using Log4j2 as an SLF4J Implementation</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>If you don&#8217;t want to depend on the Log4j2 API and instead want to use SLF4J, that is possible as well.
-Assuming that our code looks like the following:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class Log4j2Test {
-
-    private static final Logger logger = LoggerFactory.getLogger(Log4j2Test.class);
-
-    public Log4j2Test(){
-        logger.info( "Hello World!" );
-    }
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>We can then route the messages to Log4j2 using the log4j-slf4j-impl like the following:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code class="language-xml hljs" data-lang="xml">&lt;dependency&gt;
-    &lt;groupId&gt;org.slf4j&lt;/groupId&gt;
-    &lt;artifactId&gt;slf4j-api&lt;/artifactId&gt;
-    &lt;version&gt;1.7.32&lt;/version&gt;
-&lt;/dependency&gt;
-&lt;dependency&gt;
-      &lt;groupId&gt;org.apache.logging.log4j&lt;/groupId&gt;
-      &lt;artifactId&gt;log4j-slf4j-impl&lt;/artifactId&gt;
-      &lt;version&gt;2.17.0&lt;/version&gt;
-&lt;/dependency&gt;
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.logging.log4j&lt;/groupId&gt;
-    &lt;artifactId&gt;log4j-core&lt;/artifactId&gt;
-    &lt;version&gt;2.17.0&lt;/version&gt;
-&lt;/dependency&gt;</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Note that if we were using SLF4J 1.8 instead of 1.7, that requires us to use log4j-slf4j18-impl instead of log4j-slf4j-impl.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_using_log4j2_with_jul"><a class="anchor" href="#_using_log4j2_with_jul"></a>Using Log4j2 with JUL</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>It is also possible to route messages that are logged using java.util.logging to Log4j2.
-Assuming that the code looks like the following:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">import java.util.logging.Logger;
-
-public class Log4j2Test {
-
-    private static final Logger logger = Logger.getLogger(Log4j2Test.class.getName());
-
-    public Log4j2Test() {
-        logger.info("Hello World!");
-    }
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>We can then also route these messages to the Log4j2 core by adding in the JUL bridge, and setting <code>-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager</code> on the JVM (see the documentation on <a href="../log4j-jul.html" class="xref page">the JUL adapter</a> for more information as to how this works).</p>
-</div>
-<div class="paragraph">
-<p>In order to route these messages to Log4j2, your dependencies would look like the following:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code class="language-xml hljs" data-lang="xml">&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.logging.log4j&lt;/groupId&gt;
-    &lt;artifactId&gt;log4j-jul&lt;/artifactId&gt;
-    &lt;version&gt;2.17.0&lt;/version&gt;
-&lt;/dependency&gt;
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.logging.log4j&lt;/groupId&gt;
-    &lt;artifactId&gt;log4j-core&lt;/artifactId&gt;
-    &lt;version&gt;2.17.0&lt;/version&gt;
-&lt;/dependency&gt;</code></pre>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_using_log4j2_as_a_backend_for_log4j1"><a class="anchor" href="#_using_log4j2_as_a_backend_for_log4j1"></a>Using Log4j2 as a backend for Log4j1</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Some software may still depend on Log4j1, and in some cases it may be infeasible to modify this software to migrate it to Log4j2.</p>
-</div>
-<div class="paragraph">
-<p>However, it may be possible to start using Log4j2 without modifying the application.</p>
-</div>
-<div class="paragraph">
-<p>Assuming that our code looks like the following:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">import org.apache.log4j.Logger;
-
-public class Log4j2Test {
-
-    private static final Logger logger = Logger.getLogger(Log4j2Test.class);
-
-    public Log4j2Test(){
-        logger.info( "Hello World!" );
-    }
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>we can then quickly and easily configure these messages to use Log4j2 as the logging implementation by depending on the <code>log4j-1.2-api</code> bridge, like so:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code class="language-xml hljs" data-lang="xml">&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.logging.log4j&lt;/groupId&gt;
-    &lt;artifactId&gt;log4j-1.2-api&lt;/artifactId&gt;
-    &lt;version&gt;2.17.0&lt;/version&gt;
-&lt;/dependency&gt;
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.logging.log4j&lt;/groupId&gt;
-    &lt;artifactId&gt;log4j-core&lt;/artifactId&gt;
-    &lt;version&gt;2.17.0&lt;/version&gt;
-&lt;/dependency&gt;</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>There are some limitations to this, but it is expected to work for the majority of common cases.
-See the <a href="migration.html" class="xref page">manual page on migration</a> for more information on this feature.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_conclusion"><a class="anchor" href="#_conclusion"></a>Conclusion</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>With the API separation that Log4j2 provides, it is possible to use multiple logging APIs and implementations in the same project.
-This allows for greater flexibility, ensuring that you are not tied to a single API or implementation.</p>
-</div>
-</div>
-</div>
-</article>
-  </div>
-</main>
-</div>
-<footer class="footer">
-  <p>
-    Copyright © 1999-2024 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-    Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache Software License, Version 2.0</a>.
-    Please read our <a href="https://privacy.apache.org/policies/privacy-policy-public.html">privacy policy</a>.
-  </p>
-  <p>
-    Apache, Log4j, and the Apache feather logo are trademarks or registered trademarks of The Apache Software Foundation.
-    Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-    Other names may be trademarks of their respective owners.
-  </p>
-</footer>
-<script id="site-script" src="../_/js/site.js" data-ui-root-path="../_"></script>
-<script async src="../_/js/vendor/highlight.js"></script>
-<!-- `@asciidoctor/tabs` extension scripts -->
-<script async src="../_/js/vendor/tabs.js"></script>
-  </body>
-</html>
diff --git a/manual/api.html b/manual/api.html
index 4173b5edbe..f63b971829 100644
--- a/manual/api.html
+++ b/manual/api.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item is-current-page" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="api.html">Log4j API</a>
+    <a class="nav-link" href="api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="thread-context.html">Thread Context</a>
+    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="extending.html">Extending Log4j</a>
+    <a class="nav-link" href="extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
@@ -333,7 +306,7 @@
   <ul>
     <li><a href="../index.html">Home</a></li>
     <li><a href="index.html">Manual</a></li>
-    <li><a href="api.html">Log4j API</a></li>
+    <li><a href="api.html">API</a></li>
   </ul>
 </nav>
 <div class="edit-this-page"><a href="https://github.com/apache/logging-log4j2/edit/2.x/src/site/antora/modules/ROOT/pages/manual/api.adoc">Edit this Page</a></div>
@@ -344,93 +317,419 @@
 </aside>
 <article class="doc">
 <h1 class="page">Log4j API</h1>
-<div class="sect1">
-<h2 id="_overview"><a class="anchor" href="#_overview"></a>Overview</h2>
+<div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>The Log4j 2 API provides the interface that applications should code to
-and provides the adapter components required for implementers to create
-a logging implementation. Although Log4j 2 is broken up between an API
-and an implementation, the primary purpose of doing so was not to allow
-multiple implementations, although that is certainly possible, but to
-clearly define what classes and methods are safe to use in "normal"
-application code.</p>
+<p>Log4j is essentially composed of a logging API called <strong>Log4j API</strong>, and its reference implementation called <strong>Log4j Core</strong>.</p>
+</div>
+<details>
+<summary class="title">What is a logging API and a logging implementation?</summary>
+<div class="content">
+<div class="dlist">
+<dl>
+<dt class="hdlist1">Logging APIs</dt>
+<dd>
+<p>A logging API is an interface your code or your dependencies directly logs against.
+It is implementation agnostic.
+Log4j API, <a href="https://www.slf4j.org/">SLF4J</a>, <a href="https://docs.oracle.com/en/java/javase/8/core/java-logging-overview.html">JUL (Java Logging)</a>, <a href="https://commons.apache.org/proper/commons-logging/">JCL (Apache Commons Logging)</a>, <a href="https://openjdk.org/jeps/264">JPL (Java Platform Logging)</a> and <a href="https://github.com/jboss-logging/jboss-logging">JBoss Logging</a> are major logging APIs.</p>
+</dd>
+<dt class="hdlist1">Logging implementation</dt>
+<dd>
+<p>A logging implementation is only required at runtime and can be changed without the need to recompile your software.
+Log4j Core, <a href="https://docs.oracle.com/en/java/javase/8/core/java-logging-overview.html">JUL (Java Logging)</a>, <a href="https://logback.qos.ch/">Logback</a> are the most well-known logging implementations.</p>
+</dd>
+</dl>
+</div>
+</div>
+</details>
+<div class="admonitionblock tip">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-tip" title="Tip"></i>
+</td>
+<td class="content">
+<div class="paragraph">
+<p>Are you looking for a crash course on how to use Log4j in your application or library?
+See <a href="../5min.html" class="xref page">Log4j explained in 5 minutes</a>.
+You can also check out <a href="installation.html" class="xref page">Installation</a> for the complete installation instructions.</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
+<p>Log4j API provides</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>A logging API that libraries and applications can code to</p>
+</li>
+<li>
+<p>Adapter components to create a logging implementation</p>
+</li>
+</ul>
 </div>
-<div class="sect2">
-<h3 id="_hello_world"><a class="anchor" href="#_hello_world"></a>Hello World!</h3>
 <div class="paragraph">
-<p>No introduction would be complete without the customary Hello, World
-example. Here is ours. First, a Logger with the name "HelloWorld" is
-obtained from the
-<a href="../javadoc/log4j-api/org/apache/logging/log4j/LogManager.html"><code>LogManager</code></a>.
-Next, the logger is used to write the "Hello, World!" message, however
-the message will be written only if the Logger is configured to allow
-informational messages.</p>
+<p>This page tries to cover the most prominent Log4j API features that libraries and applications can code to.</p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_introduction"><a class="anchor" href="#_introduction"></a>Introduction</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>To write logs, you need a <a href="../javadoc/log4j-api/org/apache/logging/log4j/Logger.html"><code>Logger</code></a> instance which you will retrieve from the <a href="../javadoc/log4j-api/org/apache/logging/log4j/LogManager.html"><code>LogManager</code></a>.
+You can use the <code>Logger</code> instance to write logs by using methods like <code>info()</code>, <code>warn()</code>, <code>error()</code>, etc.
+These methods are named after the <em>log levels</em> they represent, a way to categorize log events by severity.
+The log message can also contain placeholders written as <code>{}</code> that will be replaced by the arguments passed to the method.</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+
+public class DbTableService {
+
+    private static final Logger LOGGER = LogManager.getLogger(); <i class="conum" data-value="1"></i><b>(1)</b>
 
-public class HelloWorld {
-    private static final Logger logger = LogManager.getLogger("HelloWorld");
-    public static void main(String[] args) {
-        logger.info("Hello, World!");
+    public void truncateTable(String tableName) throws IOException {
+        LOGGER.warn("truncating table `{}`", tableName); <i class="conum" data-value="2"></i><b>(2)</b>
+        db.truncate(tableName);
     }
+
 }</code></pre>
 </div>
 </div>
+<div class="colist arabic">
+<table>
+<tr>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>The returned <code>Logger</code> instance is thread-safe and reusable.
+Unless explicitly provided as an argument, <code>getLogger()</code> associates the returned <code>Logger</code> with the enclosing class, that is, <code>DbTableService</code> in this example.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="2"></i><b>2</b></td>
+<td>The placeholder <code>{}</code> in the message will be replaced with the value of <code>tableName</code></td>
+</tr>
+</table>
+</div>
 <div class="paragraph">
-<p>The output from the call to <code>logger.info()</code> will vary significantly
-depending on the configuration used. See the
-<a href="configuration.html" class="xref page">Configuration</a> section for more details.</p>
+<p>The <em>generated</em> <strong>log event</strong>, which contain the <em>user-provided</em> <strong>log message</strong> and <strong>log level</strong> (i.e., <code>WARN</code>), will be enriched with several other implicitly derived contextual information: timestamp, class &amp; method name, line number, etc.</p>
 </div>
+<div class="paragraph">
+<p><strong>What happens to the generated log event will vary significantly depending on the configuration used.</strong>
+It can be pretty-printed to the console, written to a file, or get totally ignored due to insufficient severity or some other filtering.</p>
 </div>
-<div class="sect2">
-<h3 id="_substituting_parameters"><a class="anchor" href="#_substituting_parameters"></a>Substituting Parameters</h3>
 <div class="paragraph">
-<p>Frequently the purpose of logging is to provide information about what
-is happening in the system, which requires including information about
-the objects being manipulated. In Log4j 1.x this could be accomplished
-by doing:</p>
+<p>Log levels are used to categorize log events by severity and control the verbosity of the logs.
+Log4j contains various predefined levels, but the most common are <code>DEBUG</code>, <code>INFO</code>, <code>WARN</code>, and <code>ERROR</code>.
+With them, you can filter out less important logs and focus on the most critical ones.
+Previously we used <code>Logger#warn()</code> to log a warning message, which could mean that something is not right, but the application can continue.
+Log levels have a priority, and <code>WARN</code> is less severe than <code>ERROR</code>.</p>
+</div>
+<div class="paragraph">
+<p>Exceptions are often also errors.
+In this case, we might use the <code>ERROR</code> log level.
+Make sure to log exceptions that have diagnostics value.
+This is simply done by passing the exception as the last argument to the log method:</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">if (logger.isDebugEnabled()) {
-    logger.debug("Logging in user " + user.getName() + " with birthday " + user.getBirthdayCalendar());
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">LOGGER.warn("truncating table `{}`", tableName);
+try {
+    db.truncate(tableName);
+} catch (IOException exception) {
+    LOGGER.error("failed truncating table `{}`", tableName, exception); <i class="conum" data-value="1"></i><b>(1)</b>
+    throw new IOException("failed truncating table: " + tableName, exception);
 }</code></pre>
 </div>
 </div>
+<div class="colist arabic">
+<table>
+<tr>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>By using <code>error()</code> instead of <code>warn()</code>, we signal that the operation failed.</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
+<p>While there is only one placeholder in the message, we pass two arguments: <code>tableName</code> and <code>exception</code>.
+Log4j will attach the last extra argument of type <code>Throwable</code> in a separate field to the generated log event.</p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="best-practice"><a class="anchor" href="#best-practice"></a>Best practices</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>There are several widespread bad practices while using Log4j API.
+Let&#8217;s try to walk through the most common ones and see how to fix them.</p>
+</div>
+<div class="sect2">
+<h3 id="best-practice-toString"><a class="anchor" href="#best-practice-toString"></a>Don&#8217;t use <code>toString()</code></h3>
+<div class="ulist checklist">
+<ul class="checklist">
+<li>
+<p><i class="fa fa-square-o"></i> Don&#8217;t use <code>Object#toString()</code> in arguments, it is redundant!</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">/* BAD! */ LOGGER.info("userId: {}", userId.toString());</code></pre>
+</div>
+</div>
+</li>
+<li>
+<p><i class="fa fa-check-square-o"></i> Underlying message type and layout will deal with arguments:</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">/* GOOD */ LOGGER.info("userId: {}", userId);</code></pre>
+</div>
+</div>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="best-practice-exception"><a class="anchor" href="#best-practice-exception"></a>Pass exception as the last extra argument</h3>
+<div class="ulist checklist">
+<ul class="checklist">
+<li>
+<p><i class="fa fa-square-o"></i> Don&#8217;t call <code>Throwable#printStackTrace()</code>!
+This not only circumvents the logging but can also leak sensitive information!</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">/* BAD! */ exception.printStackTrace();</code></pre>
+</div>
+</div>
+</li>
+<li>
+<p><i class="fa fa-square-o"></i> Don&#8217;t use <code>Throwable#getMessage()</code>!
+This prevents the log event from getting enriched with the exception.</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">/* BAD! */ LOGGER.info("failed", exception.getMessage());
+/* BAD! */ LOGGER.info("failed for user ID `{}`: {}", userId, exception.getMessage());</code></pre>
+</div>
+</div>
+</li>
+<li>
+<p><i class="fa fa-square-o"></i> Don&#8217;t provide both <code>Throwable#getMessage()</code> and <code>Throwable</code> itself!
+This bloats the log message with a duplicate exception message.</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">/* BAD! */ LOGGER.info("failed for user ID `{}`: {}", userId, exception.getMessage(), exception);</code></pre>
+</div>
+</div>
+</li>
+<li>
+<p><i class="fa fa-check-square-o"></i> Pass exception as the last extra argument:</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">/* GOOD */ LOGGER.error("failed", exception);
+/* GOOD */ LOGGER.error("failed for user ID `{}`", userId, exception);</code></pre>
+</div>
+</div>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="best-practice-concat"><a class="anchor" href="#best-practice-concat"></a>Don&#8217;t use string concatenation</h3>
+<div class="paragraph">
+<p>If you are using <code>String</code> concatenation while logging, you are doing something very wrong and dangerous!</p>
+</div>
+<div class="ulist checklist">
+<ul class="checklist">
+<li>
+<p><i class="fa fa-square-o"></i> Don&#8217;t use <code>String</code> concatenation to format arguments!
+This circumvents the handling of arguments by message type and layout.
+More importantly, <strong>this approach is prone to attacks!</strong>
+Imagine <code>userId</code> being provided by the user with the following content:
+<code>placeholders for non-existing args to trigger failure: {} {} {dangerousLookup}</code></p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">/* BAD! */ LOGGER.info("failed for user ID: " + userId);</code></pre>
+</div>
+</div>
+</li>
+<li>
+<p><i class="fa fa-check-square-o"></i> Use message parameters</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">/* GOOD */ LOGGER.info("failed for user ID `{}`", userId);</code></pre>
+</div>
+</div>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="best-practice-supplier"><a class="anchor" href="#best-practice-supplier"></a>Use <code>Supplier</code>s to pass computationally expensive arguments</h3>
+<div class="paragraph">
+<p>If one or more arguments of the log statement are computationally expensive, it is not wise to evaluate them knowing that their results can be discarded.
+Consider the following example:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">/* BAD! */ LOGGER.info("failed for user ID `{}` and role `{}`", userId, db.findUserRoleById(userId));</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The database query (i.e., <code>db.findUserNameById(userId)</code>) can be a significant bottleneck if the created the log event will be discarded anyway – maybe the <code>INFO</code> level is not accepted for this logger, or due to some other filtering.</p>
+</div>
+<div class="ulist checklist">
+<ul class="checklist">
+<li>
+<p><i class="fa fa-square-o"></i> The old-school way of solving this problem is to level-guard the log statement:</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">/* OKAY */ if (LOGGER.isInfoEnabled()) { LOGGER.info(...); }</code></pre>
+</div>
+</div>
 <div class="paragraph">
-<p>Doing this repeatedly has the effect of making the code feel like it is
-more about logging than the actual task at hand. In addition, it results
-in the logging level being checked twice; once on the call to
-isDebugEnabled and once on the debug method. A better alternative would
-be:</p>
+<p>While this would work for cases where the message can be dropped due to insufficient level, this approach is still prone to other filtering cases; e.g., maybe the associated <a href="markers.html" class="xref page">marker</a> is not accepted.</p>
 </div>
+</li>
+<li>
+<p><i class="fa fa-check-square-o"></i> Use <code>Supplier</code>s to pass arguments containing computationally expensive items:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">logger.debug("Logging in user {} with birthday {}", user.getName(), user.getBirthdayCalendar());</code></pre>
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">/* GOOD */ LOGGER.info("failed for user ID `{}` and role `{}`", () -&gt; userId, () -&gt; db.findUserRoleById(userId));</code></pre>
+</div>
+</div>
+</li>
+<li>
+<p><i class="fa fa-check-square-o"></i> Use a <code>Supplier</code> to pass the message and its arguments containing computationally expensive items:</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">/* GOOD */ LOGGER.info(() -&gt; new ParameterizedMessage("failed for user ID `{}` and role `{}`", userId, db.findUserRoleById(userId)));</code></pre>
+</div>
 </div>
+</li>
+</ul>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="loggers"><a class="anchor" href="#loggers"></a>Loggers</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p><a href="../javadoc/log4j-api/org/apache/logging/log4j/Logger.html"><code>Logger</code></a>s obtained using <a href="../javadoc/log4j-api/org/apache/logging/log4j/LogManager.html"><code>LogManager</code></a> is the primary entry point for logging.
+In this section we will introduce you to further details about <code>Logger</code>s.</p>
 </div>
+<div class="sect2">
+<h3 id="logger-names"><a class="anchor" href="#logger-names"></a>Logger names</h3>
 <div class="paragraph">
-<p>With the code above the logging level will only be checked once and the
-String construction will only occur when debug logging is enabled.</p>
+<p>Most logging implementations use a hierarchical scheme for matching logger names with logging configuration.
+In this scheme, the logger name hierarchy is represented by <code>.</code> (dot) characters in the logger name, in a fashion very similar to the hierarchy used for Java package names.
+For example, <code>org.apache.logging.appender</code> and <code>org.apache.logging.filter</code> both have <code>org.apache.logging</code> as their parent.</p>
+</div>
+<div class="paragraph">
+<p>In most cases, applications name their loggers by passing the current class&#8217;s name to <code>LogManager.getLogger(&#8230;&#8203;)</code>.
+Because this usage is so common, Log4j provides that as the default when the logger name parameter is either omitted or is null.
+For example, all <code>Logger</code>-typed variables below will have a name of <code>com.mycompany.LoggerNameTest</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">package com.mycompany;
+
+public class LoggerNameTest {
+
+    Logger logger1 = LogManager.getLogger(LoggerNameTest.class);
+
+    Logger logger2 = LogManager.getLogger(LoggerNameTest.class.getName());
+
+    Logger logger3 = LogManager.getLogger();
+
+}</code></pre>
+</div>
+</div>
+<div class="admonitionblock tip">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-tip" title="Tip"></i>
+</td>
+<td class="content">
+<div class="paragraph">
+<p><strong>We suggest you to use <code>LogManager.getLogger()</code> without any arguments</strong> since it delivers the same functionality with less characters and is not prone to copy-paste errors.</p>
+</div>
+</td>
+</tr>
+</table>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_formatting_parameters"><a class="anchor" href="#_formatting_parameters"></a>Formatting Parameters</h3>
+<h3 id="logger-message-factories"><a class="anchor" href="#logger-message-factories"></a>Logger message factories</h3>
 <div class="paragraph">
-<p>Formatter Loggers leave formatting up to you if <code>toString()</code> is not what
-you want. To facilitate formatting, you can use the same format strings
-as Java&#8217;s
-<a href="http://docs.oracle.com/javase/6/docs/api/java/util/Formatter.html#syntax"><code>Formatter</code></a>.
-For example:</p>
+<p>Loggers translate</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">public static Logger logger = LogManager.getFormatterLogger("Foo");
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">LOGGER.info("Hello, {}!", name)</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>calls to the appropriate canonical logging method:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">LOGGER.log(Level.INFO, messageFactory.createMessage("Hello, {}!", new Object[]{name}));</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Note that how <code>Hello, {}!</code> should be encoded given the <code>{name}</code> array as argument completely depends on the <a href="../javadoc/log4j-api/org/apache/logging/log4j/message/MessageFactory.html"><code>MessageFactory</code></a> employed.
+Log4j allows users to customize this behaviour in several <code>getLogger()</code> methods of <a href="../javadoc/log4j-api/org/apache/logging/log4j/LogManager.html"><code>LogManager</code></a>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">LogManager
+        .getLogger() <i class="conum" data-value="1"></i><b>(1)</b>
+        .info("Hello, {}!", name); <i class="conum" data-value="2"></i><b>(2)</b>
 
+LogManager
+        .getLogger(StringFormatterMessageFactory.INSTANCE) <i class="conum" data-value="3"></i><b>(3)</b>
+        .info("Hello, %s!", name); <i class="conum" data-value="4"></i><b>(4)</b></code></pre>
+</div>
+</div>
+<div class="colist arabic">
+<table>
+<tr>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>Create a logger using the default message factory</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="2"></i><b>2</b></td>
+<td>Use default parameter placeholders, that is, <code>{}</code> style</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="3"></i><b>3</b></td>
+<td>Explicitly provide the message factory, that is, <a href="../javadoc/log4j-api/org/apache/logging/log4j/message/StringFormatterMessageFactory.html"><code>StringFormatterMessageFactory</code></a>.
+Note that there are several other <code>getLogger()</code> methods accepting a <code>MessageFactory</code>.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="4"></i><b>4</b></td>
+<td>Note the placeholder change from <code>{}</code> to <code>%s</code>!
+Passed <code>Hello, %s!</code> and <code>name</code> arguments will be implicitly translated to a <code>String.format("Hello, %s!", name)</code> call due to the employed <code>StringFormatterMessageFactory</code>.</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
+<p>Log4j bundles several <a href="messages.html" class="xref page">predefined message factories</a>.
+Some common ones are accessible through convenient factory methods, which we will cover below.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="formatter-logger"><a class="anchor" href="#formatter-logger"></a>Formatter logger</h3>
+<div class="paragraph">
+<p>The <code>Logger</code> instance returned by default replaces the occurrences of <code>{}</code> placeholders with the <code>toString()</code> output of the associated parameter.
+If you need more control over how the parameters are formatted, you can also use the <a href="http://docs.oracle.com/javase/6/docs/api/java/util/Formatter.html#syntax"><code>java.util.Formatter</code></a> format strings by obtaining your <code>Logger</code> using <a href="../javadoc/log4j-api/org/apache/logging/log4j/LogManager.html#getFormatterLogger(java.lang.Class)"><code>LogManager#getFormatterLogger()</code></a>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">Logger logger = LogManager.getFormatterLogger();
 logger.debug("Logging in user %s with birthday %s", user.getName(), user.getBirthdayCalendar());
 logger.debug("Logging in user %1$s with birthday %2$tm %2$te,%2$tY", user.getName(), user.getBirthdayCalendar());
 logger.debug("Integer.MAX_VALUE = %,d", Integer.MAX_VALUE);
@@ -438,113 +737,306 @@ logger.debug("Long.MAX_VALUE = %,d", Long.MAX_VALUE);</code></pre>
 </div>
 </div>
 <div class="paragraph">
-<p>To use a formatter Logger, you must call one of the <code>LogManager</code>
-<a href="../javadoc/log4j-api/org/apache/logging/log4j/LogManager.html#getFormatterLogger(java.lang.Class)"><code>getFormatterLogger</code></a>
-methods. The output for this example shows that <code>Calendar::toString</code> is
-verbose compared to custom formatting:</p>
+<p>Loggers returned by <code>getFormatterLogger()</code> are referred as <strong>formatter loggers</strong>.</p>
+</div>
+<div class="sect3">
+<h4 id="printf"><a class="anchor" href="#printf"></a><code>printf()</code> method</h4>
+<div class="paragraph">
+<p>Formatter loggers give fine-grained control over the output format, but have the drawback that the correct type must be specified.
+For example, passing anything other than a decimal integer for a <code>%d</code> format parameter gives an exception.
+If your main usage is to use <code>{}</code>-style parameters, but occasionally you need fine-grained control over the output format, you can use the <code>Logger#printf()</code> method:</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">2012-12-12 11:56:19,633 [main] DEBUG: User John Smith with birthday java.util.GregorianCalendar[time=?,areFieldsSet=false,areAllFieldsSet=false,lenient=true,zone=sun.util.calendar.ZoneInfo[id="America/New_York",offset=-18000000,dstSavings=3600000,useDaylight=true,transitions=235,lastRule=java.util.SimpleTimeZone[id=America/New_York,offset=-18000000,dstSavings=3600000,useDaylight=true,startYear=0,startMod [...]
-2012-12-12 11:56:19,643 [main] DEBUG: User John Smith with birthday 05 23, 1995
-2012-12-12 11:56:19,643 [main] DEBUG: Integer.MAX_VALUE = 2,147,483,647
-2012-12-12 11:56:19,643 [main] DEBUG: Long.MAX_VALUE = 9,223,372,036,854,775,807</code></pre>
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">Logger logger = LogManager.getLogger("Foo");
+logger.debug("Opening connection to {}...", someDataSource);
+logger.printf(Level.INFO, "Hello, %s!", userName);</code></pre>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="formatter-perf"><a class="anchor" href="#formatter-perf"></a>Formatter performance</h4>
+<div class="paragraph">
+<p>Keep in mind that, contrary to the formatter logger, the default Log4j logger (i.e., <code>{}</code>-style parameters) is heavily optimized for several use cases and can operate <a href="garbagefree.html" class="xref page">garbage-free</a> when configured correctly.
+You might reconsider your formatter logger usages for latency sensitive applications.</p>
 </div>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_mixing_loggers_with_formatter_loggers"><a class="anchor" href="#_mixing_loggers_with_formatter_loggers"></a>Mixing Loggers with Formatter Loggers</h3>
+<h3 id="resource-logger"><a class="anchor" href="#resource-logger"></a>Resource logger</h3>
+<div class="paragraph">
+<p>Resource loggers, introduced in Log4j API <code>2.24.0</code>, is a special kind of <code>Logger</code> that:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>is a regular class member variable that will be garbage collected along with the class instance</p>
+</li>
+<li>
+<p>enriches generated log events with data associated with the resource (i.e., the class instance)</p>
+</li>
+</ul>
+</div>
 <div class="paragraph">
-<p>Formatter loggers give fine-grained control over the output format, but
-have the drawback that the correct type must be specified (for example,
-passing anything other than a decimal integer for a %d format parameter
-gives an exception).</p>
+<p><a href="resource-logger.html" class="xref page">Read more on resource loggers&#8230;&#8203;</a></p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="event-logger"><a class="anchor" href="#event-logger"></a>Event logger</h3>
+<div class="paragraph">
+<p><a href="../javadoc/log4j-api/org/apache/logging/log4j/LogManager.html"><code>EventLogger</code></a> provides a simple way to log structured events conforming with the <code>STRCUTURED-DATA</code> format defined in <a href="https://tools.ietf.org/html/rfc5424">RFC 5424 (The Syslog Protocol)</a>.</p>
+</div>
+<div class="paragraph">
+<p><a href="eventlogging.html" class="xref page">Read more on event loggers&#8230;&#8203;</a></p>
+</div>
+</div>
+</div>
 </div>
+<div class="sect1">
+<h2 id="feature-fluent-api"><a class="anchor" href="#feature-fluent-api"></a>Fluent API</h2>
+<div class="sectionbody">
 <div class="paragraph">
-<p>If your main usage is to use \{}-style parameters, but occasionally you
-need fine-grained control over the output format, you can use the
-<code>printf</code> method:</p>
+<p>The fluent API allows you to log using a fluent interface:</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">public static Logger logger = LogManager.getLogger("Foo");
-
-logger.debug("Opening connection to {}...", someDataSource);
-logger.printf(Level.INFO, "Logging in user %1$s with birthday %2$tm %2$te,%2$tY", user.getName(), user.getBirthdayCalendar());</code></pre>
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">logger.atInfo()
+      .withMarker(marker)
+      .withLocation()
+      .withThrowable(exception)
+      .log("Login for user `{}` failed", userId);</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p><a href="logbuilder.html" class="xref page">Read more on the Fluent API&#8230;&#8203;</a></p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="fish-tagging"><a class="anchor" href="#fish-tagging"></a>Fish tagging</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Just as a fish can be tagged and have its movement tracked (aka. <em>fish tagging</em>), stamping log events with a common tag or set of data
+elements allows the complete flow of a transaction or a request to be tracked.
+You can use them for several purposes, such as:</p>
 </div>
+<div class="ulist">
+<ul>
+<li>
+<p>Provide extra information while serializing the log event</p>
+</li>
+<li>
+<p>Allow filtering of information so that it does not overwhelm the system or the individuals who need to make use of it</p>
+</li>
+</ul>
 </div>
+<div class="paragraph">
+<p>Log4j provides fish tagging in several flavors:</p>
 </div>
 <div class="sect2">
-<h3 id="LambdaSupport"><a class="anchor" href="#LambdaSupport"></a>Java 8 lambda support for lazy logging</h3>
+<h3 id="levels"><a class="anchor" href="#levels"></a>Levels</h3>
 <div class="paragraph">
-<p>In release 2.4, the <code>Logger</code> interface added support for lambda
-expressions. This allows client code to lazily log messages without
-explicitly checking if the requested log level is enabled. For example,
-previously you would write:</p>
+<p>Log levels are used to categorize log events by severity.
+Log4j contains predefined levels, of which the most common are <code>DEBUG</code>, <code>INFO</code>, <code>WARN</code>, and <code>ERROR</code>.
+Log4j also allows you to introduce your own custom levels too.</p>
+</div>
+<div class="paragraph">
+<p><a href="customloglevels.html" class="xref page">Read more on custom levels&#8230;&#8203;</a></p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="markers"><a class="anchor" href="#markers"></a>Markers</h3>
+<div class="paragraph">
+<p>Markers are programmatic labels developers can associate to log statements:</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">// pre-Java 8 style optimization: explicitly check the log level
-// to make sure the expensiveOperation() method is only called if necessary
-if (logger.isTraceEnabled()) {
-    logger.trace("Some long-running operation returned {}", expensiveOperation());
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">public class MyApp {
+
+    private static final Logger LOGGER = LogManager.getLogger();
+
+    private static final Marker ACCOUNT_MARKER = MarkerManager.getMarker("ACCOUNT");
+
+    public void removeUser(String userId) {
+        logger.debug(ACCOUNT_MARKER, "Removing user with ID `{}`", userId);
+        // ...
+    }
+
 }</code></pre>
 </div>
 </div>
 <div class="paragraph">
-<p>With Java 8 you can achieve the same effect with a lambda expression.
-You no longer need to explicitly check the log level:</p>
+<p><a href="markers.html" class="xref page">Read more on markers&#8230;&#8203;</a></p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="scoped-context"><a class="anchor" href="#scoped-context"></a>Scoped Context</h3>
+<div class="paragraph">
+<p>Just like a <a href="https://docs.oracle.com/en/java/javase/22/docs/api/java.base/java/lang/ScopedValue.html">Java&#8217;s <code>ScopedValue</code></a>, in Scoped Context, the visibility of tags are associated with the block they were introduced:</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">// Java-8 style optimization: no need to explicitly check the log level:
-// the lambda expression is not evaluated if the TRACE level is not enabled
-logger.trace("Some long-running operation returned {}", () -&gt; expensiveOperation());</code></pre>
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">private class Worker implements Runnable {
+
+    private static final Logger LOGGER = LogManager.getLogger();
+
+    public void authUser(Request request, Session session) {
+         // ... <i class="conum" data-value="3"></i><b>(3)</b>
+        ScopedContext
+                .where("ipAddress", request.getRemoteAddr()) <i class="conum" data-value="1"></i><b>(1)</b>
+                .where("hostName", request.getServerName()) <i class="conum" data-value="1"></i><b>(1)</b>
+                .where("loginId", session.getAttribute("loginId")) <i class="conum" data-value="1"></i><b>(1)</b>
+                .run(() -&gt; { <i class="conum" data-value="2"></i><b>(2)</b>
+                    LOGGER.debug("Authenticating user");
+                    // ...
+                });
+         // ... <i class="conum" data-value="3"></i><b>(3)</b>
+    }
+
+}</code></pre>
 </div>
 </div>
+<div class="colist arabic">
+<table>
+<tr>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>Associating properties such that they will only be visible to Log4j <strong>within the scope of the <code>run()</code> method</strong>.
+These properties can later on be used to, for instance, filter the log event, provide extra information in the layout, etc.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="2"></i><b>2</b></td>
+<td>The block determining the visibility scope of the provided properties.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="3"></i><b>3</b></td>
+<td>Outside the scope of the <code>run()</code> method provided properties will not be visible.</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
+<p><a href="scoped-context.html" class="xref page">Read more on Scoped Context&#8230;&#8203;</a></p>
+</div>
 </div>
 <div class="sect2">
-<h3 id="logger-names"><a class="anchor" href="#logger-names"></a>Logger Names</h3>
-<div class="paragraph">
-<p>Most logging implementations use a hierarchical scheme for matching
-logger names with logging configuration. In this scheme, the logger name
-hierarchy is represented by <code>'.'</code> characters in the logger name, in a
-fashion very similar to the hierarchy used for Java package names. For
-example, <code>org.apache.logging.appender</code> and <code>org.apache.logging.filter</code>
-both have <code>org.apache.logging</code> as their parent. In most cases,
-applications name their loggers by passing the current class&#8217;s name to
-<code>LogManager.getLogger(&#8230;&#8203;)</code>. Because this usage is so common, Log4j 2
-provides that as the default when the logger name parameter is either
-omitted or is null. For example, in all examples below the Logger will
-have a name of <code>"org.apache.test.MyTest"</code>.</p>
+<h3 id="thread-context"><a class="anchor" href="#thread-context"></a>Thread Context</h3>
+<div class="paragraph">
+<p>Just like <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/ThreadLocal.html">Java&#8217;s <code>ThreadLocal</code></a>, in Thread Context, the visibility of tags are associated with the thread they were introduced.
+Thread Context offers both a map-structured, called <em>Mapped Diagnostic Context (MDC)</em>, and a stack-structured, called <em>Nested Diagnostic Context (NDC)</em>, storage:</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">package org.apache.test;
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">ThreadContext.put("ipAddress", request.getRemoteAddr()); <i class="conum" data-value="1"></i><b>(1)</b>
+ThreadContext.put("hostName", request.getServerName()); <i class="conum" data-value="1"></i><b>(1)</b>
+ThreadContext.put("loginId", session.getAttribute("loginId")); <i class="conum" data-value="1"></i><b>(1)</b>
 
-public class MyTest {
-    private static final Logger logger = LogManager.getLogger(MyTest.class);
-}</code></pre>
+ThreadContext.push("performWork()"); <i class="conum" data-value="2"></i><b>(2)</b>
+
+LOGGER.debug("Performing work"); <i class="conum" data-value="3"></i><b>(3)</b></code></pre>
+</div>
+</div>
+<div class="colist arabic">
+<table>
+<tr>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>Associating properties with the logging context map of the thread</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="2"></i><b>2</b></td>
+<td>Pushing properties to the logging context stack of the thread</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="3"></i><b>3</b></td>
+<td>Added properties can later on be used to, for instance, filter the log event, provide extra information in the layout, etc.</td>
+</tr>
+</table>
+</div>
+<div class="admonitionblock caution">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-caution" title="Caution"></i>
+</td>
+<td class="content">
+<div class="paragraph">
+<p><strong>Thread Context is mostly superseded by Scoped Context</strong>, which, unlike Thread Context,</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>is safe to use in servlet applications</p>
+</li>
+<li>
+<p>can store any <code>Object</code>-typed value</p>
+</li>
+</ul>
+</div>
+</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
+<p><a href="thread-context.html" class="xref page">Read more on Thread Context</a>&#8230;&#8203;</p>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="messages"><a class="anchor" href="#messages"></a>Messages</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Whereas almost every other logging API and implementation accepts only <code>String</code>-typed input as message, Log4j generalizes this concept with a <code>Message</code> contract.
+Customizability of the message type enables users to <strong>have complete control over how a message is encoded</strong> by Log4j.
+This liberal approach allows applications to choose the message type best fitting to their logging needs; they can log plain <code>String</code>s, or custom <code>PurchaseOrder</code> objects.</p>
+</div>
+<div class="paragraph">
+<p>Log4j provides several predefined message types to cater for common use cases:</p>
 </div>
+<div class="ulist">
+<ul>
+<li>
+<p>Simple <code>String</code>-typed messages:</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">LOGGER.info("foo");
+LOGGER.info(new SimpleMessage("foo"));</code></pre>
 </div>
+</div>
+</li>
+<li>
+<p><code>String</code>-typed parameterized messages:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">package org.apache.test;
-
-public class MyTest {
-    private static final Logger logger = LogManager.getLogger(MyTest.class.getName());
-}</code></pre>
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">LOGGER.info("foo {} {}", "bar", "baz");
+LOGGER.info(new ParameterizedMessage("foo {} {}", new Object[]{"bar", "baz"}));</code></pre>
 </div>
 </div>
+</li>
+<li>
+<p><code>Map</code>-typed messages:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">package org.apache.test;
-
-public class MyTest {
-    private static final Logger logger = LogManager.getLogger();
-}</code></pre>
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">LOGGER.info(new StringMapMessage()
+    .with("key1", "val1")
+    .with("key2", "val2"));</code></pre>
 </div>
 </div>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p><a href="messages.html" class="xref page">Read more on messages&#8230;&#8203;</a></p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="flow-tracing"><a class="anchor" href="#flow-tracing"></a>Flow tracing</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>The <code>Logger</code> class provides <code>traceEntry()</code>, <code>traceExit()</code>, <code>catching()</code>, <code>throwing()</code> methods that are quite useful for following the execution path of applications.
+These methods generate log events that can be filtered separately from other debug logging.</p>
+</div>
+<div class="paragraph">
+<p><a href="flowtracing.html" class="xref page">Read more on flow tracing&#8230;&#8203;</a></p>
 </div>
 </div>
 </div>
diff --git a/manual/appenders.html b/manual/appenders.html
index 4922316b26..f8fba0d910 100644
--- a/manual/appenders.html
+++ b/manual/appenders.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="api.html">Log4j API</a>
+    <a class="nav-link" href="api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="thread-context.html">Thread Context</a>
+    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item is-current-page" data-depth="2">
     <a class="nav-link" href="appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item is-current-page" data-depth="1">
-    <a class="nav-link" href="appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="extending.html">Extending Log4j</a>
+    <a class="nav-link" href="extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/manual/architecture.html b/manual/architecture.html
index 6613fcb4bc..bfbb445183 100644
--- a/manual/architecture.html
+++ b/manual/architecture.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item is-current-page" data-depth="1">
     <a class="nav-link" href="architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="api.html">Log4j API</a>
+    <a class="nav-link" href="api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="thread-context.html">Thread Context</a>
+    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="extending.html">Extending Log4j</a>
+    <a class="nav-link" href="extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/manual/async.html b/manual/async.html
index 3fac9a3ebf..a0068c387e 100644
--- a/manual/async.html
+++ b/manual/async.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="api.html">Log4j API</a>
+    <a class="nav-link" href="api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="thread-context.html">Thread Context</a>
+    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="extending.html">Extending Log4j</a>
+    <a class="nav-link" href="extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/manual/cloud.html b/manual/cloud.html
index 9589ab1074..7f100a2feb 100644
--- a/manual/cloud.html
+++ b/manual/cloud.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item is-current-page" data-depth="1">
+    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="api.html">Log4j API</a>
+    <a class="nav-link" href="api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="thread-context.html">Thread Context</a>
+    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="usage.html">Usage</a>
-  </li>
-  <li class="nav-item is-current-page" data-depth="1">
-    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="extending.html">Extending Log4j</a>
+    <a class="nav-link" href="extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
@@ -332,7 +305,7 @@
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
     <li><a href="../index.html">Home</a></li>
-    <li><a href="index.html">Manual</a></li>
+    <li>Resources</li>
     <li><a href="cloud.html">Using Log4j in Cloud Enabled Applications</a></li>
   </ul>
 </nav>
diff --git a/manual/compatibility.html b/manual/compatibility.html
index 4e343feb77..6a1eab38ec 100644
--- a/manual/compatibility.html
+++ b/manual/compatibility.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="api.html">Log4j API</a>
+    <a class="nav-link" href="api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="thread-context.html">Thread Context</a>
+    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="extending.html">Extending Log4j</a>
+    <a class="nav-link" href="extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/manual/configuration.html b/manual/configuration.html
index b8da4d54d8..e4f4b4fd53 100644
--- a/manual/configuration.html
+++ b/manual/configuration.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="api.html">Log4j API</a>
+    <a class="nav-link" href="api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="thread-context.html">Thread Context</a>
+    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item is-current-page" data-depth="2">
     <a class="nav-link" href="configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="extending.html">Extending Log4j</a>
+    <a class="nav-link" href="extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/manual/customconfig.html b/manual/customconfig.html
index 56f72d0e61..92a6bc5618 100644
--- a/manual/customconfig.html
+++ b/manual/customconfig.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="api.html">Log4j API</a>
+    <a class="nav-link" href="api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="thread-context.html">Thread Context</a>
+    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item is-current-page" data-depth="2">
+    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
+    <a class="nav-link" href="jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="appenders.html">Appenders</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="layouts.html">Layouts</a>
+    <a class="nav-link" href="extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="json-template-layout.html">JSON Template Layout</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="filters.html">Filters</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="extending.html">Extending Log4j</a>
-<ul class="nav-list">
-  <li class="nav-item is-current-page" data-depth="2">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="plugins.html">Plugins</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="1">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
@@ -333,7 +306,7 @@
   <ul>
     <li><a href="../index.html">Home</a></li>
     <li><a href="index.html">Manual</a></li>
-    <li><a href="extending.html">Extending Log4j</a></li>
+    <li>Configuration</li>
     <li><a href="customconfig.html">Programmatic Configuration</a></li>
   </ul>
 </nav>
diff --git a/manual/customloglevels.html b/manual/customloglevels.html
index 69a24c7a3e..ab96730257 100644
--- a/manual/customloglevels.html
+++ b/manual/customloglevels.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
-    <title>Log Levels :: Apache Log4j</title>
+    <title>Levels :: Apache Log4j</title>
     <link rel="canonical" href="https://logging.apache.org/log4j/2.x/manual/customloglevels.html">
     <meta name="generator" content="Antora 3.2.0-alpha.4">
 <link rel="stylesheet" href="../_/css/site.css">
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="api.html">Log4j API</a>
+    <a class="nav-link" href="api.html">API</a>
 <ul class="nav-list">
+  <li class="nav-item is-current-page" data-depth="2">
+    <a class="nav-link" href="customloglevels.html">Levels</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="markers.html">Markers</a>
+    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="thread-context.html">Thread Context</a>
+    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="lookups.html">Lookups</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="2">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="extending.html">Extending Log4j</a>
+    <a class="nav-link" href="extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item is-current-page" data-depth="1">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
@@ -333,8 +306,8 @@
   <ul>
     <li><a href="../index.html">Home</a></li>
     <li><a href="index.html">Manual</a></li>
-    <li>Configuration</li>
-    <li><a href="customloglevels.html">Log Levels</a></li>
+    <li><a href="api.html">API</a></li>
+    <li><a href="customloglevels.html">Levels</a></li>
   </ul>
 </nav>
 <div class="edit-this-page"><a href="https://github.com/apache/logging-log4j2/edit/2.x/src/site/antora/modules/ROOT/pages/manual/customloglevels.adoc">Edit this Page</a></div>
@@ -344,420 +317,254 @@
   <div class="toc-menu"></div>
 </aside>
 <article class="doc">
-<h1 class="page">Log Levels</h1>
-<div class="sect1">
-<h2 id="DefiningLevelsInCode"><a class="anchor" href="#DefiningLevelsInCode"></a>Defining Custom Log Levels in Code</h2>
+<h1 class="page">Levels</h1>
+<div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>Log4j 2 supports custom log levels. Custom log levels can be defined in
-code or in configuration. To define a custom log level in code, use the
-<code>Level.forName()</code> method. This method creates a new level for the
-specified name. After a log level is defined you can log messages at
-this level by calling the <code>Logger.log()</code> method and passing the custom log
-level:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">// This creates the "VERBOSE" level if it does not exist yet.
-final Level VERBOSE = Level.forName("VERBOSE", 550);
-
-final Logger logger = LogManager.getLogger();
-logger.log(VERBOSE, "a verbose message"); // use the custom VERBOSE level
-
-// Create and use a new custom level "DIAG".
-logger.log(Level.forName("DIAG", 350), "a diagnostic message");
-
-// Use (don't create) the "DIAG" custom level.
-// Only do this *after* the custom level is created!
-logger.log(Level.getLevel("DIAG"), "another diagnostic message");
-
-// Using an undefined level results in an error: Level.getLevel() returns null,
-// and logger.log(null, "message") throws an exception.
-logger.log(Level.getLevel("FORGOT_TO_DEFINE"), "some message"); // throws exception!</code></pre>
-</div>
+<p>Log levels are used to categorize log events by severity and control the verbosity of the logs.
+They are one of many <a href="api.html#fish-tagging" class="xref page"><em>fish tagging</em> capabilities provided by Log4j API</a>.
+Using levels, you can filter out less important logs and focus on the most critical ones.</p>
 </div>
 <div class="paragraph">
-<p>When defining a custom log level, the <code>intLevel</code> parameter (550 and 350
-in the example above) determines where the custom level exists in
-relation to the standard levels built-in to Log4j 2. For reference, the
-table below shows the <code>intLevel</code> of the built-in log levels.</p>
+<p>Log4j contains following predefined levels:</p>
 </div>
 <table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 1. Standard log levels built-in to Log4j</caption>
 <colgroup>
 <col style="width: 50%;">
 <col style="width: 50%;">
 </colgroup>
 <thead>
 <tr>
-<th class="tableblock halign-left valign-top">Standard Level</th>
-<th class="tableblock halign-right valign-top">intLevel</th>
+<th class="tableblock halign-left valign-top">Name</th>
+<th class="tableblock halign-left valign-top">Priority</th>
 </tr>
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">OFF</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">0</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>OFF</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">0</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">FATAL</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">100</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>FATAL</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">100</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">ERROR</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">200</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>ERROR</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">200</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">WARN</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">300</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>WARN</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">300</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">INFO</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">400</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>INFO</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">400</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">DEBUG</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">500</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>DEBUG</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">500</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">TRACE</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">600</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>TRACE</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">600</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">ALL</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock"><code>Integer.MAX_VALUE</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>ALL</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Integer.MAX_VALUE</code></p></td>
 </tr>
 </tbody>
 </table>
+<div class="paragraph">
+<p>A level is composed of a case-sensitive name and a <strong>priority</strong> (of type <code>int</code>), which is used to define an order while comparing two.
+Priority can be used in several contexts to express a filtering capability, for instance:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><code>WARN</code> is <em>less severe</em> than <code>ERROR</code></p>
+</li>
+<li>
+<p><code>WARN</code> is <em>more specific</em> than <code>ERROR</code></p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>The entry point to log levels are through <a href="../javadoc/log4j-api/org/apache/logging/log4j/Level.html"><code>Level</code></a>.
+Predefined levels are available for Log4j API integrators through <a href="../javadoc/log4j-api/org/apache/logging/log4j/spi/StandardLevel.html"><code>StandardLevel</code></a>.</p>
+</div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="DefiningLevelsInConfiguration"><a class="anchor" href="#DefiningLevelsInConfiguration"></a>Defining Custom Log Levels in Configuration</h2>
+<h2 id="usage"><a class="anchor" href="#usage"></a><a id="StandardLoggerInterface"></a> Usage</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Custom log levels can also be defined in configuration. This is
-convenient for using a custom level in a logger filter or an appender
-filter. Similar to defining log levels in code, a custom level must be
-defined first, before it can be used. If a logger or appender is
-configured with an undefined level, that logger or appender will be
-invalid and will not process any log events.</p>
+<p>You can specify the log level while using <code>Logger</code> in several ways:</p>
 </div>
-<div class="paragraph">
-<p>The <strong>CustomLevel</strong> configuration element creates a custom level.
-Internally it calls the same <code>Level.forName()</code> method discussed above.</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">LOGGER.info("Hello, {}!", userName); <i class="conum" data-value="1"></i><b>(1)</b>
+LOGGER.log(Level.INFO, "Hello, {}!", userName); <i class="conum" data-value="2"></i><b>(2)</b></code></pre>
 </div>
-<table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 2. CustomLevel Parameters</caption>
-<colgroup>
-<col style="width: 16.6666%;">
-<col style="width: 16.6666%;">
-<col style="width: 66.6668%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Parameter Name</th>
-<th class="tableblock halign-left valign-top">Type</th>
-<th class="tableblock halign-left valign-top">Description</th>
-</tr>
-</thead>
-<tbody>
+</div>
+<div class="colist arabic">
+<table>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>name</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">String</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">The name of the custom level. Note that level names are
-case sensitive. The convention is to use all upper-case names.</p></td>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>Using <code>Logger#info()</code> to log a message at <code>INFO</code> level</td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>intLevel</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">integer</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Determines where the custom level exists in relation
-to the standard levels built-in to Log4j 2 (see the table above).</p></td>
+<td><i class="conum" data-value="2"></i><b>2</b></td>
+<td>Using <code>Logger#log()</code> to log a message and specifying the <code>INFO</code> level explicitly</td>
 </tr>
-</tbody>
 </table>
+</div>
 <div class="paragraph">
-<p>The following example shows a configuration that defines some custom log
-levels and uses a custom log level to filter log events sent to the
-console.</p>
+<p>There are several ways levels can be employed in the Log4j configuration file for filtering purposes.
+Filtering on levels for loggers is a pretty common example:</p>
 </div>
 <div class="listingblock">
 <div class="content">
 <pre class="highlightjs highlight"><code class="language-xml hljs" data-lang="xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;Configuration status="WARN"&gt;
-  &lt;!-- Define custom levels before using them for filtering below. --&gt;
-  &lt;CustomLevels&gt;
-    &lt;CustomLevel name="DIAG" intLevel="350" /&gt;
-    &lt;CustomLevel name="NOTICE" intLevel="450" /&gt;
-    &lt;CustomLevel name="VERBOSE" intLevel="550" /&gt;
-  &lt;/CustomLevels&gt;
+&lt;Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns="https://logging.apache.org/xml/ns"
+               xsi:schemaLocation="
+                       https://logging.apache.org/xml/ns
+                       https://logging.apache.org/xml/ns/log4j-config-2.xsd"&gt;
 
-  &lt;Appenders&gt;
-    &lt;Console name="Console" target="SYSTEM_OUT"&gt;
-      &lt;PatternLayout pattern="%d %-7level %logger{36} - %msg%n"/&gt;
+  &lt;appenders&gt;
+    &lt;Console name="CONSOLE"&gt;
+      &lt;JsonTemplateLayout/&gt;
     &lt;/Console&gt;
-    &lt;File name="MyFile" fileName="logs/app.log"&gt;
-      &lt;PatternLayout pattern="%d %-7level %logger{36} - %msg%n"/&gt;
-    &lt;/File&gt;
-  &lt;/Appenders&gt;
-  &lt;Loggers&gt;
-    &lt;Root level="trace"&gt;
-      &lt;!-- Only events at DIAG level or more specific are sent to the console. --&gt;
-      &lt;AppenderRef ref="Console" level="diag" /&gt;
-      &lt;AppenderRef ref="MyFile" level="trace" /&gt;
-    &lt;/Root&gt;
-  &lt;/Loggers&gt;
+  &lt;/appenders&gt;
+
+  &lt;loggers&gt;
+    &lt;logger name="com.mycompany" level="INFO"/&gt;<i class="conum" data-value="1"></i><b>(1)</b>
+    &lt;root level="ERROR"&gt;<i class="conum" data-value="2"></i><b>(2)</b>
+      &lt;AppenderRef ref="CONSOLE"/&gt;
+    &lt;/root&gt;
+  &lt;/loggers&gt;
+
 &lt;/Configuration&gt;</code></pre>
 </div>
 </div>
+<div class="colist arabic">
+<table>
+<tr>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>Logs of level <code>INFO</code> or higher severity (i.e., <code>WARN</code>, <code>ERROR</code>, <code>FATAL</code>) are allowed for <code>com.mycompany</code> package</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="2"></i><b>2</b></td>
+<td>Logs of level <code>ERROR</code> or higher severity (i.e., <code>FATAL</code>) are allowed for the rest</td>
+</tr>
+</table>
+</div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="StandardLoggerInterface"><a class="anchor" href="#StandardLoggerInterface"></a>Convenience Methods for the Built-in Log Levels</h2>
+<h2 id="DefiningLevelsInCode"><a class="anchor" href="#DefiningLevelsInCode"></a>Defining custom log levels programmatically</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>The built-in log levels have a set of convenience methods on the Logger
-interface that makes them easier to use. For example, the Logger
-interface has 24 <code>debug()</code> methods that support the DEBUG level:</p>
+<p>Users can programmatically define custom levels using <a href="../javadoc/log4j-api/org/apache/logging/log4j/Level.html#forName(java.lang.String,int)">the <code>Level.forName()</code> method</a>:</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">// convenience methods for the built-in DEBUG level
-debug(Marker, Message)
-debug(Marker, Message, Throwable)
-debug(Marker, Object)
-debug(Marker, Object, Throwable)
-debug(Marker, String)
-debug(Marker, String, Object...)
-debug(Marker, String, Throwable)
-debug(Message)
-debug(Message, Throwable)
-debug(Object)
-debug(Object, Throwable)
-debug(String)
-debug(String, Object...)
-debug(String, Throwable)
-// lambda support methods added in 2.4
-debug(Marker, MessageSupplier)
-debug(Marker, MessageSupplier, Throwable)
-debug(Marker, String, Supplier&lt;?&gt;...)
-debug(Marker, Supplier&lt;?&gt;)
-debug(Marker, Supplier&lt;?&gt;, Throwable)
-debug(MessageSupplier)
-debug(MessageSupplier, Throwable)
-debug(String, Supplier&lt;?&gt;...)
-debug(Supplier&lt;?&gt;)
-debug(Supplier&lt;?&gt;, Throwable)</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Similar methods exist for the other built-in levels. Custom levels, in
-contrast, need to pass in the log level as an extra parameter.</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">// need to pass the custom level as a parameter
-logger.log(VERBOSE, "a verbose message");
-logger.log(Level.forName("DIAG", 350), "another message");</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>It would be nice to have the same ease of use with custom levels, so
-that after declaring the custom VERBOSE/DIAG levels, we could use code
-like this:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">// nice to have: descriptive methods and no need to pass the level as a parameter
-logger.verbose("a verbose message");
-logger.diag("another message");
-logger.diag("java 8 lambda expression: {}", () -&gt; someMethod());</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The standard Logger interface cannot provide convenience methods for
-custom levels, but the next few sections introduce a code generation
-tool to create loggers that aim to make custom levels as easy to use as
-built-in levels.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="AddingOrReplacingLevels"><a class="anchor" href="#AddingOrReplacingLevels"></a>Adding or Replacing Log Levels</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>We assume that most users want to <em>add</em> custom level methods to the
-Logger interface, in addition to the existing <code>trace()</code>, <code>debug()</code>, <code>info()</code>,
-&#8230;&#8203; methods for the built-in log levels.</p>
-</div>
-<div class="paragraph">
-<p>There is another use case, Domain Specific Language loggers, where we
-want to <em>replace</em> the existing <code>trace()</code>, <code>debug()</code>, <code>info()</code>, &#8230;&#8203; methods
-with all-custom methods.</p>
-</div>
-<div class="paragraph">
-<p>For example, for medical devices we could have only <code>critical()</code>,
-<code>warning()</code>, and <code>advisory()</code> methods. Another example could be a game
-that has only <code>defcon1()</code>, <code>defcon2()</code>, and <code>defcon3()</code> levels.</p>
-</div>
-<div class="paragraph">
-<p>If it were possible to hide existing log levels, users could customize
-the Logger interface to match their requirements. Some people may not
-want to have a FATAL or a TRACE level, for example. They would like to
-be able to create a custom Logger that only has <code>debug()</code>, <code>info()</code>, <code>warn()</code>
-and <code>error()</code> methods.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="CustomLoggers"><a class="anchor" href="#CustomLoggers"></a>Generating Source Code for a Custom Logger Wrapper</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Common Log4j usage is to get an instance of the <code>Logger</code> interface from
-the <code>LogManager</code> and call the methods on this interface. However, the
-custom log Levels are not known in advance, so Log4j cannot provide an
-interface with convenience methods for these custom log Levels.</p>
-</div>
-<div class="paragraph">
-<p>To solve this, Log4j ships with a tool that generates source code for a
-Logger wrapper. The generated wrapper class has convenience methods for
-each custom log level, making custom levels just as easy to use as the
-built-in levels.</p>
-</div>
-<div class="paragraph">
-<p>There are two flavors of wrappers: ones that <em>*extend*</em> the Logger API
-(adding methods to the built-in levels) and ones that <em>*customize*</em> the
-Logger API (replacing the built-in methods).</p>
-</div>
-<div class="paragraph">
-<p>When generating the source code for a wrapper class, you need to
-specify:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>the fully qualified name of the class to generate</p>
-</li>
-<li>
-<p>the list of custom levels to support and their <code>intLevel</code> relative
-strength</p>
-</li>
-<li>
-<p>whether to extend <code>Logger</code> (and keep the existing built-in methods) or
-have only methods for the custom log levels</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>You would then include the generated source code in the project where
-you want to use custom log levels.</p>
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">public final class CustomLogLevel {
+
+    public static final Level VERBOSE = Level.forName("VERBOSE", 550); <i class="conum" data-value="1"></i><b>(1)</b>
+
+}</code></pre>
 </div>
 </div>
+<div class="colist arabic">
+<table>
+<tr>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>Creating a custom level with name <code>VERBOSE</code> and priority 550</td>
+</tr>
+</table>
 </div>
-<div class="sect1">
-<h2 id="ExampleUsage"><a class="anchor" href="#ExampleUsage"></a>Example Usage of a Generated Logger Wrapper</h2>
-<div class="sectionbody">
 <div class="paragraph">
-<p>Here is an example of how one would use a generated logger wrapper with
-custom levels DIAG, NOTICE and VERBOSE:</p>
+<p>Once defined, you can log messages at this level by calling the <code>Logger#log()</code> method and passing the custom log level:</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">// ExtLogger is a generated logger wrapper
-import com.mycompany.myproject.ExtLogger;
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">public class PurchaseOrder {
 
-public class MyService {
-    // instead of Logger logger = LogManager.getLogger(MyService.class):
-    private static final ExtLogger logger = ExtLogger.create(MyService.class);
+    private static final Logger LOGGER = LogManager.getLogger();
 
-    public void demoExtendedLogger() {
-        // ...
-        logger.trace("the built-in TRACE level");
-        logger.verbose("a custom level: a VERBOSE message");
-        logger.debug("the built-in DEBUG level");
-        logger.notice("a custom level: a NOTICE message");
-        logger.info("the built-in INFO level");
-        logger.diag("a custom level: a DIAG message");
-        logger.warn("the built-in WARN level");
-        logger.error("the built-in ERROR level");
-        logger.fatal("the built-in FATAL level");
-        logger.notice("java 8 lambda expression only executed if NOTICE is enabled: {}", () -&gt; someMethod());
+    public PurchaseOrder(String id) {
+        LOGGER.log(CustomLogLevel.VERBOSE, "Creating purchase order with ID `{}`", id); <i class="conum" data-value="1"></i><b>(1)</b>
         // ...
     }
-    ...
+
+    // ...
+
 }</code></pre>
 </div>
 </div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="CodeGen"><a class="anchor" href="#CodeGen"></a>Generating Extended Loggers</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Use the following command to generate a logger wrapper that adds methods
-to the built-in ones:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code class="language-sh hljs" data-lang="sh">java -cp log4j-core-2.23.1.jar org.apache.logging.log4j.core.tools.ExtendedLoggerGenerator \
-        com.mycomp.ExtLogger DIAG=350 NOTICE=450 VERBOSE=550 > com/mycomp/ExtLogger.java</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>This will generate source code for a logger wrapper that has the
-convenience methods for the built-in levels <em>as well as</em> the specified
-custom levels. The tool prints the generated source code to the console.
-By appending " &gt; <em>filename</em>" the output can be redirected to a file.</p>
-</div>
-<div class="admonitionblock note">
+<div class="colist arabic">
 <table>
 <tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-Prior to log4j-2.9, this tool was an inner class
-<code>Generate$ExtendedLogger</code>.<br>
-Under the bash shell on Unix/Mac/Linux the dollar character $ needs to
-be escaped, so the class name should be between single quotes
-'org.apache.logging.log4j.core.tools.Generate$ExtendedLogger’.
-</td>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>Logging with the created custom level</td>
 </tr>
 </table>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_generating_custom_loggers"><a class="anchor" href="#_generating_custom_loggers"></a>Generating Custom Loggers</h2>
+<h2 id="DefiningLevelsInConfiguration"><a class="anchor" href="#DefiningLevelsInConfiguration"></a>Defining custom log levels in configuration</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Use the following command to generate a logger wrapper that hides the
-built-in levels and has only custom levels:</p>
+<p>Similar to defining log levels programmatically, a custom level must be defined first, before it can be used in a configuration file.
+To facilitate this, the <code>CustomLevel</code> configuration element is used to define a custom level.
+Internally it calls the same <code>Level.forName()</code> method discussed in <a href="#DefiningLevelsInCode">Defining custom log levels programmatically</a>.</p>
+</div>
+<div class="paragraph">
+<p>The following example shows a configuration that defines the <code>VERBOSE</code> custom log level and uses it to filter log events sent to the console.</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-sh hljs" data-lang="sh">java -cp log4j-core-2.23.1.jar org.apache.logging.log4j.core.tools.CustomLoggerGenerator \
-        com.mycomp.MyLogger DEFCON1=350 DEFCON2=450 DEFCON3=550 > com/mycomp/MyLogger.java</code></pre>
-</div>
+<pre class="highlightjs highlight"><code class="language-xml hljs" data-lang="xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns="https://logging.apache.org/xml/ns"
+               xsi:schemaLocation="
+                       https://logging.apache.org/xml/ns
+                       https://logging.apache.org/xml/ns/log4j-config-2.xsd"&gt;
+
+  &lt;CustomLevels&gt;<i class="conum" data-value="1"></i><b>(1)</b>
+    &lt;CustomLevel name="VERBOSE" intLevel="550"/&gt;
+  &lt;/CustomLevels&gt;
+
+  &lt;appenders&gt;
+    &lt;Console name="CONSOLE"&gt;
+      &lt;PatternLayout/&gt;
+    &lt;/Console&gt;
+    &lt;File name="FILE" fileName="logs/app.log"&gt;
+      &lt;PatternLayout/&gt;
+    &lt;/File&gt;
+  &lt;/appenders&gt;
+
+  &lt;loggers&gt;
+    &lt;root level="TRACE"&gt;
+      &lt;AppenderRef ref="CONSOLE" level="VERBOSE" /&gt;<i class="conum" data-value="2"></i><b>(2)</b>
+      &lt;AppenderRef ref="FILE"/&gt;
+    &lt;/root&gt;
+  &lt;/loggers&gt;
+
+&lt;/Configuration&gt;</code></pre>
 </div>
-<div class="paragraph">
-<p>This will generate source code for a logger wrapper that <em>only</em> has
-convenience methods for the specified custom levels, <em>not</em> for the
-built-in levels. The tool prints the generated source code to the
-console. By appending " &gt; <em>filename</em>" the output can be redirected to a
-file.</p>
 </div>
-<div class="admonitionblock note">
+<div class="colist arabic">
 <table>
 <tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-Prior to log4j-2.9, this tool was an inner class <code>Generate$ExtendedLogger</code>.
-Under the bash shell on Unix/Mac/Linux the dollar character $ needs to
-be escaped, so the class name should be between single quotes
-'org.apache.logging.log4j.core.tools.Generate$CustomLogger’.
-</td>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>Defining the <code>VERBOSE</code> custom log level</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="2"></i><b>2</b></td>
+<td>Only events of <code>VERBOSE</code> level or higher severity are sent to the console</td>
 </tr>
 </table>
 </div>
diff --git a/manual/eventlogging.html b/manual/eventlogging.html
index e3cdcbb494..64b33fae42 100644
--- a/manual/eventlogging.html
+++ b/manual/eventlogging.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
-    <title>Event Logging with Log4j :: Apache Log4j</title>
+    <title>Event Logging :: Apache Log4j</title>
     <link rel="canonical" href="https://logging.apache.org/log4j/2.x/manual/eventlogging.html">
     <meta name="generator" content="Antora 3.2.0-alpha.4">
 <link rel="stylesheet" href="../_/css/site.css">
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="api.html">Log4j API</a>
+    <a class="nav-link" href="api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="markers.html">Markers</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="2">
-    <a class="nav-link" href="eventlogging.html">Event Logging with Log4j</a>
-  </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="messages.html">Messages</a>
+    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
+  </li>
+  <li class="nav-item is-current-page" data-depth="2">
+    <a class="nav-link" href="eventlogging.html">Event Logging</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="extending.html">Extending Log4j</a>
+    <a class="nav-link" href="extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
@@ -333,8 +306,8 @@
   <ul>
     <li><a href="../index.html">Home</a></li>
     <li><a href="index.html">Manual</a></li>
-    <li><a href="api.html">Log4j API</a></li>
-    <li><a href="eventlogging.html">Event Logging with Log4j</a></li>
+    <li><a href="api.html">API</a></li>
+    <li><a href="eventlogging.html">Event Logging</a></li>
   </ul>
 </nav>
 <div class="edit-this-page"><a href="https://github.com/apache/logging-log4j2/edit/2.x/src/site/antora/modules/ROOT/pages/manual/eventlogging.adoc">Edit this Page</a></div>
@@ -344,7 +317,7 @@
   <div class="toc-menu"></div>
 </aside>
 <article class="doc">
-<h1 class="page">Event Logging with Log4j</h1>
+<h1 class="page">Event Logging</h1>
 <div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
diff --git a/manual/extending.html b/manual/extending.html
index a34c45b1a6..2b9229ad5a 100644
--- a/manual/extending.html
+++ b/manual/extending.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="api.html">Log4j API</a>
+    <a class="nav-link" href="api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="thread-context.html">Thread Context</a>
+    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="filters.html">Filters</a>
-  </li>
   <li class="nav-item is-current-page" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="extending.html">Extending Log4j</a>
+    <a class="nav-link" href="extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
@@ -333,7 +306,7 @@
   <ul>
     <li><a href="../index.html">Home</a></li>
     <li><a href="index.html">Manual</a></li>
-    <li><a href="extending.html">Extending Log4j</a></li>
+    <li><a href="extending.html">Extending</a></li>
   </ul>
 </nav>
 <div class="edit-this-page"><a href="https://github.com/apache/logging-log4j2/edit/2.x/src/site/antora/modules/ROOT/pages/manual/extending.adoc">Edit this Page</a></div>
diff --git a/manual/filters.html b/manual/filters.html
index b58350d6ea..5b05119309 100644
--- a/manual/filters.html
+++ b/manual/filters.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="api.html">Log4j API</a>
+    <a class="nav-link" href="api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="thread-context.html">Thread Context</a>
+    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item is-current-page" data-depth="2">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item is-current-page" data-depth="1">
-    <a class="nav-link" href="filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="extending.html">Extending Log4j</a>
+    <a class="nav-link" href="extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/manual/flowtracing.html b/manual/flowtracing.html
index 4062cb9dd8..004729d46d 100644
--- a/manual/flowtracing.html
+++ b/manual/flowtracing.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="api.html">Log4j API</a>
+    <a class="nav-link" href="api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="customloglevels.html">Levels</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="2">
-    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="messages.html">Messages</a>
+    <a class="nav-link" href="thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="thread-context.html">Thread Context</a>
+    <a class="nav-link" href="messages.html">Messages</a>
+  </li>
+  <li class="nav-item is-current-page" data-depth="2">
+    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="extending.html">Extending Log4j</a>
+    <a class="nav-link" href="extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
@@ -333,7 +306,7 @@
   <ul>
     <li><a href="../index.html">Home</a></li>
     <li><a href="index.html">Manual</a></li>
-    <li><a href="api.html">Log4j API</a></li>
+    <li><a href="api.html">API</a></li>
     <li><a href="flowtracing.html">Flow Tracing</a></li>
   </ul>
 </nav>
diff --git a/manual/garbagefree.html b/manual/garbagefree.html
index 92594945de..3ac33ae9a4 100644
--- a/manual/garbagefree.html
+++ b/manual/garbagefree.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="api.html">Log4j API</a>
+    <a class="nav-link" href="api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="thread-context.html">Thread Context</a>
+    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="extending.html">Extending Log4j</a>
+    <a class="nav-link" href="extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/manual/index.html b/manual/index.html
index 4ebb6ee9da..356e28fdf8 100644
--- a/manual/index.html
+++ b/manual/index.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="api.html">Log4j API</a>
+    <a class="nav-link" href="api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="thread-context.html">Thread Context</a>
+    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="extending.html">Extending Log4j</a>
+    <a class="nav-link" href="extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
@@ -348,8 +321,7 @@
 <div class="sectionbody">
 <div class="paragraph">
 <p>Apache Log4j is a versatile, industrial-grade Java logging framework composed of an API, its implementation,  and components to assist the deployment for various use cases.
-Log4j is <a href="https://security.googleblog.com/2021/12/apache-log4j-vulnerability.html">used by 8% of the Maven ecosystem</a> and listed as one of <a href="https://docs.google.com/spreadsheets/d/1ONZ4qeMq8xmeCHX03lIgIYE4MEXVfVL6oj05lbuXTDM/edit#gid=1024997528">the top 100 critical open source software projects</a>.
-The project is actively maintained by a <a href="https://logging.apache.org/team-list.html">team</a> of several volunteers and <a href="https://logging.apache.org/support">support</a>ed by a big community.</p>
+The project is actively maintained by a <a href="https://logging.apache.org/team-list.html">team</a> of volunteers and <a href="https://logging.apache.org/support">support</a>ed by a big community.</p>
 </div>
 <div class="paragraph">
 <p>Logging is an essential part of the software development process.
@@ -422,18 +394,6 @@ to consider not using logging at all.</p>
 </ul>
 </div>
 </dd>
-<dt class="hdlist1">API separation</dt>
-<dd>
-<p>The API for Log4j (i.e., <code>log4j-api</code>) is separate from the implementation (i.e., <code>log4j-core</code>), making it straightforward for application developers which classes and methods to use while ensuring forward compatibility.
-(See <a href="api-separation.html" class="xref page">API Separation</a> for details.)
-The Log4j API also provides the most feature-rich logging facade in the market; support for various <code>Message</code> types (such as <code>Object</code> or <code>Map</code>) besides plain <code>String</code>, lambda expressions, parametrized logging, markers, levels, diagnostic contexts (aka. MDC/NDC), etc.
-Check out the <a href="api.html" class="xref page">Java API</a>, <a href="https://logging.apache.org/log4j/kotlin">Kotlin API</a>, and <a href="https://logging.apache.org/log4j/scala">Scala API</a> pages for further information.</p>
-</dd>
-<dt class="hdlist1">No vendor lock-in</dt>
-<dd>
-<p>Even though Log4j implements the Log4j API at its fullest, users can use another logging backend.
-This can be achieved by either using another backend implementing the Log4j API or forwarding Log4j API calls to another logging facade (e.g., SLF4J) and using a backend for that particular facade.</p>
-</dd>
 <dt class="hdlist1">Reliability</dt>
 <dd>
 <p>Log4j is built with solid reliability in mind.
@@ -442,15 +402,26 @@ It can automatically reload its configuration upon modification and will do so w
 <dt class="hdlist1">Performance</dt>
 <dd>
 <p>When configured correctly, Log4j can deliver excelling performance without almost any burden on the Java garbage collector, and it will do so without sacrificing reliability.
-This is made possible via an asynchronous logger founded on the <a href="https://lmax-exchange.github.io/disruptor/">LMAX Disruptor</a> technology (having its roots in the demanding industry of financial trading) and the garbage-free features baked at hot paths.
 Check out the <a href="performance.html" class="xref page">Performance</a> page for details.</p>
 </dd>
 <dt class="hdlist1">Extensibility</dt>
 <dd>
 <p>Log4j contains a fully-fledged <a href="plugins.html" class="xref page">plugin support</a> that users can leverage to extend functionality.
-You can easily add your components (layouts, appenders, filters, etc.) or customize existing ones (e.g., adding new directives to the <a href="layouts.html#PatternLayout" class="xref page">Pattern</a> or <a href="json-template-layout.html#extending" class="xref page">JSON Template Layout</a>).
+You can easily add your components (layouts, appenders, filters, etc.) or customize existing ones (e.g., adding new directives to <a href="extending.html#PatternConverters" class="xref page">Pattern Layout</a> or <a href="json-template-layout.html#extending" class="xref page">JSON Template Layout</a>).
 Check out the <a href="extending.html" class="xref page">Extending Log4j</a> page.</p>
 </dd>
+<dt class="hdlist1">Powerful API</dt>
+<dd>
+<p>Log4j is a logging system where the API (called Log4j API) and its implementation (called Log4j Core) is distinctly separate from each other.
+<a href="api.html" class="xref page">Log4j API</a> provides the most feature-rich logging facade in the market; support for various <code>Message</code> types (such as <code>Object</code> or <code>Map</code>) besides plain <code>String</code>, lambda expressions, parameterized logging, markers, levels, diagnostic contexts (aka. MDC/NDC), etc.
+Log4j team takes backward compatibility very seriously and makes sure people relying on Log4j API gets a logging facade that is straightforward to use in a correct and future-proof way.
+Check out the <a href="api.html" class="xref page">Java API</a>, <a href="https://logging.apache.org/log4j/kotlin">Kotlin API</a>, and <a href="https://logging.apache.org/log4j/scala">Scala API</a> pages for further information.</p>
+</dd>
+<dt class="hdlist1">No vendor lock-in</dt>
+<dd>
+<p>Log4j API is a generic logging facade for various logging frameworks.
+While Log4j Core implements it at its fullest, you can easily switch to other implementations such as Logback or JUL (<code>java.util.logging</code>).</p>
+</dd>
 </dl>
 </div>
 </div>
diff --git a/manual/installation.html b/manual/installation.html
index fb4cc8b20e..8eac0e8d03 100644
--- a/manual/installation.html
+++ b/manual/installation.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="api.html">Log4j API</a>
+    <a class="nav-link" href="api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="thread-context.html">Thread Context</a>
+    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="eventlogging.html">Event Logging</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="resource-logger.html">Resource Logging</a>
+    <a class="nav-link" href="resource-logger.html">Resource Loggers</a>
   </li>
 </ul>
   </li>
@@ -150,6 +159,12 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="configuration.html">Configuration file</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
+  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="appenders.html">Appenders</a>
   </li>
@@ -165,9 +180,6 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="lookups.html">Lookups</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
@@ -175,57 +187,18 @@
     <a class="nav-link" href="scripts.html">Scripts</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="systemproperties.html">Configuration properties</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="usage.html">Usage</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="lookups.html">Lookups</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="appenders.html">Appenders</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="layouts.html">Layouts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="json-template-layout.html">JSON Template Layout</a>
+    <a class="nav-link" href="jmx.html">JMX</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="filters.html">Filters</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="extending.html">Extending Log4j</a>
+    <a class="nav-link" href="extending.html">Extending</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="plugins.html">Plugins</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customconfig.html">Programmatic Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="customloglevels.html">Log Levels</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="jmx.html">JMX</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="logsep.html">Logging Separation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
diff --git a/manual/jmx.html b/manual/jmx.html
index 209cd2f899..dcb52d98f6 100644
--- a/manual/jmx.html
+++ b/manual/jmx.html
@@ -21,6 +21,9 @@
   .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
   .doc pre { font-size: 0.7rem; }
   .doc .colist { font-size: 0.75rem; }
+  /* Make links more visible: */
+  .doc a { text-decoration: underline; }
+  .doc a code { text-decoration: underline; color: #1565c0; }
   /* Tab header fonts aren't rendered good, adjusting the font weight: */
   .tablist > ul li { font-weight: 500; }
   /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
@@ -95,6 +98,12 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../5min.html">Log4j explained in 5 minutes</a>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="migration.html">Migrating from Log4j 1</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="cloud.html">Using Log4j in Cloud Enabled Applications</a>
+  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../development.html">Development</a>
   </li>
@@ -110,36 +119,36 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="architecture.html">Architecture</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="migration.html">Migrating from Log4j 1.x to 2.x</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="api.html">Log4j API</a>
+    <a class="nav-link" href="api.html">API</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="logbuilder.html">Fluent API</a>
+    <a class="nav-link" href="customloglevels.html">Levels</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
+    <a class="nav-link" href="logbuilder.html">Fluent API</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="markers.html">Markers</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="eventlogging.html">Event Logging with Log4j</a>
+    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="thread-context.html">Thread Context</a>
   </li>
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="messages.html">Messages</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="thread-context.html">Thread Context</a>
+    <a class="nav-link" href="flowtracing.html">Flow Tracing</a>
   </li>
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="scoped-context.html">Scoped Context</a>
+    <a class="nav-link" href="eventlogging.html">Event Logging</a>
   </li>
... 4639 lines suppressed ...