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/21 11:34:19 UTC

(logging-log4j2) branch main-site-stg-out updated: Add website content generated from `ceae9243f2acd64c9b68db82485381a4e18ebae4`

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

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


The following commit(s) were added to refs/heads/main-site-stg-out by this push:
     new 7bf0907b79 Add website content generated from `ceae9243f2acd64c9b68db82485381a4e18ebae4`
7bf0907b79 is described below

commit 7bf0907b798b510a0419a153bbfba396b7ae96e0
Author: ASF Logging Services RM <pr...@logging.apache.org>
AuthorDate: Tue May 21 11:34:14 2024 +0000

    Add website content generated from `ceae9243f2acd64c9b68db82485381a4e18ebae4`
---
 5min.html                                          |   15 +-
 _images/AsyncWithLocationThrpt1T-labeled.png       |  Bin 23273 -> 0 bytes
 .../Log4j2AppenderThroughputComparison-linux.png   |  Bin 37494 -> 0 bytes
 .../Log4j2AppenderThroughputComparison-windows.png |  Bin 36089 -> 0 bytes
 _images/MarkerFilterCostComparison.png             |  Bin 22737 -> 0 bytes
 _images/ParamMsgThrpt1-4T.png                      |  Bin 37465 -> 0 bytes
 _images/ResponseTimeAsyncClassicVsGcFree-label.png |  Bin 31148 -> 0 bytes
 .../ResponseTimeAsyncLogging16Threads_8kEach.png   |  Bin 29429 -> 0 bytes
 ...ncLogging16Threads_8kEachLog4j2Only-labeled.png |  Bin 41663 -> 0 bytes
 .../ResponseTimeAsyncLogging4Threads_16kEach.png   |  Bin 32664 -> 0 bytes
 _images/ResponseTimeSyncClassicVsGcFree.png        |  Bin 33240 -> 0 bytes
 _images/ResponseTimeVsServiceTimeAsyncLoggers.png  |  Bin 34779 -> 0 bytes
 _images/SyncThroughputLoggerComparisonLinux.png    |  Bin 33718 -> 0 bytes
 .../SynchronousFileResponseTime2T32k-labeled.png   |  Bin 31907 -> 0 bytes
 _images/ThreadContextFilterCostComparison.png      |  Bin 17874 -> 0 bytes
 _images/async-throughput-comparison.png            |  Bin 66734 -> 0 bytes
 _images/async-vs-sync-throughput.png               |  Bin 60459 -> 0 bytes
 _images/garbage-free2.6-SyncThroughputLinux.png    |  Bin 24197 -> 0 bytes
 .../log4j-2.5-FlightRecording-thumbnail40pct.png   |  Bin 57992 -> 0 bytes
 _images/log4j-2.5-FlightRecording.png              |  Bin 68628 -> 0 bytes
 .../log4j-2.6-FlightRecording-thumbnail40pct.png   |  Bin 45221 -> 0 bytes
 _images/log4j-2.6-FlightRecording.png              |  Bin 50481 -> 0 bytes
 articles.html                                      |   15 +-
 development.html                                   |   15 +-
 download.html                                      |   15 +-
 faq.html                                           |   15 +-
 getting-started/index.html                         |   15 +-
 index.html                                         |   15 +-
 javadoc.html                                       |   15 +-
 javadoc/log4j-core/index-all.html                  |    4 +-
 javadoc/log4j-core/member-search-index.js          |    2 +-
 .../logging/log4j/core/impl/CoreDefaultBundle.html |   57 +-
 .../kit/recycler/RecyclerFactoryProvider.html      |   11 +-
 log4j-1.2-api.html                                 |   15 +-
 log4j-api.html                                     |   15 +-
 log4j-docker.html                                  |   15 +-
 log4j-flume-ng.html                                |   15 +-
 log4j-iostreams.html                               |   15 +-
 log4j-jpl.html                                     |   15 +-
 log4j-jul.html                                     |   15 +-
 log4j-mongodb.html                                 |   15 +-
 log4j-slf4j-impl.html                              |   15 +-
 log4j-slf4j2-impl.html                             |   15 +-
 log4j-spring-cloud-config-client.html              |   15 +-
 log4j-to-jul.html                                  |   15 +-
 log4j-to-slf4j.html                                |   15 +-
 manual/api-separation.html                         |   15 +-
 manual/api.html                                    |   15 +-
 manual/appenders.html                              |   15 +-
 manual/architecture.html                           |   15 +-
 manual/async.html                                  |  411 +-------
 manual/cloud.html                                  |   15 +-
 manual/compatibility.html                          |   15 +-
 manual/configuration.html                          |   15 +-
 manual/customconfig.html                           |   15 +-
 manual/customloglevels.html                        |   15 +-
 manual/dependencyinjection.html                    |   15 +-
 manual/eventlogging.html                           |   15 +-
 manual/extending.html                              |   15 +-
 manual/filters.html                                |   15 +-
 manual/flowtracing.html                            |   15 +-
 manual/garbagefree.html                            | 1111 ++++++++++----------
 manual/index.html                                  |   15 +-
 manual/installation.html                           |   15 +-
 manual/jmx.html                                    |   15 +-
 manual/json-template-layout.html                   |   70 +-
 manual/layouts.html                                |  382 ++++++-
 manual/log4j1-compat.html                          |   15 +-
 manual/logbuilder.html                             |   15 +-
 manual/logsep.html                                 |   15 +-
 manual/lookups.html                                |   15 +-
 manual/markers.html                                |   15 +-
 manual/messages.html                               |   15 +-
 manual/migration.html                              |   15 +-
 manual/performance.html                            |  624 +++++------
 manual/plugins.html                                |   15 +-
 manual/resource-logger.html                        |   15 +-
 manual/scoped-context.html                         |   15 +-
 manual/systemproperties.html                       |   15 +-
 manual/thread-context.html                         |   15 +-
 manual/usage.html                                  |   15 +-
 plugin-reference.html                              |   24 +-
 release-notes.html                                 |   15 +-
 runtime-dependencies.html                          |   15 +-
 sitemap.xml                                        |  120 +--
 thanks.html                                        |   15 +-
 86 files changed, 1812 insertions(+), 1814 deletions(-)

diff --git a/5min.html b/5min.html
index b27ad62988..e96c0194d3 100644
--- a/5min.html
+++ b/5min.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
diff --git a/_images/AsyncWithLocationThrpt1T-labeled.png b/_images/AsyncWithLocationThrpt1T-labeled.png
deleted file mode 100644
index 484b33b805..0000000000
Binary files a/_images/AsyncWithLocationThrpt1T-labeled.png and /dev/null differ
diff --git a/_images/Log4j2AppenderThroughputComparison-linux.png b/_images/Log4j2AppenderThroughputComparison-linux.png
deleted file mode 100644
index 4bb18a7807..0000000000
Binary files a/_images/Log4j2AppenderThroughputComparison-linux.png and /dev/null differ
diff --git a/_images/Log4j2AppenderThroughputComparison-windows.png b/_images/Log4j2AppenderThroughputComparison-windows.png
deleted file mode 100644
index 678dc9572a..0000000000
Binary files a/_images/Log4j2AppenderThroughputComparison-windows.png and /dev/null differ
diff --git a/_images/MarkerFilterCostComparison.png b/_images/MarkerFilterCostComparison.png
deleted file mode 100644
index ae48521b3f..0000000000
Binary files a/_images/MarkerFilterCostComparison.png and /dev/null differ
diff --git a/_images/ParamMsgThrpt1-4T.png b/_images/ParamMsgThrpt1-4T.png
deleted file mode 100644
index 9983dfe59a..0000000000
Binary files a/_images/ParamMsgThrpt1-4T.png and /dev/null differ
diff --git a/_images/ResponseTimeAsyncClassicVsGcFree-label.png b/_images/ResponseTimeAsyncClassicVsGcFree-label.png
deleted file mode 100644
index 22994316c1..0000000000
Binary files a/_images/ResponseTimeAsyncClassicVsGcFree-label.png and /dev/null differ
diff --git a/_images/ResponseTimeAsyncLogging16Threads_8kEach.png b/_images/ResponseTimeAsyncLogging16Threads_8kEach.png
deleted file mode 100644
index 63e24fb7e8..0000000000
Binary files a/_images/ResponseTimeAsyncLogging16Threads_8kEach.png and /dev/null differ
diff --git a/_images/ResponseTimeAsyncLogging16Threads_8kEachLog4j2Only-labeled.png b/_images/ResponseTimeAsyncLogging16Threads_8kEachLog4j2Only-labeled.png
deleted file mode 100644
index 3202c2353f..0000000000
Binary files a/_images/ResponseTimeAsyncLogging16Threads_8kEachLog4j2Only-labeled.png and /dev/null differ
diff --git a/_images/ResponseTimeAsyncLogging4Threads_16kEach.png b/_images/ResponseTimeAsyncLogging4Threads_16kEach.png
deleted file mode 100644
index 87b83cbe49..0000000000
Binary files a/_images/ResponseTimeAsyncLogging4Threads_16kEach.png and /dev/null differ
diff --git a/_images/ResponseTimeSyncClassicVsGcFree.png b/_images/ResponseTimeSyncClassicVsGcFree.png
deleted file mode 100644
index a4f19ac2a4..0000000000
Binary files a/_images/ResponseTimeSyncClassicVsGcFree.png and /dev/null differ
diff --git a/_images/ResponseTimeVsServiceTimeAsyncLoggers.png b/_images/ResponseTimeVsServiceTimeAsyncLoggers.png
deleted file mode 100644
index 7aff3006bb..0000000000
Binary files a/_images/ResponseTimeVsServiceTimeAsyncLoggers.png and /dev/null differ
diff --git a/_images/SyncThroughputLoggerComparisonLinux.png b/_images/SyncThroughputLoggerComparisonLinux.png
deleted file mode 100644
index aeb36adbc8..0000000000
Binary files a/_images/SyncThroughputLoggerComparisonLinux.png and /dev/null differ
diff --git a/_images/SynchronousFileResponseTime2T32k-labeled.png b/_images/SynchronousFileResponseTime2T32k-labeled.png
deleted file mode 100644
index abce722b80..0000000000
Binary files a/_images/SynchronousFileResponseTime2T32k-labeled.png and /dev/null differ
diff --git a/_images/ThreadContextFilterCostComparison.png b/_images/ThreadContextFilterCostComparison.png
deleted file mode 100644
index 1ca12a243c..0000000000
Binary files a/_images/ThreadContextFilterCostComparison.png and /dev/null differ
diff --git a/_images/async-throughput-comparison.png b/_images/async-throughput-comparison.png
deleted file mode 100644
index 623a3f55c6..0000000000
Binary files a/_images/async-throughput-comparison.png and /dev/null differ
diff --git a/_images/async-vs-sync-throughput.png b/_images/async-vs-sync-throughput.png
deleted file mode 100644
index 75e53bce87..0000000000
Binary files a/_images/async-vs-sync-throughput.png and /dev/null differ
diff --git a/_images/garbage-free2.6-SyncThroughputLinux.png b/_images/garbage-free2.6-SyncThroughputLinux.png
deleted file mode 100644
index 80f9b6aac8..0000000000
Binary files a/_images/garbage-free2.6-SyncThroughputLinux.png and /dev/null differ
diff --git a/_images/log4j-2.5-FlightRecording-thumbnail40pct.png b/_images/log4j-2.5-FlightRecording-thumbnail40pct.png
deleted file mode 100644
index 2144149cbb..0000000000
Binary files a/_images/log4j-2.5-FlightRecording-thumbnail40pct.png and /dev/null differ
diff --git a/_images/log4j-2.5-FlightRecording.png b/_images/log4j-2.5-FlightRecording.png
deleted file mode 100644
index bd69464d43..0000000000
Binary files a/_images/log4j-2.5-FlightRecording.png and /dev/null differ
diff --git a/_images/log4j-2.6-FlightRecording-thumbnail40pct.png b/_images/log4j-2.6-FlightRecording-thumbnail40pct.png
deleted file mode 100644
index 46ec82b42f..0000000000
Binary files a/_images/log4j-2.6-FlightRecording-thumbnail40pct.png and /dev/null differ
diff --git a/_images/log4j-2.6-FlightRecording.png b/_images/log4j-2.6-FlightRecording.png
deleted file mode 100644
index e42b1de842..0000000000
Binary files a/_images/log4j-2.6-FlightRecording.png and /dev/null differ
diff --git a/articles.html b/articles.html
index d4b4a9e1ce..b1b9cf2831 100644
--- a/articles.html
+++ b/articles.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
diff --git a/development.html b/development.html
index 10d71cbb15..0b21bbd967 100644
--- a/development.html
+++ b/development.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
diff --git a/download.html b/download.html
index 8df16863ed..feee95e4bc 100644
--- a/download.html
+++ b/download.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
diff --git a/faq.html b/faq.html
index c386d072ee..e755ef7ddd 100644
--- a/faq.html
+++ b/faq.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
diff --git a/getting-started/index.html b/getting-started/index.html
index 8651d94abd..0dde5c922f 100644
--- a/getting-started/index.html
+++ b/getting-started/index.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="../manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="../manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="../manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="../manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
diff --git a/index.html b/index.html
index 4a6b3002d1..7503595493 100644
--- a/index.html
+++ b/index.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
diff --git a/javadoc.html b/javadoc.html
index 639fcb3791..73d085b230 100644
--- a/javadoc.html
+++ b/javadoc.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
diff --git a/javadoc/log4j-core/index-all.html b/javadoc/log4j-core/index-all.html
index 3ced559fd9..3895f9d85d 100644
--- a/javadoc/log4j-core/index-all.html
+++ b/javadoc/log4j-core/index-all.html
@@ -2848,9 +2848,7 @@ loadScripts(document, 'script');</script>
 </dd>
 <dt><a href="org/apache/logging/log4j/core/appender/nosql/DefaultNoSqlObject.html#%3Cinit%3E()" class="member-name-link">DefaultNoSqlObject()</a> - Constructor for class org.apache.logging.log4j.core.appender.nosql.<a href="org/apache/logging/log4j/core/appender/nosql/DefaultNoSqlObject.html" title="class in org.apache.logging.log4j.core.appender.nosql">DefaultNoSqlObject</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/apache/logging/log4j/core/impl/CoreDefaultBundle.html#defaultRecyclerFactory(org.apache.logging.log4j.kit.env.PropertyEnvironment,org.apache.logging.log4j.kit.recycler.RecyclerFactoryProvider)" class="member-name-link">defaultRecyclerFactory(PropertyEnvironment, RecyclerFactoryProvider)</a> - Method in class org.apache.logging.log4j.core.impl.<a href="org/apache/logging/log4j/core/impl/CoreDefaultBundle.html" title="class in org.apache.logging.log4j.core.impl">CoreDefaul [...]
-<dd>&nbsp;</dd>
-<dt><a href="org/apache/logging/log4j/core/impl/CoreDefaultBundle.html#defaultRecyclerFactoryProvider(org.apache.logging.log4j.kit.env.PropertyEnvironment,java.lang.ClassLoader,org.apache.logging.log4j.Logger)" class="member-name-link">defaultRecyclerFactoryProvider(PropertyEnvironment, ClassLoader, Logger)</a> - Method in class org.apache.logging.log4j.core.impl.<a href="org/apache/logging/log4j/core/impl/CoreDefaultBundle.html" title="class in org.apache.logging.log4j.core.impl">CoreDe [...]
+<dt><a href="org/apache/logging/log4j/core/impl/CoreDefaultBundle.html#defaultRecyclerFactory(org.apache.logging.log4j.kit.env.PropertyEnvironment,java.lang.ClassLoader,org.apache.logging.log4j.Logger)" class="member-name-link">defaultRecyclerFactory(PropertyEnvironment, ClassLoader, Logger)</a> - Method in class org.apache.logging.log4j.core.impl.<a href="org/apache/logging/log4j/core/impl/CoreDefaultBundle.html" title="class in org.apache.logging.log4j.core.impl">CoreDefaultBundle</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/logging/log4j/core/config/DefaultReliabilityStrategy.html" class="type-name-link" title="class in org.apache.logging.log4j.core.config">DefaultReliabilityStrategy</a> - Class in <a href="org/apache/logging/log4j/core/config/package-summary.html">org.apache.logging.log4j.core.config</a></dt>
 <dd>
diff --git a/javadoc/log4j-core/member-search-index.js b/javadoc/log4j-core/member-search-index.js
index 5eb10dd644..90e6b376cd 100644
--- a/javadoc/log4j-core/member-search-index.js
+++ b/javadoc/log4j-core/member-search-index.js
@@ -1 +1 @@
-memberSearchIndex = [{"p":"org.apache.logging.log4j.core.pattern","c":"NameAbbreviator","l":"abbreviate(String, StringBuilder)","u":"abbreviate(java.lang.String,java.lang.StringBuilder)"},{"p":"org.apache.logging.log4j.core.pattern","c":"NamePatternConverter","l":"abbreviate(String, StringBuilder)","u":"abbreviate(java.lang.String,java.lang.StringBuilder)"},{"p":"org.apache.logging.log4j.core.appender.rolling.action","c":"AbstractAction","l":"AbstractAction()","u":"%3Cinit%3E()"},{"p":"o [...]
\ No newline at end of file
+memberSearchIndex = [{"p":"org.apache.logging.log4j.core.pattern","c":"NameAbbreviator","l":"abbreviate(String, StringBuilder)","u":"abbreviate(java.lang.String,java.lang.StringBuilder)"},{"p":"org.apache.logging.log4j.core.pattern","c":"NamePatternConverter","l":"abbreviate(String, StringBuilder)","u":"abbreviate(java.lang.String,java.lang.StringBuilder)"},{"p":"org.apache.logging.log4j.core.appender.rolling.action","c":"AbstractAction","l":"AbstractAction()","u":"%3Cinit%3E()"},{"p":"o [...]
\ No newline at end of file
diff --git a/javadoc/log4j-core/org/apache/logging/log4j/core/impl/CoreDefaultBundle.html b/javadoc/log4j-core/org/apache/logging/log4j/core/impl/CoreDefaultBundle.html
index 49da300168..d3c4365c91 100644
--- a/javadoc/log4j-core/org/apache/logging/log4j/core/impl/CoreDefaultBundle.html
+++ b/javadoc/log4j-core/org/apache/logging/log4j/core/impl/CoreDefaultBundle.html
@@ -153,40 +153,36 @@ loadScripts(document, 'script');</script>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#defaultNanoClock()" class="member-name-link">defaultNanoClock</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://logging.apache.org/log4j/3.x/apidocs/org/apache/logging/log4j/kit/recycler/RecyclerFactory.html" title="class or interface in org.apache.logging.log4j.kit.recycler" class="external-link">RecyclerFactory</a></code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#defaultRecyclerFactory(org.apache.logging.log4j.kit.env.PropertyEnvironment,org.apache.logging.log4j.kit.recycler.RecyclerFactoryProvider)" class="member-name-link">defaultRecyclerFactory</a><wbr>(<a href="https://logging.apache.org/log4j/3.x/apidocs/org/apache/logging/log4j/kit/env/PropertyEnvironment.html" title="class or interface in org.apache.logging.log4j.k [...]
- <a href="https://logging.apache.org/log4j/3.x/apidocs/org/apache/logging/log4j/kit/recycler/RecyclerFactoryProvider.html" title="class or interface in org.apache.logging.log4j.kit.recycler" class="external-link">RecyclerFactoryProvider</a>&nbsp;provider)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://logging.apache.org/log4j/3.x/apidocs/org/apache/logging/log4j/kit/recycler/RecyclerFactoryProvider.html" title="class or interface in org.apache.logging.log4j.kit.recycler" class="external-link">RecyclerFactoryProvider</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#defaultRecyclerFactoryProvider(org.apache.logging.log4j.kit.env.PropertyEnvironment,java.lang.ClassLoader,org.apache.logging.log4j.Logger)" class="member-name-link">defaultRecyclerFactoryProvider</a><wbr>(<a href="https://logging.apache.org/log4j/3.x/apidocs/org/apache/logging/log4j/kit/env/PropertyEnvironment.html" title="class or interface in org.apache.loggin [...]
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#defaultRecyclerFactory(org.apache.logging.log4j.kit.env.PropertyEnvironment,java.lang.ClassLoader,org.apache.logging.log4j.Logger)" class="member-name-link">defaultRecyclerFactory</a><wbr>(<a href="https://logging.apache.org/log4j/3.x/apidocs/org/apache/logging/log4j/kit/env/PropertyEnvironment.html" title="class or interface in org.apache.logging.log4j.kit.env"  [...]
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/ClassLoader.html" title="class or interface in java.lang" class="external-link">ClassLoader</a>&nbsp;loader,
  org.apache.logging.log4j.Logger&nbsp;statusLogger)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../util/ShutdownCallbackRegistry.html" title="interface in org.apache.logging.log4j.core.util">ShutdownCallbackRegistry</a></code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#defaultShutdownCallbackRegistry()" class="member-name-link">defaultShutdownCallbackRegistry</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>@Named("StatusLogger") org.apache.logging.log4j.Level</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#defaultStatusLevel()" class="member-name-link">defaultStatusLevel</a>()</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../util/ShutdownCallbackRegistry.html" title="interface in org.apache.logging.log4j.core.util">ShutdownCallbackRegistry</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#defaultShutdownCallbackRegistry()" class="member-name-link">defaultShutdownCallbackRegistry</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>@Named("StatusLogger") org.apache.logging.log4j.Logger</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#defaultStatusLogger()" class="member-name-link">defaultStatusLogger</a>()</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>@Named("StatusLogger") org.apache.logging.log4j.Level</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#defaultStatusLevel()" class="member-name-link">defaultStatusLevel</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../lookup/InterpolatorFactory.html" title="interface in org.apache.logging.log4j.core.lookup">InterpolatorFactory</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#interpolatorFactory(java.util.Map)" class="member-name-link">interpolatorFactory</a><wbr>(@Namespace("Lookup") <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.htm [...]
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>@Named("StatusLogger") org.apache.logging.log4j.Logger</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#defaultStatusLogger()" class="member-name-link">defaultStatusLogger</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.apache.logging.log4j.spi.LoggerContextFactory</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#loggerContextFactory(org.apache.logging.log4j.plugins.di.ConfigurableInstanceFactory)" class="member-name-link">loggerContextFactory</a><wbr>(org.apache.logging.log4j.plugins.di.ConfigurableInstanceFactory&nbsp;instanceFactory)</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../lookup/InterpolatorFactory.html" title="interface in org.apache.logging.log4j.core.lookup">InterpolatorFactory</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#interpolatorFactory(java.util.Map)" class="member-name-link">interpolatorFactory</a><wbr>(@Namespace("Lookup") <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html [...]
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.apache.logging.log4j.spi.Provider</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#provider(org.apache.logging.log4j.plugins.di.ConfigurableInstanceFactory)" class="member-name-link">provider</a><wbr>(org.apache.logging.log4j.plugins.di.ConfigurableInstanceFactory&nbsp;instanceFactory)</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.apache.logging.log4j.spi.LoggerContextFactory</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#loggerContextFactory(org.apache.logging.log4j.plugins.di.ConfigurableInstanceFactory)" class="member-name-link">loggerContextFactory</a><wbr>(org.apache.logging.log4j.plugins.di.ConfigurableInstanceFactory&nbsp;instanceFactory)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="LogEventFactory.html" title="interface in org.apache.logging.log4j.core.impl">LogEventFactory</a></code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#reusableLogEventFactory(org.apache.logging.log4j.core.time.Clock,org.apache.logging.log4j.core.time.NanoClock,org.apache.logging.log4j.kit.recycler.RecyclerFactory)" class="member-name-link">reusableLogEventFactory</a><wbr>(<a href="../time/Clock.html" title="interface in org.apache.logging.log4j.core.time">Clock</a>&nbsp;clock,
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.apache.logging.log4j.spi.Provider</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#provider(org.apache.logging.log4j.plugins.di.ConfigurableInstanceFactory)" class="member-name-link">provider</a><wbr>(org.apache.logging.log4j.plugins.di.ConfigurableInstanceFactory&nbsp;instanceFactory)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="LogEventFactory.html" title="interface in org.apache.logging.log4j.core.impl">LogEventFactory</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#reusableLogEventFactory(org.apache.logging.log4j.core.time.Clock,org.apache.logging.log4j.core.time.NanoClock,org.apache.logging.log4j.kit.recycler.RecyclerFactory)" class="member-name-link">reusableLogEventFactory</a><wbr>(<a href="../time/Clock.html" title="interface in org.apache.logging.log4j.core.time">Clock</a>&nbsp;clock,
  <a href="../time/NanoClock.html" title="interface in org.apache.logging.log4j.core.time">NanoClock</a>&nbsp;nanoClock,
  <a href="https://logging.apache.org/log4j/3.x/apidocs/org/apache/logging/log4j/kit/recycler/RecyclerFactory.html" title="class or interface in org.apache.logging.log4j.kit.recycler" class="external-link">RecyclerFactory</a>&nbsp;recyclerFactory)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../lookup/RuntimeStrSubstitutor.html" title="class in org.apache.logging.log4j.core.lookup">RuntimeStrSubstitutor</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#runtimeStrSubstitutor(org.apache.logging.log4j.core.lookup.InterpolatorFactory)" class="member-name-link">runtimeStrSubstitutor</a><wbr>(<a href="../lookup/InterpolatorFactory.html" title="interface in org.apache.logging.log4j.core.lookup">InterpolatorFactory</a>&nbsp;factory)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../lookup/RuntimeStrSubstitutor.html" title="class in org.apache.logging.log4j.core.lookup">RuntimeStrSubstitutor</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#runtimeStrSubstitutor(org.apache.logging.log4j.core.lookup.InterpolatorFactory)" class="member-name-link">runtimeStrSubstitutor</a><wbr>(<a href="../lookup/InterpolatorFactory.html" title="interface in org.apache.logging.log4j.core.lookup">InterpolatorFactory</a>&nbsp;factory)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
 </div>
 </div>
@@ -251,26 +247,17 @@ loadScripts(document, 'script');</script>
 </section>
 </li>
 <li>
-<section class="detail" id="defaultRecyclerFactoryProvider(org.apache.logging.log4j.kit.env.PropertyEnvironment,java.lang.ClassLoader,org.apache.logging.log4j.Logger)">
-<h3>defaultRecyclerFactoryProvider</h3>
+<section class="detail" id="defaultRecyclerFactory(org.apache.logging.log4j.kit.env.PropertyEnvironment,java.lang.ClassLoader,org.apache.logging.log4j.Logger)">
+<h3>defaultRecyclerFactory</h3>
 <div class="member-signature"><span class="annotations">@SingletonFactory
 @ConditionalOnMissingBinding
-</span><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://logging.apache.org/log4j/3.x/apidocs/org/apache/logging/log4j/kit/recycler/RecyclerFactoryProvider.html" title="class or interface in org.apache.logging.log4j.kit.recycler" class="external-link">RecyclerFactoryProvider</a></span>&nbsp;<span class="element-name">defaultRecyclerFactoryProvider</span><wbr><span class="parameters">(<a href="https://logging.apache.org/log4j/3.x/apidocs/org/apache/logg [...]
+</span><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://logging.apache.org/log4j/3.x/apidocs/org/apache/logging/log4j/kit/recycler/RecyclerFactory.html" title="class or interface in org.apache.logging.log4j.kit.recycler" class="external-link">RecyclerFactory</a></span>&nbsp;<span class="element-name">defaultRecyclerFactory</span><wbr><span class="parameters">(<a href="https://logging.apache.org/log4j/3.x/apidocs/org/apache/logging/log4j/kit/env/Proper [...]
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/ClassLoader.html" title="class or interface in java.lang" class="external-link">ClassLoader</a>&nbsp;loader,
  @Named("StatusLogger")
  org.apache.logging.log4j.Logger&nbsp;statusLogger)</span></div>
 </section>
 </li>
 <li>
-<section class="detail" id="defaultRecyclerFactory(org.apache.logging.log4j.kit.env.PropertyEnvironment,org.apache.logging.log4j.kit.recycler.RecyclerFactoryProvider)">
-<h3>defaultRecyclerFactory</h3>
-<div class="member-signature"><span class="annotations">@SingletonFactory
-@ConditionalOnMissingBinding
-</span><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://logging.apache.org/log4j/3.x/apidocs/org/apache/logging/log4j/kit/recycler/RecyclerFactory.html" title="class or interface in org.apache.logging.log4j.kit.recycler" class="external-link">RecyclerFactory</a></span>&nbsp;<span class="element-name">defaultRecyclerFactory</span><wbr><span class="parameters">(<a href="https://logging.apache.org/log4j/3.x/apidocs/org/apache/logging/log4j/kit/env/Proper [...]
- <a href="https://logging.apache.org/log4j/3.x/apidocs/org/apache/logging/log4j/kit/recycler/RecyclerFactoryProvider.html" title="class or interface in org.apache.logging.log4j.kit.recycler" class="external-link">RecyclerFactoryProvider</a>&nbsp;provider)</span></div>
-</section>
-</li>
-<li>
 <section class="detail" id="defaultContextSelector(org.apache.logging.log4j.plugins.di.ConfigurableInstanceFactory)">
 <h3>defaultContextSelector</h3>
 <div class="member-signature"><span class="annotations">@SingletonFactory
diff --git a/javadoc/log4j-kit/org/apache/logging/log4j/kit/recycler/RecyclerFactoryProvider.html b/javadoc/log4j-kit/org/apache/logging/log4j/kit/recycler/RecyclerFactoryProvider.html
index dbc4ce6f53..152109dbe2 100644
--- a/javadoc/log4j-kit/org/apache/logging/log4j/kit/recycler/RecyclerFactoryProvider.html
+++ b/javadoc/log4j-kit/org/apache/logging/log4j/kit/recycler/RecyclerFactoryProvider.html
@@ -158,18 +158,13 @@ loadScripts(document, 'script');</script>
 <li>
 <section class="detail" id="createForEnvironment(org.apache.logging.log4j.kit.env.PropertyEnvironment)">
 <h3>createForEnvironment</h3>
-<div class="member-signature"><span class="annotations">@Nullable
-</span><span class="return-type"><a href="RecyclerFactory.html" title="interface in org.apache.logging.log4j.kit.recycler">RecyclerFactory</a></span>&nbsp;<span class="element-name">createForEnvironment</span><wbr><span class="parameters">(<a href="../env/PropertyEnvironment.html" title="interface in org.apache.logging.log4j.kit.env">PropertyEnvironment</a>&nbsp;environment)</span></div>
-<div class="block">Creates a recycler factory for the provided environment.
- <p>
- The return value can be null indicating that the recycler factory is not available for the provided environment.
- For instance, the provider of a <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/ThreadLocal.html" title="class or interface in java.lang" class="external-link"><code>ThreadLocal</code></a>-based recycler factory can return null if the environment is of a web application.
- </p></div>
+<div class="member-signature"><span class="return-type"><a href="RecyclerFactory.html" title="interface in org.apache.logging.log4j.kit.recycler">RecyclerFactory</a></span>&nbsp;<span class="element-name">createForEnvironment</span><wbr><span class="parameters">(<a href="../env/PropertyEnvironment.html" title="interface in org.apache.logging.log4j.kit.env">PropertyEnvironment</a>&nbsp;environment)</span></div>
+<div class="block">Creates a recycler factory for the provided environment.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
 <dd><code>environment</code> - an environment</dd>
 <dt>Returns:</dt>
-<dd>either a recycler factory instance, or null, if the associated recycler factory is not available for the given environment</dd>
+<dd>a recycler factory instance for the given environment</dd>
 </dl>
 </section>
 </li>
diff --git a/log4j-1.2-api.html b/log4j-1.2-api.html
index a63c8d6520..e0808b5f2b 100644
--- a/log4j-1.2-api.html
+++ b/log4j-1.2-api.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
diff --git a/log4j-api.html b/log4j-api.html
index ba2b8fe6ff..c4a9eb7578 100644
--- a/log4j-api.html
+++ b/log4j-api.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
diff --git a/log4j-docker.html b/log4j-docker.html
index d516dc5058..54ebbe13c5 100644
--- a/log4j-docker.html
+++ b/log4j-docker.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
diff --git a/log4j-flume-ng.html b/log4j-flume-ng.html
index 3cd7462da2..fcce7666d2 100644
--- a/log4j-flume-ng.html
+++ b/log4j-flume-ng.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
diff --git a/log4j-iostreams.html b/log4j-iostreams.html
index f3237b42ac..b0f25083a6 100644
--- a/log4j-iostreams.html
+++ b/log4j-iostreams.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
diff --git a/log4j-jpl.html b/log4j-jpl.html
index a063f2197c..843ce96f9f 100644
--- a/log4j-jpl.html
+++ b/log4j-jpl.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
diff --git a/log4j-jul.html b/log4j-jul.html
index 99659e5b75..9d5e8b8133 100644
--- a/log4j-jul.html
+++ b/log4j-jul.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
diff --git a/log4j-mongodb.html b/log4j-mongodb.html
index 657531f065..3d6e3a695d 100644
--- a/log4j-mongodb.html
+++ b/log4j-mongodb.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
diff --git a/log4j-slf4j-impl.html b/log4j-slf4j-impl.html
index 10611a012b..48860c14a9 100644
--- a/log4j-slf4j-impl.html
+++ b/log4j-slf4j-impl.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
diff --git a/log4j-slf4j2-impl.html b/log4j-slf4j2-impl.html
index fea35091ab..7f8afcb455 100644
--- a/log4j-slf4j2-impl.html
+++ b/log4j-slf4j2-impl.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
diff --git a/log4j-spring-cloud-config-client.html b/log4j-spring-cloud-config-client.html
index dafcb9d23b..27f8432414 100644
--- a/log4j-spring-cloud-config-client.html
+++ b/log4j-spring-cloud-config-client.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
diff --git a/log4j-to-jul.html b/log4j-to-jul.html
index a4ffa5efd4..dd0f146666 100644
--- a/log4j-to-jul.html
+++ b/log4j-to-jul.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
diff --git a/log4j-to-slf4j.html b/log4j-to-slf4j.html
index 6e78ddbfe5..f7ae63d478 100644
--- a/log4j-to-slf4j.html
+++ b/log4j-to-slf4j.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
diff --git a/manual/api-separation.html b/manual/api-separation.html
index 5719c24289..e63bef6261 100644
--- a/manual/api-separation.html
+++ b/manual/api-separation.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/api.html b/manual/api.html
index 13134f7d36..730d800076 100644
--- a/manual/api.html
+++ b/manual/api.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/appenders.html b/manual/appenders.html
index 9ad581605c..078592a333 100644
--- a/manual/appenders.html
+++ b/manual/appenders.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/architecture.html b/manual/architecture.html
index a1aeade951..f83cb541a7 100644
--- a/manual/architecture.html
+++ b/manual/architecture.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/async.html b/manual/async.html
index 6053cd3b22..6d7971b661 100644
--- a/manual/async.html
+++ b/manual/async.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
-    <title>Lock-free Asynchronous Loggers for Low-Latency Logging :: Apache Log4j</title>
+    <title>Asynchronous loggers :: Apache Log4j</title>
     <link rel="canonical" href="https://logging.apache.org/log4j/3.x/manual/async.html">
     <meta name="generator" content="Antora 3.2.0-alpha.4">
 <link rel="stylesheet" href="../_/css/site.css">
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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 is-current-page" 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>
@@ -288,7 +291,8 @@
   <ul>
     <li><a href="../index.html">Home</a></li>
     <li><a href="index.html">Manual</a></li>
-    <li><a href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a></li>
+    <li><a href="performance.html">Performance</a></li>
+    <li><a href="async.html">Asynchronous loggers</a></li>
   </ul>
 </nav>
 <div class="edit-this-page"><a href="https://github.com/apache/logging-log4j2/edit/main/src/site/antora/modules/ROOT/pages/manual/async.adoc">Edit this Page</a></div>
@@ -298,7 +302,7 @@
   <div class="toc-menu"></div>
 </aside>
 <article class="doc">
-<h1 class="page">Lock-free Asynchronous Loggers for Low-Latency Logging</h1>
+<h1 class="page">Asynchronous loggers</h1>
 <div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
@@ -338,7 +342,7 @@ This section describes some of the trade-offs of asynchronous logging.</p>
 <div class="ulist">
 <ul>
 <li>
-<p>Higher peak <a href="#Performance">throughput</a>.
+<p>Higher peak performance throughput.
 With an asynchronous logger your application can log messages at 6 - 68 times the rate of a synchronous logger.</p>
 <div class="paragraph">
 <p>This is especially interesting for applications that occasionally need to log bursts of messages.
@@ -356,43 +360,36 @@ Asynchronous Loggers have consistently lower latency than synchronous loggers or
 </div>
 <div class="sect2">
 <h3 id="_drawbacks"><a class="anchor" href="#_drawbacks"></a>Drawbacks</h3>
-<div class="ulist">
-<ul>
-<li>
-<p>Error handling.
-If a problem happens during the logging process and an exception is thrown, it is less easy for an asynchronous logger or appender to signal this problem to the application.
-This can partly be alleviated by configuring an <code>ExceptionHandler</code>, but this may still not cover all cases.
-For this reason, if logging is part of your business logic, for example if you are using Log4j as an audit logging framework, we would recommend to synchronously log those audit messages.
-(Note that you can still <a href="#MixedSync-Async">combine</a> them and use asynchronous logging for debug/trace logging in addition to synchronous logging for the audit trail.)</p>
-</li>
-<li>
+<div class="paragraph">
+<p>There are certain drawbacks associated with asynchronous logging:</p>
+</div>
+<div class="dlist">
+<dl>
+<dt class="hdlist1">Error handling</dt>
+<dd>
+<p>If a problem happens during the logging process and an exception is thrown, it is less easy for an asynchronous setting to signal this problem to the application.
+This can partly be alleviated by configuring an exception handler, but this may still not cover all cases.</p>
+</dd>
+<dt class="hdlist1">Stateful messages</dt>
+<dd>
 <p>In some rare cases, care must be taken with mutable messages.
 Most of the time you don&#8217;t need to worry about this.
-Log4 will ensure that log messages like <code>logger.debug("My object is {}", myObject)</code> will use the state of the <code>myObject</code> parameter at the time of the call to
-<code>logger.debug()</code>.
+Log4 will ensure that log messages like <code>logger.debug("My object is {}", myObject)</code> will use the state of the <code>myObject</code> parameter at the time of the call to <code>logger.debug()</code>.
 The log message will not change even if <code>myObject</code> is modified later.
-It is safe to asynchronously log mutable objects because most
-<a href="../javadoc/log4j-api/org/apache/logging/log4j/message/Message.html"><code>Message</code></a>
-implementations built-in to Log4j take a snapshot of the parameters.
-There are some exceptions however:
-<a href="../javadoc/log4j-api/org/apache/logging/log4j/message/MapMessage.html"><code>MapMessage</code></a>
-and
-<a href="../javadoc/log4j-api/org/apache/logging/log4j/message/StructuredDataMessage.html"><code>StructuredDataMessage</code></a>
-are mutable by design: fields can be added to these messages after the message object was created.
+It is safe to asynchronously log mutable objects because most <a href="messages.html" class="xref page">built-in <code>Message</code> implementations</a> take a snapshot of the parameters.
+There are some exceptions however: <a href="messages.html#MapMessage" class="xref page"><code>MapMessage</code></a> and <a href="messages.html#StructuredDataMessage" class="xref page"><code>StructuredDataMessage</code></a> are mutable by design, fields can be added to these messages after the message object was created.
 These messages should not be modified after they are logged with asynchronous loggers or asynchronous appenders; you may or may not see the modifications in the resulting log output.
-Similarly, custom
-<a href="../javadoc/log4j-api/org/apache/logging/log4j/message/Message.html"><code>Message</code></a>
-implementations should be designed with asynchronous use in mind, and either take a snapshot of their parameters at construction time, or document their thread-safety characteristics.</p>
-</li>
-<li>
+Similarly, custom <code>Message</code> implementations should be designed with asynchronous use in mind, and either take a snapshot of their parameters at construction time, or document their thread-safety characteristics.</p>
+</dd>
+<dt class="hdlist1">Computational overhead</dt>
+<dd>
 <p>If your application is running in an environment where CPU resources are scarce, like a machine with one CPU with a single core, starting another thread is not likely to give better performance.</p>
-</li>
-<li>
-<p>If the <em>sustained rate</em> at which your application is logging messages is faster than the maximum sustained throughput of the underlying appender, the queue will fill up and the application will end up logging at the speed of the slowest appender.
-If this happens, consider selecting a <a href="performance.html#whichAppender" class="xref page">faster appender</a>, or logging less.
-If neither of these is an option, you may get better throughput and fewer latency spikes by logging synchronously.</p>
-</li>
-</ul>
+</dd>
+<dt class="hdlist1">Appender performance</dt>
+<dd>
+<p>If the sustained rate at which your application is logging messages is faster than the maximum sustained throughput of the underlying appender, the queue will fill up and the application will end up logging at the speed of the slowest appender. If this happens, consider selecting a faster appender, or logging less. If neither of these is an option, you may get better throughput and fewer latency spikes by logging synchronously.</p>
+</dd>
+</dl>
 </div>
 </div>
 </div>
@@ -914,8 +911,7 @@ If no location is required, the snapshot will never be taken.</p>
 </div>
 <div class="paragraph">
 <p>However, asynchronous loggers need to make this decision before passing the log message to another thread; the location information will be lost after that point.
-The
-<a href="performance.html#asyncLoggingWithLocation" class="xref page">performance impact</a> of taking a stack trace snapshot is even higher for asynchronous loggers:
+The performance impact of taking a stack trace snapshot is even higher for asynchronous loggers:
 logging with location is 30-100 times slower than without location.
 For this reason, asynchronous loggers and asynchronous appenders do not include location information by default.</p>
 </div>
@@ -925,333 +921,6 @@ For this reason, asynchronous loggers and asynchronous appenders do not include
 </div>
 </div>
 <div class="sect1">
-<h2 id="Performance"><a class="anchor" href="#Performance"></a>Asynchronous Logging Performance</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The throughput performance results below were derived from running the PerfTest, MTPerfTest and PerfTestDriver classes which can be found in the Log4j 2 unit test source directory.
-For throughput tests, the methodology used was:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>First, warm up the JVM by logging 200,000 log messages of 500 characters.</p>
-</li>
-<li>
-<p>Repeat the warm-up 10 times, then wait 10 seconds for the I/O thread to catch up and buffers to drain.</p>
-</li>
-<li>
-<p>Measure how long it takes to execute 256 * 1024 / threadCount calls to Logger.log and express the result in messages per second.</p>
-</li>
-<li>
-<p>Repeat the test 5 times and average the results.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The results below were obtained with log4j-2.0-beta5, disruptor-3.0.0.beta3, log4j-1.2.17 and logback-1.0.10.</p>
-</div>
-<div class="sect2">
-<h3 id="_logging_peak_throughput"><a class="anchor" href="#_logging_peak_throughput"></a>Logging Peak Throughput</h3>
-<div class="paragraph">
-<p>The graph below compares the throughput of synchronous loggers, asynchronous appenders and asynchronous loggers.
-This is the total throughput of all threads together.
-In the test with 64 threads, asynchronous loggers are 12 times faster than asynchronous appenders, and 68 times faster than synchronous loggers.</p>
-</div>
-<div class="paragraph">
-<p>Asynchronous loggers' throughput increases with the number of threads, whereas both synchronous loggers and asynchronous appenders have more or less constant throughput regardless of the number of threads that are doing the logging.</p>
-</div>
-<div class="paragraph">
-<p><span class="image"><img src="../_images/async-vs-sync-throughput.png" alt="Async loggers have much higher throughput than sync loggers."></span></p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_asynchronous_throughput_comparison_with_other_logging_packages"><a class="anchor" href="#_asynchronous_throughput_comparison_with_other_logging_packages"></a>Asynchronous Throughput Comparison with Other Logging Packages</h3>
-<div class="paragraph">
-<p>We also compared peak throughput of asynchronous loggers to the synchronous loggers and asynchronous appenders available in other logging packages, specifically log4j-1.2.17 and logback-1.0.10, with similar results.
-For asynchronous appenders, total logging throughput of all threads together remains roughly constant when adding more threads.
-Asynchronous loggers make more effective use of the multiple cores available on the machine in multi-threaded scenarios.</p>
-</div>
-<div class="paragraph">
-<p><span class="image"><img src="../_images/async-throughput-comparison.png" alt="Async loggers have the highest throughput."></span></p>
-</div>
-<div class="paragraph">
-<p>On Solaris 10 (64bit) with JDK1.7.0_06, 4-core Xeon X5570 dual CPU @2.93Ghz with hyperthreading switched on (16 virtual cores):</p>
-</div>
-<table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 1. Throughput per thread in messages/second</caption>
-<colgroup>
-<col style="width: 12.5%;">
-<col style="width: 12.5%;">
-<col style="width: 12.5%;">
-<col style="width: 12.5%;">
-<col style="width: 12.5%;">
-<col style="width: 12.5%;">
-<col style="width: 12.5%;">
-<col style="width: 12.5%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Logger</th>
-<th class="tableblock halign-right valign-top">1 thread</th>
-<th class="tableblock halign-right valign-top">2 threads</th>
-<th class="tableblock halign-right valign-top">4 threads</th>
-<th class="tableblock halign-right valign-top">8 threads</th>
-<th class="tableblock halign-right valign-top">16 threads</th>
-<th class="tableblock halign-right valign-top">32
-threads</th>
-<th class="tableblock halign-right valign-top">64 threads</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<th class="tableblock halign-left valign-top"><p class="tableblock">Log4j 2: Loggers all asynchronous</p></th>
-<td class="tableblock halign-right valign-top"><p class="tableblock">2,652,412</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">909,119</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">776,993</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">516,365</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">239,246</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">253,791</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">288,997</p></td>
-</tr>
-<tr>
-<th class="tableblock halign-left valign-top"><p class="tableblock">Log4j 2: Loggers mixed sync/async</p></th>
-<td class="tableblock halign-right valign-top"><p class="tableblock">2,454,358</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">839,394</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">854,578</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">597,913</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">261,003</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">216,863</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">218,937</p></td>
-</tr>
-<tr>
-<th class="tableblock halign-left valign-top"><p class="tableblock">Log4j 2: Async Appender</p></th>
-<td class="tableblock halign-right valign-top"><p class="tableblock">1,713,429</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">603,019</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">331,506</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">149,408</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">86,107</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">45,529</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">23,980</p></td>
-</tr>
-<tr>
-<th class="tableblock halign-left valign-top"><p class="tableblock">Log4j1: Async Appender</p></th>
-<td class="tableblock halign-right valign-top"><p class="tableblock">2,239,664</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">494,470</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">221,402</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">109,314</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">60,580</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">31,706</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">14,072</p></td>
-</tr>
-<tr>
-<th class="tableblock halign-left valign-top"><p class="tableblock">Logback: Async Appender</p></th>
-<td class="tableblock halign-right valign-top"><p class="tableblock">2,206,907</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">624,082</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">307,500</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">160,096</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">85,701</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">43,422</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">21,303</p></td>
-</tr>
-<tr>
-<th class="tableblock halign-left valign-top"><p class="tableblock">Log4j 2: Synchronous</p></th>
-<td class="tableblock halign-right valign-top"><p class="tableblock">273,536</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">136,523</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">67,609</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">34,404</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">15,373</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">7,903</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">4,253</p></td>
-</tr>
-<tr>
-<th class="tableblock halign-left valign-top"><p class="tableblock">Log4j1: Synchronous</p></th>
-<td class="tableblock halign-right valign-top"><p class="tableblock">326,894</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">105,591</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">57,036</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">30,511</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">13,900</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">7,094</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">3,509</p></td>
-</tr>
-<tr>
-<th class="tableblock halign-left valign-top"><p class="tableblock">Logback: Synchronous</p></th>
-<td class="tableblock halign-right valign-top"><p class="tableblock">178,063</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">65,000</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">34,372</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">16,903</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">8,334</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">3,985</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">1,967</p></td>
-</tr>
-</tbody>
-</table>
-<div class="paragraph">
-<p>On Windows 7 (64bit) with JDK1.7.0_11, 2-core Intel i5-3317u CPU @1.70Ghz with hyperthreading switched on (4 virtual cores):</p>
-</div>
-<table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 2. Throughput per thread in messages/second</caption>
-<colgroup>
-<col style="width: 14.2857%;">
-<col style="width: 14.2857%;">
-<col style="width: 14.2857%;">
-<col style="width: 14.2857%;">
-<col style="width: 14.2857%;">
-<col style="width: 14.2857%;">
-<col style="width: 14.2858%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Logger</th>
-<th class="tableblock halign-right valign-top">1 thread</th>
-<th class="tableblock halign-right valign-top">2 threads</th>
-<th class="tableblock halign-right valign-top">4 threads</th>
-<th class="tableblock halign-right valign-top">8 threads</th>
-<th class="tableblock halign-right valign-top">16 threads</th>
-<th class="tableblock halign-right valign-top">32
-threads</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<th class="tableblock halign-left valign-top"><p class="tableblock">Log4j 2: Loggers all asynchronous</p></th>
-<td class="tableblock halign-right valign-top"><p class="tableblock">1,715,344</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">928,951</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">1,045,265</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">1,509,109</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">1,708,989</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">773,565</p></td>
-</tr>
-<tr>
-<th class="tableblock halign-left valign-top"><p class="tableblock">Log4j 2: Loggers mixed sync/async</p></th>
-<td class="tableblock halign-right valign-top"><p class="tableblock">571,099</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">1,204,774</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">1,632,204</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">1,368,041</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">462,093</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">908,529</p></td>
-</tr>
-<tr>
-<th class="tableblock halign-left valign-top"><p class="tableblock">Log4j 2: Async Appender</p></th>
-<td class="tableblock halign-right valign-top"><p class="tableblock">1,236,548</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">1,006,287</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">511,571</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">302,230</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">160,094</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">60,152</p></td>
-</tr>
-<tr>
-<th class="tableblock halign-left valign-top"><p class="tableblock">Log4j1: Async Appender</p></th>
-<td class="tableblock halign-right valign-top"><p class="tableblock">1,373,195</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">911,657</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">636,899</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">406,405</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">202,777</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">162,964</p></td>
-</tr>
-<tr>
-<th class="tableblock halign-left valign-top"><p class="tableblock">Logback: Async Appender</p></th>
-<td class="tableblock halign-right valign-top"><p class="tableblock">1,979,515</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">783,722</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">582,935</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">289,905</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">172,463</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">133,435</p></td>
-</tr>
-<tr>
-<th class="tableblock halign-left valign-top"><p class="tableblock">Log4j 2: Synchronous</p></th>
-<td class="tableblock halign-right valign-top"><p class="tableblock">281,250</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">225,731</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">129,015</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">66,590</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">34,401</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">17,347</p></td>
-</tr>
-<tr>
-<th class="tableblock halign-left valign-top"><p class="tableblock">Log4j1: Synchronous</p></th>
-<td class="tableblock halign-right valign-top"><p class="tableblock">147,824</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">72,383</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">32,865</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">18,025</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">8,937</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">4,440</p></td>
-</tr>
-<tr>
-<th class="tableblock halign-left valign-top"><p class="tableblock">Logback: Synchronous</p></th>
-<td class="tableblock halign-right valign-top"><p class="tableblock">149,811</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">66,301</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">32,341</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">16,962</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">8,431</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">3,610</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="sect2">
-<h3 id="Latency"><a class="anchor" href="#Latency"></a>Response Time Latency</h3>
-<div class="paragraph">
-<p>This section has been rewritten with the Log4j 2.6 release.
-The previous version only reported <em>service time</em> instead of <em>response time</em>.
-See the <a href="performance.html" class="xref page">response time</a> side bar on the performance page on why this is too optimistic.
-Furthermore the previous version reported average latency, which does not make sense since latency is not a normal distribution.
-Finally, the previous version of this section only reported the maximum latency of up to 99.99% of the measurements, which does not tell you how bad the worst 0.01% were.
-This is unfortunate because often the "outliers" are all that matter when it comes to response time.
-From this release we will try to do better and report response time latency across the full range of percentages, including all the outliers.
-Our thanks to Gil Tene for his <a href="http://www.infoq.com/presentations/latency-response-time">How NOT to
-measure latency</a> presentation.
-(Now we know why this is also known as the "Oh s#@t!" presentation.)</p>
-</div>
-<div class="paragraph">
-<p><a href="performance.html" class="xref page">Response time</a> is how long it takes to log a message under a certain load.
-What is often reported as latency is actually <em>service time</em>: how long it took to perform the operation.
-This hides the fact that a single spike in service time adds queueing delay for many of the subsequent operations.
-Service time is easy to measure (and often looks good on paper) but is irrelevant for users since it omits the time spent waiting for service.
-For this reason we report response time: service time plus wait time.</p>
-</div>
-<div class="paragraph">
-<p>The response time test results below were all derived from running the ResponseTimeTest class which can be found in the Log4j 2 unit test source directory.
-If you want to run these tests yourself, here are the command line options we used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>-Xms1G -Xmx1G (prevent heap resizing during the test)</p>
-</li>
-<li>
-<p>-DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector -DAsyncLogger.WaitStrategy=busyspin (to use Async Loggers.
-The BusySpin wait strategy reduces some jitter.)</p>
-</li>
-<li>
-<p><strong>classic mode:</strong> -Dlog4j2.enable.direct.encoders=false<br>
-<strong>garbage-free mode:</strong> -Dlog4j2.enable.direct.encoders=true</p>
-</li>
-<li>
-<p>-XX:CompileCommand=dontinline,org.apache.logging.log4j.core.async.perftest.NoOpIdleStrategy::idle</p>
-</li>
-<li>
-<p>-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintTenuringDistribution -XX:+PrintGCApplicationConcurrentTime -XX:+PrintGCApplicationStoppedTime (to eyeball GC and safepoint pauses)</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The graph below compares response time latency of the ArrayBlockingQueue-based asynchronous appenders in Logback 1.1.7, Log4j 1.2.17 to the various options for asynchronous logging that Log4j 2.6 offers.
-Under a workload of 128,000 messages per second, using 16 threads (each logging at a rate of 8,000 messages per second), we see that Logback 1.1.7, Log4j 1.2.17 experience latency spikes that are orders of magnitude larger than Log4j 2.</p>
-</div>
-<div class="paragraph">
-<p><span class="image"><img src="../_images/ResponseTimeAsyncLogging16Threads_8kEach.png" alt="When 16 threads generate a total workload of 128" width="000 msg/sec" height="Logback 1.1.7 and Log4j 1.2.17 experience latency spikes that are orders of magnitude larger than Log4j 2"></span></p>
-</div>
-<div class="paragraph">
-<p>The graph below zooms in on the Log4j 2 results for the same test.
-We see that the worst-case response time is highest for the ArrayBlockingQueue-based Async Appender.
-<a href="garbagefree.html" class="xref page">Garbage-free</a> async loggers have the best response time behaviour.</p>
-</div>
-<div class="paragraph">
-<p><span class="image"><img src="../_images/ResponseTimeAsyncLogging16Threads_8kEachLog4j2Only-labeled.png" alt="image"></span></p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
 <h2 id="UnderTheHood"><a class="anchor" href="#UnderTheHood"></a>Under The Hood</h2>
 <div class="sectionbody">
 <div class="paragraph">
diff --git a/manual/cloud.html b/manual/cloud.html
index 55ed3f9f99..0fa371ed77 100644
--- a/manual/cloud.html
+++ b/manual/cloud.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/compatibility.html b/manual/compatibility.html
index 5d8c836f9e..1232ca261a 100644
--- a/manual/compatibility.html
+++ b/manual/compatibility.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/configuration.html b/manual/configuration.html
index f27c199508..eb48090f6a 100644
--- a/manual/configuration.html
+++ b/manual/configuration.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/customconfig.html b/manual/customconfig.html
index e79b85da19..c474848060 100644
--- a/manual/customconfig.html
+++ b/manual/customconfig.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/customloglevels.html b/manual/customloglevels.html
index 7533de7ef1..8646898f70 100644
--- a/manual/customloglevels.html
+++ b/manual/customloglevels.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/dependencyinjection.html b/manual/dependencyinjection.html
index e6ffe58140..aa6440e49e 100644
--- a/manual/dependencyinjection.html
+++ b/manual/dependencyinjection.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/eventlogging.html b/manual/eventlogging.html
index 723dcd8c1e..fb43005b4b 100644
--- a/manual/eventlogging.html
+++ b/manual/eventlogging.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/extending.html b/manual/extending.html
index 975104672a..faec8bd4a4 100644
--- a/manual/extending.html
+++ b/manual/extending.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item is-current-page" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/filters.html b/manual/filters.html
index ac3718a480..7b3702eb17 100644
--- a/manual/filters.html
+++ b/manual/filters.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/flowtracing.html b/manual/flowtracing.html
index 72dbb9995d..790ef1aadf 100644
--- a/manual/flowtracing.html
+++ b/manual/flowtracing.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/garbagefree.html b/manual/garbagefree.html
index c7a5d228e8..4bced44660 100644
--- a/manual/garbagefree.html
+++ b/manual/garbagefree.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
-    <title>Garbage-free Steady State Logging :: Apache Log4j</title>
+    <title>Garbage-free logging :: Apache Log4j</title>
     <link rel="canonical" href="https://logging.apache.org/log4j/3.x/manual/garbagefree.html">
     <meta name="generator" content="Antora 3.2.0-alpha.4">
 <link rel="stylesheet" href="../_/css/site.css">
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item is-current-page" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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 is-current-page" data-depth="2">
+    <a class="nav-link" href="garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
@@ -288,7 +291,8 @@
   <ul>
     <li><a href="../index.html">Home</a></li>
     <li><a href="index.html">Manual</a></li>
-    <li><a href="garbagefree.html">Garbage-free Steady State Logging</a></li>
+    <li><a href="performance.html">Performance</a></li>
+    <li><a href="garbagefree.html">Garbage-free logging</a></li>
   </ul>
 </nav>
 <div class="edit-this-page"><a href="https://github.com/apache/logging-log4j2/edit/main/src/site/antora/modules/ROOT/pages/manual/garbagefree.adoc">Edit this Page</a></div>
@@ -298,103 +302,48 @@
   <div class="toc-menu"></div>
 </aside>
 <article class="doc">
-<h1 class="page">Garbage-free Steady State Logging</h1>
+<h1 class="page">Garbage-free logging</h1>
 <div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>Garbage collection pauses are a common cause of latency spikes and for
-many systems significant effort is spent on controlling these pauses.</p>
-</div>
-<div class="paragraph">
-<p>Many logging libraries, including previous versions of Log4j, allocate
-temporary objects like log event objects, Strings, char arrays, byte
-arrays and more during steady state logging. This contributes to
-pressure on the garbage collector and increases the frequency with which
-GC pauses occur.</p>
-</div>
-<div class="paragraph">
-<p>From version 2.6, Log4j runs in "garbage free" mode by default where
-objects and buffers are reused and no temporary objects are allocated as
-much as possible. There is also a "low garbage" mode which is not
-completely garbage free but does not use ThreadLocal fields. This is the
-default mode when Log4j <a href="#Config">detects</a> it is running in a web
-application. Finally, it is possible to switch off all garbage-free
-logic and run in "classic mode" instead. For details, see the
-<a href="#Config">Configuration</a> section below.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="jfr"><a class="anchor" href="#jfr"></a>A Contrived Example</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>To highlight the difference that garbage-free logging can make, we used
-Java Flight Recorder to measure a simple application that does nothing
-but log a simple string as often as possible for about 12 seconds.</p>
+<p>Garbage collection pauses are a common cause of latency spikes and for many systems significant effort is spent on controlling these pauses.
+Log4j allocates temporary <code>LogEvent</code>, <code>String</code>, <code>char[]</code>, <code>byte[]</code>, etc. objects during steady state logging.
+This contributes to pressure on the garbage collector and increases the frequency with which garbage collection pauses occur.
+In <em>garbage-free mode</em>, Log4j buffers and reuses objects to lessen this pressure.</p>
 </div>
-<div class="paragraph">
-<p>The application was configured to use Async Loggers, a RandomAccessFile
-appender and a "%d %p %c{1.} [%t] %m %ex%n" pattern layout. (Async
-Loggers used the Yield WaitStrategy.)</p>
-</div>
-<div class="paragraph">
-<p>Mission Control shows that with Log4j 2.5 this application allocates
-memory at a rate of about 809 MB/sec, resulting in 141 minor
-collections. Log4j 2.6 does not allocate temporary objects in this
-configuration, and as a result the same application with Log4j 2.6 has a
-memory allocation rate of 1.6 MB/sec and was GC-free with 0 (zero)
-garbage collections.</p>
-</div>
-<div class="paragraph">
-<div class="title">Using Log4j 2.5: memory allocation rate 809 MB/sec, 141 minor collections</div>
-<p><span class="image xref-image"><a class="image" href="../_images/log4j-2.5-FlightRecording.png"><img src="../_images/log4j-2.5-FlightRecording-thumbnail40pct.png" alt="log4j 2.5 FlightRecording thumbnail40pct"></a></span></p>
-</div>
-<div class="paragraph">
-<div class="title">Using Log4j 2.6: no temporary object allocations, 0 (zero) garbage collections</div>
-<p><span class="image xref-image"><a class="image" href="../_images/log4j-2.6-FlightRecording.png"><img src="../_images/log4j-2.6-FlightRecording-thumbnail40pct.png" alt="log4j 2.6 FlightRecording thumbnail40pct"></a></span></p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="Config"><a class="anchor" href="#Config"></a>Configuration</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Garbage-free logging in Log4j 2.6 is partially implemented by reusing
-objects in ThreadLocal fields, and partially by reusing buffers when
-converting text to bytes.</p>
-</div>
-<div class="paragraph">
-<p>ThreadLocal fields holding non-JDK classes can cause memory leaks in web
-applications when the application server&#8217;s thread pool continues to
-reference these fields after the web application is undeployed. To avoid
-causing memory leaks, Log4j will not use these ThreadLocals when it
-detects that it is used in a web application (when the
-<code>javax.servlet.Servlet</code> class is in the classpath, or when system
-property <code>log4j2.isWebapp</code> is set to "true").</p>
-</div>
-<div class="paragraph">
-<p>Some garbage-reducing functionality does not rely on ThreadLocals and is
-enabled by default for all applications: in Log4j 2.6, converting log
-events to text and text to bytes can be done by directly encoding text
-into a reused ByteBuffer without creating intermediary Strings, char
-arrays and byte arrays. So while logging is not completely garbage-free
-for web applications yet, the pressure on the garbage collector can
-still be significantly reduced.</p>
-</div>
-<div class="admonitionblock note">
+<div class="admonitionblock important">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
-As of version 2.6, a Log4j configuration containing a
-<code>&lt;Properties&gt;</code> section will result in temporary objects being created
-during steady-state logging.
+<div class="paragraph">
+<p>Extra tuning of any application will deviate you away from defaults and add up to the maintenance load.
+You are strongly advised to measure your application&#8217;s overall performance and then, if Log4j is found to be an important bottleneck factor, tune it carefully.
+When this happens, we also recommend you to evaluate your assumptions on a regular basis to check if they still hold.
+Remember, <a href="https://en.wikipedia.org/wiki/Program_optimization#When_to_optimize">premature optimization is the root of all evil</a>.</p>
+</div>
 </td>
 </tr>
 </table>
 </div>
+<div class="paragraph">
+<p>The act of logging is an interplay between the logging API (i.e., Log4j API) where the programmer publishes logs and a logging implementation (i.e., Log4j Core) where published logs get consumed; filtered, enriched, encoded, and written to files, databases, network sockets, etc.
+Both parties contain different features with different memory allocation characteristics.
+To achieve an end-to-end garbage-free logging system, they need to work hand in hand.
+Hence, we will discuss both:</p>
+</div>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p><a href="#Config">Log4j Core configuration</a></p>
+</li>
+<li>
+<p><a href="#api">Log4j API usage</a></p>
+</li>
+</ol>
+</div>
 <div class="admonitionblock note">
 <table>
 <tr>
@@ -402,473 +351,384 @@ during steady-state logging.
 <i class="fa icon-note" title="Note"></i>
 </td>
 <td class="content">
-as of version 2.18.0, the default Async Logger wait strategy used by Log4j
-(Timeout) is garbage-free. Some of the wait strategies included in LMAX disruptor 3.4.4,
-especially <code>TimeoutBlockingWaitStrategy</code> and <code>BlockingWaitStrategy</code> (Block)
-are not garbage-free since they
-cause <code>java.util.concurrent.locks.AbstractQueuedSynchronizer$Node</code> objects to be created.
-The default wait strategy used by Log4j uses a synchronized block instead of a ReentrantLock to avoid this problem.
-The Yield and Sleep wait strategies are garbage-free. (For configuring predefined wait strategies, see
-<a href="systemproperties.html#properties-log4j-async-logger" class="xref page">here</a>,
-you may also configure a <a href="async.html#WaitStrategy" class="xref page">custom wait strategy</a>.)
+<div class="paragraph">
+<p>Garbage-free logging is currently implemented for Log4j API and its reference implementation, Log4j Core.
+If you use another setup (e.g., a different logging API or implementation) this promise might not hold.</p>
+</div>
 </td>
 </tr>
 </table>
 </div>
-<div class="sect2">
-<h3 id="_disabling_garbage_free_logging"><a class="anchor" href="#_disabling_garbage_free_logging"></a>Disabling Garbage-free Logging</h3>
+</div>
+</div>
+<div class="sect1">
+<h2 id="quick"><a class="anchor" href="#quick"></a>Quick start</h2>
+<div class="sectionbody">
 <div class="paragraph">
-<p>There are two separate system properties for manually controlling the
-mechanisms Log4j uses to avoid creating temporary objects:</p>
+<p>If you want to have a garbage-free Log4j setup, but don&#8217;t want to spend time with the associated details, you can quickly get started with the following instructions:</p>
 </div>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p>Set the following system properties to <code>true</code>:</p>
 <div class="ulist">
 <ul>
 <li>
-<p><code>log4j2.enableDirectEncoders</code> - if "true" (the default) log events are
-converted to text and this text is converted to bytes without creating
-temporary objects. Note: <em>synchronous</em> logging performance may be worse
-for multi-threaded applications in this mode due to synchronization on
-the shared buffer. If your application is multi-threaded and logging
-performance is important, consider using Async Loggers.</p>
+<p><a href="#log4j2.enableThreadlocals"><code>log4j2.enableThreadlocals</code></a></p>
 </li>
 <li>
-<p>The ThreadContext map is <em>not</em> garbage-free by default, but from Log4j
-2.7 it can be configured to be garbage-free by setting system property
-<code>log4j2.garbagefreeThreadContextMap</code> to "true".</p>
+<p><a href="#log4j2.garbagefreeThreadContextMap"><code>log4j2.garbagefreeThreadContextMap</code></a></p>
 </li>
 </ul>
 </div>
-<div class="paragraph">
-<p>Instead of system properties, the above properties can also be specified
-in a file named <code>log4j2.component.properties</code> by including this file in
-the classpath of the application. See the
-<a href="systemproperties.html" class="xref page">manual regarding system
-properties</a> for more info.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="Appenders"><a class="anchor" href="#Appenders"></a>Supported Appenders</h3>
-<div class="paragraph">
-<p>The following <a href="appenders.html" class="xref page">appenders</a> are garbage-free during
-steady-state logging:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Console</p>
-</li>
-<li>
-<p>File</p>
 </li>
 <li>
-<p>RollingFile (some temporary objects are created during file rollover)</p>
-</li>
+<p>Use garbage-free</p>
+<div class="ulist">
+<ul>
 <li>
-<p>RandomAccessFile</p>
+<p><a href="#Layouts">Layouts</a></p>
 </li>
 <li>
-<p>RollingRandomAccessFile (some temporary objects are created during
-file rollover)</p>
+<p><a href="#Appenders">Appenders</a></p>
 </li>
 <li>
-<p>MemoryMappedFile</p>
+<p><a href="#Filters">Filters</a></p>
 </li>
 </ul>
 </div>
+</li>
+</ol>
+</div>
 <div class="paragraph">
-<p>Any other appenders not in the above list (including AsyncAppender)
-create temporary objects during steady-state logging. Instead of
-AsyncAppender, use <a href="async.html" class="xref page">Async Loggers</a> to log asynchronously
-in a garbage-free manner.</p>
+<p>This should be sufficient for a majority of use cases.
+If not for yours, keep on reading.</p>
 </div>
 </div>
-<div class="sect2">
-<h3 id="Filters"><a class="anchor" href="#Filters"></a>Supported Filters</h3>
+</div>
+<div class="sect1">
+<h2 id="Config"><a class="anchor" href="#Config"></a>Log4j Core configuration</h2>
+<div class="sectionbody">
 <div class="paragraph">
-<p>The following <a href="filters.html" class="xref page">filters</a> are garbage-free during
-steady-state logging:</p>
+<p>In order to have a garbage-free Log4j Core, you need to</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>CompositeFilter (adding and removing element filters creates temporary
-objects for thread safety)</p>
-</li>
-<li>
-<p>DynamicThresholdFilter</p>
-</li>
-<li>
-<p>LevelRangeFilter (garbage free since 2.8)</p>
-</li>
-<li>
-<p>MapFilter (garbage free since 2.8)</p>
-</li>
-<li>
-<p>MarkerFilter (garbage free since 2.8)</p>
-</li>
-<li>
-<p>StructuredDataFilter (garbage free since 2.8)</p>
-</li>
-<li>
-<p>ThreadContextMapFilter (garbage free since 2.8)</p>
+<p><a href="#properties">configure it using properties</a>,</p>
 </li>
 <li>
-<p>ThresholdFilter (garbage free since 2.8)</p>
-</li>
-<li>
-<p>TimeFilter (garbage free since 2.8 except when range must be recalculated once per day)</p>
+<p>and employ garbage-free <a href="#Layouts">layouts</a>, <a href="#Appenders">appenders</a>, and <a href="#Filters">filters</a>.</p>
 </li>
 </ul>
 </div>
-<div class="paragraph">
-<p>Other filters like BurstFilter, RegexFilter and ScriptFilter are not
-trivial to make garbage free, and there is currently no plan to change
-them.</p>
-</div>
-</div>
 <div class="sect2">
-<h3 id="Layouts"><a class="anchor" href="#Layouts"></a>Supported Layouts</h3>
-<div class="sect3">
-<h4 id="_jsontemplatelayout"><a class="anchor" href="#_jsontemplatelayout"></a>JsonTemplateLayout</h4>
+<h3 id="core-properties"><a class="anchor" href="#core-properties"></a>Properties</h3>
 <div class="paragraph">
-<p><code>JsonTemplateLayout</code> is garbage-free with
-<a href="json-template-layout.html#faq-garbage-free" class="xref page">a few exceptions</a>.</p>
-</div>
+<p>Garbage-free logging can be configured for Log4j Core using properties listed below.
+(See <a href="configuration.html" class="xref page">Configuration</a> on details how you can set these properties.)</p>
 </div>
 <div class="sect3">
-<h4 id="_patternlayout"><a class="anchor" href="#_patternlayout"></a>PatternLayout</h4>
-<div class="paragraph">
-<p>PatternLayout with the following limited set of conversion patterns is
-garbage-free. Format modifiers to control such things as field width,
-padding, left and right justification will not generate garbage.</p>
-</div>
+<h4 id="log4j.isWebapp"><a class="anchor" href="#log4j.isWebapp"></a><code>log4j.isWebapp</code></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 66.6667%;">
+<col style="width: 16.6666%;">
+<col style="width: 83.3334%;">
 </colgroup>
-<thead>
+<tbody>
 <tr>
-<th class="tableblock halign-left valign-top">Conversion Pattern</th>
-<th class="tableblock halign-left valign-top">Description</th>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Env. variable</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock">LOG4J_IS_WEBAPP</p></td>
 </tr>
-</thead>
-<tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%c{precision}, %logger{precision}</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Logger name</p></td>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Type</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>boolean</code></p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%d, %date</code></p></td>
-<td class="tableblock halign-left valign-top"><div class="content"><div class="paragraph">
-<p>Note: Only the predefined date formats are garbage-free: (millisecond
-separator may be either a comma ',' or a period '.')</p>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Default value</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code> if the <a href="https://jakarta.ee/specifications/servlet/6.0/apidocs/jakarta.servlet/jakarta/servlet/servlet">Servlet</a> class on classpath,</p>
+<p class="tableblock"><code>false</code> otherwise</p></td>
+</tr>
+</tbody>
+</table>
+<div class="paragraph">
+<p>Setting this property to <code>true</code> switches Log4j Core into "Web application mode" (<em>"Web-app mode"</em>).</p>
+</div>
+<div class="paragraph">
+<p>In this mode Log4j is optimized to work in a Servlet container.</p>
+</div>
+<div class="paragraph">
+<p>This mode is incompatible with <a href="#log4j.enableThreadlocals"><code>log4j.enableThreadlocals</code></a>.</p>
 </div>
+</div>
+<div class="sect3">
+<h4 id="log4j.enableThreadlocals"><a class="anchor" href="#log4j.enableThreadlocals"></a><code>log4j.enableThreadlocals</code></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
-<col style="width: 50%;">
-<col style="width: 50%;">
+<col style="width: 16.6666%;">
+<col style="width: 83.3334%;">
 </colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Pattern</th>
-<th class="tableblock halign-left valign-top">Example</th>
-</tr>
-</thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%d{DEFAULT}</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">2012-11-02 14:34:02,781</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%d{ISO8601}</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">2012-11-02T14:34:02,781</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%d{ISO8601_BASIC}</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">20121102T143402,781</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%d{ABSOLUTE}</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">14:34:02,781</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%d{DATE}</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">02 Nov 2012 14:34:02,781</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%d{COMPACT}</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">20121102143402781</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%d{HH:mm:ss,SSS}</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">14:34:02,781</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%d{dd MMM yyyy HH:mm:ss,SSS}</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">02 Nov 2012 14:34:02,781</p></td>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Env. variable</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock">LOG4J_ENABLE_THREADLOCALS</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%d{HH:mm:ss}{GMT+0}</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">18:34:02</p></td>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Type</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>boolean</code></p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%d{UNIX}</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">1351866842</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%d{UNIX_MILLIS}</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">1351866842781</p></td>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Default value</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>false</code> if Web-app mode is enabled,</p>
+<p class="tableblock"><code>true</code> otherwise</p></td>
 </tr>
 </tbody>
-</table></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%enc{pattern}, %encode{pattern}</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Encodes special characters such as
-'\n' and HTML characters to help prevent log forging and some XSS
-attacks that could occur when displaying logs in a web browser -
-garbage-free since 2.8</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%equals{pattern}{test}{substitution},
-%equalsIgnoreCase{pattern}{test}{substitution}</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Replaces occurrences
-of 'test', a string, with its replacement 'substitution' in the string
-resulting from evaluation of the pattern - garbage-free since 2.8</p></td>
-</tr>
+</table>
+<div class="paragraph">
+<p>Setting this property to <code>true</code> switches Log4j Core into "garbage-free mode" (<em>"GC-free mode"</em>).</p>
+</div>
+<div class="paragraph">
+<p>In this mode Log4j uses <code>ThreadLocal</code>s for object pooling to prevent object allocations.</p>
+</div>
+<div class="paragraph">
+<p>This mode is incompatible with <a href="#log4j.isWebapp"><code>log4j.isWebapp</code></a>.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="log4j.gc.enableDirectEncoders"><a class="anchor" href="#log4j.gc.enableDirectEncoders"></a><code>log4j.gc.enableDirectEncoders</code></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 16.6666%;">
+<col style="width: 83.3334%;">
+</colgroup>
+<tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%highlight{pattern}{style}</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Adds ANSI colors - garbage-free since 2.7
-(unless nested pattern is not garbage free)</p></td>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Env. variable</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock">LOG4J_GC_ENABLE_DIRECT_ENCODERS</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%K{key}, %map{key}, %MAP{key}</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Outputs the entries in a
-<a href="../javadoc/log4j-api/org/apache/logging/log4j/message/MapMessage.html">MapMessage</a>,
-if one is present in the event - garbage-free since 2.8.</p></td>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Type</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>boolean</code></p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%m, %msg, %message</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Log message (garbage-free unless message text
-contains '${')</p></td>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Default value</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code></p></td>
 </tr>
+</tbody>
+</table>
+<div class="paragraph">
+<p>If <code>true</code>, garbage-aware layouts will directly encode log events into <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html">ByteBuffer</a>s provided by appenders.</p>
+</div>
+<div class="paragraph">
+<p>This prevents allocating temporary <code>String</code> and <code>char[]</code> instances.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="log4j.gc.encoderByteBufferSize"><a class="anchor" href="#log4j.gc.encoderByteBufferSize"></a><code>log4j.gc.encoderByteBufferSize</code></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 16.6666%;">
+<col style="width: 83.3334%;">
+</colgroup>
+<tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%marker</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">The full name of the marker (including parents) - garbage-free
-since 2.8</p></td>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Env. variable</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock">LOG4J_GC_ENCODER_BYTE_BUFFER_SIZE</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%markerSimpleName</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">The simple name of the marker (not including
-parents)</p></td>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Type</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>int</code></p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%maxLen, %maxLength</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Truncates another pattern to some max number of
-characters - garbage-free since 2.8</p></td>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Default value</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>8192</code></p></td>
 </tr>
+</tbody>
+</table>
+<div class="paragraph">
+<p>The size in bytes of the <a href="../https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html">ByteBuffer</a>s stored in <code>ThreadLocal</code> fields by layouts and <a href="../javadoc/log4j-core/org/apache/logging/log4j/core/layout/StringBuilderEncoder">StringBuilderEncoder</a>s.</p>
+</div>
+<div class="paragraph">
+<p>This setting is only used if <a href="#log4j.gc.enableDirectEncoders"><code>log4j.gc.enableDirectEncoders</code></a> is set to <code>true</code>.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="log4j.gc.encoderCharBufferSize"><a class="anchor" href="#log4j.gc.encoderCharBufferSize"></a><code>log4j.gc.encoderCharBufferSize</code></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 16.6666%;">
+<col style="width: 83.3334%;">
+</colgroup>
+<tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%n</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">The platform dependent line separator</p></td>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Env. variable</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock">LOG4J_GC_ENCODER_CHAR_BUFFER_SIZE</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%N, %nano</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">System.nanoTime() when the event was logged</p></td>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Type</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>int</code></p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%notEmpty{pattern}, %varsNotEmpty{pattern},
-%variablesNotEmpty{pattern}</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Outputs the result of evaluating the
-pattern if and only if all variables in the pattern are not empty -
-garbage-free since 2.8</p></td>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Default value</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>4096</code></p></td>
 </tr>
+</tbody>
+</table>
+<div class="paragraph">
+<p>The size in <code>char</code>s of the <a href="../https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html">ByteBuffer</a>s stored in <code>ThreadLocal</code> fields <a href="../javadoc/log4j-core/org/apache/logging/log4j/core/layout/StringBuilderEncoder">StringBuilderEncoder</a>s.</p>
+</div>
+<div class="paragraph">
+<p>This setting is only used if <a href="#log4j.gc.enableDirectEncoders"><code>log4j.gc.enableDirectEncoders</code></a> is set to <code>true</code>.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="log4j.gc.initialReusableMsgSize"><a class="anchor" href="#log4j.gc.initialReusableMsgSize"></a><code>log4j.gc.initialReusableMsgSize</code></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 16.6666%;">
+<col style="width: 83.3334%;">
+</colgroup>
+<tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%p, %level</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">The level of the logging event</p></td>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Env. variable</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock">LOG4J_GC_INITIAL_REUSABLE_MSG_SIZE</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%r, %relative</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">The number of milliseconds elapsed since the JVM was
-started until the creation of the logging event - garbage-free since 2.8</p></td>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Type</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>int</code></p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%sn, %sequenceNumber</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">A sequence number that will be incremented in
-every event - garbage-free since 2.8</p></td>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Default value</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>128</code></p></td>
 </tr>
+</tbody>
+</table>
+<div class="paragraph">
+<p>In GC-free mode, this property determines the initial size of the reusable <code>StringBuilder</code>s used by <a href="../javadoc/log4j-api/org/apache/logging/log4j/message/ReusableMessage">ReusableMessages</a> for formatting purposes.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="log4j.gc.maxReusableMsgSize"><a class="anchor" href="#log4j.gc.maxReusableMsgSize"></a><code>log4j.gc.maxReusableMsgSize</code></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 16.6666%;">
+<col style="width: 83.3334%;">
+</colgroup>
+<tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%style{pattern}{ANSI style}</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Style the message - garbage-free since
-2.7 (unless nested pattern is not garbage free)</p></td>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Env. variable</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock">LOG4J_GC_MAX_REUSABLE_MSG_SIZE</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%T, %tid, %threadId</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">The ID of the thread that generated the logging
-event</p></td>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Type</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>int</code></p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%t, %tn, %thread, %threadName</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">The name of the thread that generated
-the logging event</p></td>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Default value</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>518</code></p></td>
 </tr>
+</tbody>
+</table>
+<div class="paragraph">
+<p>In GC-free mode, this property determines the maximum size of the reusable <code>StringBuilder</code>s used by <a href="../javadoc/log4j-api/org/apache/logging/log4j/message/ReusableMessage">ReusableMessages</a> for formatting purposes.</p>
+</div>
+<div class="paragraph">
+<p>The default value allows is equal to <code>2 &times; (2 &times; log4j.initialReusableMsgSize + 2) + 2</code> and allows the
+<code>StringBuilder</code> to be resized twice by the current JVM resize algorithm.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="log4j.gc.layoutStringBuilderMaxSize"><a class="anchor" href="#log4j.gc.layoutStringBuilderMaxSize"></a><code>log4j.gc.layoutStringBuilderMaxSize</code></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 16.6666%;">
+<col style="width: 83.3334%;">
+</colgroup>
+<tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%tp</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">The priority of the thread that generated the logging event</p></td>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Env. variable</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock">LOG4J_GC_LAYOUT_STRING_BUILDER_MAX_SIZE</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%X{key[,key2&#8230;&#8203;]}, %mdc{key[,key2&#8230;&#8203;]}, %MDC{key[,key2&#8230;&#8203;]}</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Outputs
-the Thread Context Map (also known as the Mapped Diagnostic Context or
-MDC) associated with the thread that generated the logging event -
-garbage-free since 2.8</p></td>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Type</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>int</code></p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>literal text</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Garbage-free unless literal contains '${' (variable
-substitution)</p></td>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Default value</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>2048</code></p></td>
 </tr>
 </tbody>
 </table>
 <div class="paragraph">
-<p>Other PatternLayout conversion patterns, and other Layouts may be
-updated to avoid creating temporary objects in future releases. (Patches
-welcome!)</p>
+<p>This property determines the maximum size of the reusable <code>StringBuilder</code>s used to format <a href="../javadoc/log4j-core/org/apache/logging/log4j/core/LogEvent">LogEvents</a>.</p>
 </div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-Logging exceptions and stack traces will create temporary
-objects with any layout. (However, Layouts will only create these
-temporary objects when an exception actually occurs.) We haven&#8217;t figured
-out a way to log exceptions and stack traces without creating temporary
-objects. That is unfortunate, but you probably still want to log them
-when they happen.
-</td>
-</tr>
-</table>
 </div>
-<div class="sidebarblock">
-<div class="content">
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-patterns containing regular expressions and lookups for property
-substitution will result in temporary objects being created during
-steady-state logging.
-</td>
-</tr>
-</table>
 </div>
+<div class="sect2">
+<h3 id="Layouts"><a class="anchor" href="#Layouts"></a>Layouts</h3>
 <div class="paragraph">
-<p>Including location information is done by walking the stacktrace of an
-exception, which creates temporary objects, so the following patterns
-are not garbage-free:</p>
+<p>The following <a href="layouts.html" class="xref page">layouts</a> can be configured to run garbage-free during steady-state logging.
+To understand which configuration knobs exhibit what kind of allocation behaviour, see their dedicated pages.</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>%C, %class - Class Name</p>
+<p><a href="layouts.html#GELFLayout" class="xref page"><code>GelfLayout</code></a></p>
 </li>
 <li>
-<p>%F, %file - File Location</p>
+<p><a href="json-template-layout.html#faq-garbage-free" class="xref page"><code>JsonTemplateLayout</code></a></p>
 </li>
 <li>
-<p>%l, %location - Location</p>
-</li>
-<li>
-<p>%L, %line - Line Location</p>
-</li>
-<li>
-<p>%M, %method - Method Location</p>
+<p><a href="layouts.html#PatternLayout-gcfree" class="xref page"><code>PatternLayout</code></a></p>
 </li>
 </ul>
 </div>
+<details>
+<summary class="title">Implementation notes</summary>
+<div class="content">
 <div class="paragraph">
-<p>Also, the pattern converters for formatting Throwables are not
-garbage-free:</p>
+<p>Garbage-free <a href="layouts.html" class="xref page">layouts</a> need to implement the <code>Encoder&lt;LogEvent&gt;</code> interface.
+<a href="../javadoc/log4j-core/org/apache/logging/log4j/core/layout/StringBuilderEncoder.html"><code>StringBuilderEncoder</code></a> helps with encoding text to bytes in a garbage-free manner.</p>
+</div>
+</div>
+</details>
+</div>
+<div class="sect2">
+<h3 id="Appenders"><a class="anchor" href="#Appenders"></a>Appenders</h3>
+<div class="paragraph">
+<p>The following <a href="appenders.html" class="xref page">appenders</a> are garbage-free during steady-state logging:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>%ex, %exception, %throwable - The Throwable trace bound to the
-LoggingEvent</p>
+<p><a href="appenders.html#ConsoleAppender" class="xref page"><code>ConsoleAppender</code></a></p>
+</li>
+<li>
+<p><a href="appenders.html#FileAppender" class="xref page"><code>FileAppender</code></a></p>
+</li>
+<li>
+<p><a href="appenders.html#MemoryMappedFileAppender" class="xref page"><code>MemoryMappedFileAppender</code></a></p>
 </li>
 <li>
-<p>%rEx, %rException %rThrowable - Same as %ex but with wrapping
-exceptions</p>
+<p><a href="appenders.html#RandomAccessFileAppender" class="xref page"><code>RandomAccessFileAppender</code></a></p>
 </li>
 <li>
-<p>%xEx, %xException, %xThrowable - Same as %ex but with class packaging
-information</p>
+<p><a href="appenders.html#RollingFileAppender" class="xref page"><code>RollingFileAppender</code></a> (except during rollover)</p>
 </li>
 <li>
-<p>%u, %uuid - Creates a new random or time-based UUID while formatting</p>
+<p><a href="appenders.html#RollingRandomAccessFileAppender" class="xref page"><code>RollingRandomAccessFileAppender</code></a> (except during rollover)</p>
 </li>
 </ul>
 </div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="api"><a class="anchor" href="#api"></a>API Changes</h3>
-<div class="paragraph">
-<p>Methods have been added to the <code>Logger</code> interface so that no vararg
-array objects are created when logging messages with up to ten
-parameters.</p>
-</div>
-<div class="paragraph">
-<p>Also, methods have been added to the <code>Logger</code> interface to log
-<code>java.lang.CharSequence</code> messages. User-defined objects that implement
-the <code>CharSequence</code> interface can be logged without creating temporary
-objects: Log4j will try to turn CharSequence messages, Object messages
-and message parameters into text by appending them to a StringBuilder as
-a CharSequence. This avoids calling <code>toString()</code> on these objects.</p>
-</div>
 <div class="paragraph">
-<p>An alternative is to implement the
-<a href="http://logging.apache.org/log4j/2.x/log4j-api/xref/org/apache/logging/log4j/util/StringBuilderFormattable.html"><code>org.apache.logging.log4j.util.StringBuilderFormattable</code></a>
-interface. If an object is logged that implements this interface, its
-<code>formatTo</code> method is called instead of <code>toString()</code>.</p>
+<p>Any other appender not shared in the above list (including <a href="appenders.html#AsyncAppender" class="xref page"><code>AsyncAppender</code></a>) is not garbage-free.</p>
 </div>
-</div>
-<div class="sect2">
-<h3 id="codeImpact"><a class="anchor" href="#codeImpact"></a>Impact on Application Code: Autoboxing</h3>
-<div class="paragraph">
-<p>We made an effort to make logging garbage-free without requiring code
-changes in existing applications, but there is one area where this was
-not possible. When logging primitive values (i.e. int, double, boolean,
-etc.) the JVM autoboxes these primitive values to their Object wrapper
-equivalents, creating garbage.</p>
-</div>
-<div class="paragraph">
-<p>Log4j provides an <code>Unbox</code> utility to prevent autoboxing of primitive
-parameters. This utility contains a thread-local pool of reused
-<code>StringBuilder`s. The `Unbox.box(primitive)</code> methods write directly into
-a StringBuilder, and the resulting text will be copied into the final
-log message text without creating temporary objects.</p>
-</div>
-<div class="listingblock">
+<details>
+<summary class="title">Implementation notes</summary>
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">import static org.apache.logging.log4j.util.Unbox.box;
-
-// ...
-public void garbageFree() {
-    logger.debug("Prevent primitive autoboxing {} {}", box(10L), box(2.6d));
-}</code></pre>
-</div>
+<div class="paragraph">
+<p>Garbage-free <a href="appenders.html" class="xref page">appenders</a> need to provide their <a href="layouts.html" class="xref page">layout</a> with a <code>ByteBufferDestination</code> implementation that the layout can directly write into.</p>
 </div>
-<div class="sidebarblock">
-<div class="content">
 <div class="admonitionblock note">
 <table>
 <tr>
@@ -876,227 +736,332 @@ public void garbageFree() {
 <i class="fa icon-note" title="Note"></i>
 </td>
 <td class="content">
-not all logging is garbage free. Specifically:
+<div class="paragraph">
+<p><code>AbstractOutputStreamAppender</code> has been modified to make the following appenders garbage-free:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><code>ConsoleAppender</code></p>
+</li>
+<li>
+<p><code>(Rolling)FileAppender</code></p>
+</li>
+<li>
+<p><code>(Rolling)RandomAccessFileAppender</code></p>
+</li>
+<li>
+<p><code>MemoryMappedFileAppender</code></p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>An effort has been made to minimize impact on custom appenders that extend <code>AbstractOutputStreamAppender</code>, but it is impossible to guarantee that changing the superclass will not impact any and all subclasses.
+Custom appenders that extend <code>AbstractOutputStreamAppender</code> should verify that they still function correctly.
+In case there is a problem, <a href="#log4j2.enableDirectEncoders">the <code>log4j2.enableDirectEncoders</code> system property</a> can be set to <code>false</code> to revert to the pre-Log4j 2.6 behaviour.</p>
+</div>
 </td>
 </tr>
 </table>
 </div>
+</div>
+</details>
+</div>
+<div class="sect2">
+<h3 id="Filters"><a class="anchor" href="#Filters"></a>Filters</h3>
+<div class="paragraph">
+<p>The following <a href="filters.html" class="xref page">filters</a> are garbage-free during steady-state logging:</p>
+</div>
 <div class="ulist">
 <ul>
 <li>
-<p>The ThreadContext map is not garbage-free by default, but can be
-configured to be garbage-free by setting system property
-<code>log4j2.garbagefreeThreadContextMap</code> to "true".</p>
+<p><a href="filters.html#CompositeFilter" class="xref page"><code>CompositeFilter</code></a> (adding and removing element filters creates temporary
+objects for thread safety)</p>
 </li>
 <li>
-<p>The ThreadContext stack is not garbage-free.</p>
+<p><a href="filters.html#DynamicThresholdFilter" class="xref page"><code>DynamicThresholdFilter</code></a></p>
 </li>
 <li>
-<p>Logging more than 10 parameters creates vararg arrays.</p>
+<p><a href="filters.html#LevelRangeFilter" class="xref page"><code>LevelRangeFilter</code></a> (garbage-free since <code>2.8</code>)</p>
 </li>
 <li>
-<p>Logging very large messages (more than 518 characters) when all
-loggers are Async Loggers will cause the internal StringBuilder in the
-RingBuffer to be trimmed back to their max size.</p>
+<p><a href="filters.html#MapFilter" class="xref page"><code>MapFilter</code></a> (garbage-free since <code>2.8</code>)</p>
 </li>
 <li>
-<p>Logging messages containing '${': substituting a <code>${variable}</code> creates
-temporary objects.</p>
+<p><a href="filters.html#MarkerFilter" class="xref page"><code>MarkerFilter</code></a> (garbage-free since <code>2.8</code>)</p>
 </li>
 <li>
-<p>Logging a lambda <em>as a parameter</em>
-(<code>logger.info("lambda value is {}", () &#8594; callExpensiveMethod())</code>)
-creates a vararg array. Logging a lambda expression by itself is
-garbage-free: <code>logger.debug) &#8594; callExpensiveMethod(</code>.</p>
+<p><a href="filters.html#StructuredDataFilter" class="xref page"><code>StructuredDataFilter</code></a> (garbage-free since <code>2.8</code>)</p>
 </li>
 <li>
-<p>The <code>Logger.traceEntry</code> and <code>Logger.traceExit</code> methods create
-temporary objects.</p>
+<p><a href="filters.html#ThreadContextMapFilter" class="xref page"><code>ThreadContextMapFilter</a></code> (garbage-free since <code>2.8</code>)</p>
 </li>
 <li>
-<p>Time calculations are not garbage free when log4j2.usePreciseClock is set to true.
-The default is false.</p>
+<p><a href="filters.html#ThresholdFilter" class="xref page"><code>ThresholdFilter</code></a> (garbage-free since <code>2.8</code>)</p>
+</li>
+<li>
+<p><a href="filters.html#TimeFilter" class="xref page"><code>TimeFilter</code></a> (garbage-free since <code>2.8</code> except when range must be recalculated once per day)</p>
 </li>
 </ul>
 </div>
+<div class="paragraph">
+<p>Any other filter not shared in the above list is not garbage-free.</p>
 </div>
 </div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="Performance"><a class="anchor" href="#Performance"></a>Performance</h2>
-<div class="sectionbody">
 <div class="sect2">
-<h3 id="Latency"><a class="anchor" href="#Latency"></a>Response Time Latency</h3>
+<h3 id="recyclers"><a class="anchor" href="#recyclers"></a>Recyclers</h3>
 <div class="paragraph">
-<p>Response time is how long it takes to log a message under a certain
-load. What is often reported as latency is actually <em>service time</em>: how
-long it took to perform the operation. This hides the fact that a single
-spike in service time adds queueing delay for many of the subsequent
-operations. Service time is easy to measure (and often looks good on
-paper) but is irrelevant for users since it omits the time spent waiting
-for service. For this reason we report response time: service time plus
-wait time. See the <a href="performance.html" class="xref page">response time
-section</a> of the performance page for more detail.</p>
+<p>Log4j contains the <em>recycler</em> abstraction that models the buffer-and-reuse strategy used to operate without any extra memory allocations at steady state.
+Recyclers implement the <code>RecyclerFactoryProvider</code> interface in <code>log4j-kit</code> (a dependency of <code>log4j-core</code>) and provide themselves as a <code>ServiceLoader</code>.
+Hence, you can easily implement custom recyclers and inject them using the <code>ServiceLoader</code> mechanism.</p>
 </div>
 <div class="paragraph">
-<p>The response time test results below were all derived from running the
-ResponseTimeTest class which can be found in the Log4j 2 unit test
-source directory. If you want to run these tests yourself, here are the
-command line options we used:</p>
+<p>Log4j chooses a recycler using the following procedure:</p>
 </div>
-<div class="ulist">
-<ul>
-<li>
-<p>-Xms1G -Xmx1G (prevent heap resizing during the test)</p>
-</li>
-<li>
-<p>-DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector
--DAsyncLogger.WaitStrategy=busyspin (to use Async Loggers. The BusySpin
-wait strategy reduces some jitter.)</p>
-</li>
+<div class="olist arabic">
+<ol class="arabic">
 <li>
-<p><strong>classic mode:</strong> -Dlog4j2.enable.direct.encoders=false<br>
-<strong>garbage-free mode:</strong> -Dlog4j2.enable.direct.encoders=true</p>
+<p>Using <code>ServiceLoader</code> mechanism, loads all available <code>RecyclerFactoryProvider</code> implementations</p>
 </li>
 <li>
-<p>-XX:CompileCommand=dontinline,org.apache.logging.log4j.core.async.perftest.NoOpIdleStrategy::idle</p>
+<p>Sorts providers (the lower <code>order</code> value will come first)</p>
 </li>
 <li>
-<p>-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps
--XX:+PrintTenuringDistribution -XX:+PrintGCApplicationConcurrentTime
--XX:+PrintGCApplicationStoppedTime (to eyeball GC and safepoint pauses)</p>
+<p>If <a href="#log4j.recycler.factory">[log4j.recycler.factory]</a> is provided, the first provider whose name matching with this property value will be used. Otherwise, the first provider will be used.</p>
 </li>
-</ul>
+</ol>
 </div>
+<div class="paragraph">
+<p>The predefined recycler factory providers are as follows:</p>
 </div>
-<div class="sect2">
-<h3 id="_async_loggers"><a class="anchor" href="#_async_loggers"></a>Async Loggers</h3>
+<div class="sect3">
+<h4 id="recyclers-dummy"><a class="anchor" href="#recyclers-dummy"></a>Dummy recycler</h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 16.6666%;">
+<col style="width: 83.3334%;">
+</colgroup>
+<tbody>
+<tr>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Module</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>log4j-kit</code></p></td>
+</tr>
+<tr>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Name</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>dummy</code></p></td>
+</tr>
+<tr>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Order</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock">900</p></td>
+</tr>
+</tbody>
+</table>
 <div class="paragraph">
-<p>The graph below compares "classic" logging to garbage-free logging
-response time behaviour for Log4j&#8217;s Async Loggers. In the graph, "100k"
-means logging at a sustained load of 100,000 messages/second, "800k" is
-a sustained load of 800,000 messages/second.</p>
+<p>Does not recycle anything; all instances are freshly created.
+(Not recommended for production!
+Intended as a test utility.)</p>
+</div>
 </div>
+<div class="sect3">
+<h4 id="recyclers-threadLocal"><a class="anchor" href="#recyclers-threadLocal"></a>Thread-local recycler</h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 16.6666%;">
+<col style="width: 83.3334%;">
+</colgroup>
+<tbody>
+<tr>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Module</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>log4j-kit</code></p></td>
+</tr>
+<tr>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Name</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>threadLocal</code></p></td>
+</tr>
+<tr>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Order</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Integer.MAX_VALUE</code>, if <code>javax.servlet.Servlet</code> or <code>jakarta.servlet.Servlet</code> is in the classpath;<br>
+700, otherwise</p></td>
+</tr>
+</tbody>
+</table>
 <div class="paragraph">
-<p><span class="image"><img src="../_images/ResponseTimeAsyncClassicVsGcFree-label.png" alt="image"></span></p>
+<p>Pools objects in a fixed-size queue stored in a <code>ThreadLocal</code>.
+If pool runs out of capacity (see <a href="#log4j.recycler.capacity">[log4j.recycler.capacity]</a>), it will start creating fresh instances for new requests.</p>
 </div>
 <div class="paragraph">
-<p>In <strong>classic</strong> mode we see numerous minor garbage collections which pause
-the application threads for 3 milliseconds or more. This quickly adds up
-to response time delays of almost 10 milliseconds. As you can see in the
-graph, increasing the load shifts the curve to the left (there are more
-spikes). This makes sense: logging more means more pressure on the
-garbage collector resulting in more minor GC pauses. We experimented a
-little with reducing the load to 50,000 or even 5000 messages/second,
-but this did not eliminate the 3 millisecond pauses, it just made them
-occur less frequently. Note that all GC pauses in this test are minor GC
-pauses. We did not see any full garbage collections.</p>
+<p>Note that it is effectively disabled for servlet environments.</p>
 </div>
+</div>
+<div class="sect3">
+<h4 id="recyclers-queue"><a class="anchor" href="#recyclers-queue"></a>Queueing recycler</h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 16.6666%;">
+<col style="width: 83.3334%;">
+</colgroup>
+<tbody>
+<tr>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Module</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>log4j-kit</code></p></td>
+</tr>
+<tr>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Name</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>queue</code></p></td>
+</tr>
+<tr>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Order</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock">800</p></td>
+</tr>
+</tbody>
+</table>
 <div class="paragraph">
-<p>In <strong>garbage-free</strong> mode, maximum response time remains well below 1
-millisecond under a wide range of loads. (Max 780 us at 800,000
-messages/sec, max 407 us at 600,000 messages/sec, with the 99% around 5
-us for all loads up to 800,000 messages/sec.) Increasing or decreasing
-the load does not change the response time behaviour. We did not
-investigate the cause of the 200-300 microsecond pauses we saw in these
-tests.</p>
+<p>Pools objects in a fixed-size <code>ArrayBlockingQueue</code> queue.
+If pool runs out of capacity (see <a href="#log4j.recycler.capacity">[log4j.recycler.capacity]</a>), it will start creating fresh instances for new requests.</p>
+</div>
 </div>
+<div class="sect3">
+<h4 id="recyclers-jctools"><a class="anchor" href="#recyclers-jctools"></a>JCTools MPMC recycler</h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 16.6666%;">
+<col style="width: 83.3334%;">
+</colgroup>
+<tbody>
+<tr>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Module</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>log4j-jctools</code></p></td>
+</tr>
+<tr>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Name</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>jctools-mpmc</code></p></td>
+</tr>
+<tr>
+<th class="tableblock halign-left valign-top"><p class="tableblock">Order</p></th>
+<td class="tableblock halign-left valign-top"><p class="tableblock">600</p></td>
+</tr>
+</tbody>
+</table>
 <div class="paragraph">
-<p>When we increased the load further we begin to see larger response time
-pauses for both classic and garbage-free logging. At sustained loads of
-1 million messages/second or more we start to approach the maximum
-throughput of the underlying RandomAccessFile Appender (see the
-synchronous logging throughput chart below). At these loads the
-ringbuffer starts to fill up and backpressure kicks in: attempting to
-add another message when the ringbuffer is full will block until a free
-slot becomes available. We start to see response times of tens of
-milliseconds or more; and attempting to increase the load even more
-results in larger and larger response time spikes.</p>
+<p>Pools objects in a fixed-size JCTools MPMC queue.
+If pool runs out of capacity (see <a href="#log4j.recycler.capacity">[log4j.recycler.capacity]</a>), it will start creating fresh instances for new requests.</p>
+</div>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_synchronous_file_logging"><a class="anchor" href="#_synchronous_file_logging"></a>Synchronous File Logging</h3>
+<h3 id="core-limitations"><a class="anchor" href="#core-limitations"></a>Limitations</h3>
 <div class="paragraph">
-<p>With synchronous file logging, garbage-free logging still performs
-better than classic logging, but the difference is less pronounced.</p>
+<p>There are certain caveats associated with the configuration of garbage-free logging:</p>
+</div>
+<div id="core-limitation-properties" class="dlist">
+<dl>
+<dt class="hdlist1"><code>&lt;Properties&gt;</code> section</dt>
+<dd>
+<p>A configuration containing <a href="configuration.html#PropertySubstitution" class="xref page">a <code>&lt;Properties&gt;</code> section</a> will result in temporary objects being created during steady-state logging.</p>
+</dd>
+</dl>
+</div>
+<div id="core-limitation-async-logger-wait-strategy" class="dlist">
+<dl>
+<dt class="hdlist1">Asynchronous logger wait strategies</dt>
+<dd>
+<p>As of version <code>2.18.0</code>, the default <a href="async.html" class="xref page">asynchronous logger</a> wait strategy (i.e., <code>Timeout</code>) is garbage-free while running against both LMAX Disruptor 3 and 4.
+See <a href="async.html#log4j2.asyncLoggerWaitStrategy" class="xref page"><code>log4j2.asyncLoggerWaitStrategy</code></a> for details on predefined wait strategies.</p>
+</dd>
+</dl>
 </div>
-<div class="paragraph">
-<p>At a workload of 100,000 messages/second, classic logging max response
-time was a little over 2 milliseconds where garbage-free logging was a
-little over 1 millisecond. When the workload is increased to 300,000
-messages/second, classic logging shows response time pauses of 6
-milliseconds where the garbage-free response times were less than 3
-milliseconds. It may be possible to improve on this, we did not
-investigate further yet.</p>
 </div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="api"><a class="anchor" href="#api"></a>Log4j API usage</h2>
+<div class="sectionbody">
 <div class="paragraph">
-<p><span class="image"><img src="../_images/ResponseTimeSyncClassicVsGcFree.png" alt="image"></span></p>
+<p><a href="api.html" class="xref page">Log4j API</a> contains several features to facilitate garbage-free logging:</p>
 </div>
+<div class="sect2">
+<h3 id="api-vararg"><a class="anchor" href="#api-vararg"></a>Parameterized message arguments</h3>
 <div class="paragraph">
-<p>The above results are obtained with the ResponseTimeTest class which can
-be found in the Log4j 2 unit test source directory, running on JDK
-1.8.0_45 on RHEL 6.5 (Linux 2.6.32-573.1.1.el6.x86_64) with 10-core Xeon
-CPU E5-2660 v3 @2.60GHz with hyperthreading switched on (20 virtual
-cores).</p>
+<p>The <code>Logger</code> interface contains methods for parameterized messages up to 10 arguments.
+Logging more than 10 parameters creates <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/language/varargs.html">vararg arrays</a>.</p>
 </div>
 </div>
 <div class="sect2">
-<h3 id="Throughput"><a class="anchor" href="#Throughput"></a>Classic Logging has Slightly Higher Throughput</h3>
+<h3 id="api-encode-custom-object"><a class="anchor" href="#api-encode-custom-object"></a>Encoding custom objects</h3>
 <div class="paragraph">
-<p>Throughput is slightly worse for garbage-free logging, compared to
-classic logging. This is true for both synchronous and asynchronous
-logging. The graph below compares the sustained throughput of
-synchronous logging to a file with Log4j 2.6 in garbage-free mode,
-classic mode and Log4j 2.5.</p>
+<p>When a message parameter contains an unknown type by the layout, it will encode by calling <code>toString()</code> on these objects.
+Most objects don&#8217;t have garbage-free <code>toString()</code> methods.
+Objects themselves can implement their own garbage-free encoders by either extending from <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html">Java&#8217;s <code>CharSequence</code></a> or <a href="../javadoc/log4j-api/org/apache/logging/log4j/util/StringBuilderFormattable.html">Log4j&#8217;s <code>StringBuilderFormattable</code></a>.</p>
 </div>
-<div class="paragraph">
-<p><span class="image"><img src="../_images/garbage-free2.6-SyncThroughputLinux.png" alt="Throughput of Log4j 2.6 in garbage-free mode is slightly worse than in classic mode" width="but on par with 2.5 and much better than alternatives logging libraries"></span></p>
 </div>
+<div class="sect2">
+<h3 id="codeImpact"><a class="anchor" href="#codeImpact"></a>Avoiding autoboxing</h3>
 <div class="paragraph">
-<p>The results above are obtained with the
-<a href="http://openjdk.java.net/projects/code-tools/jmh/">JMH</a> Java benchmark
-harness. See the FileAppenderBenchmark source code in the log4j-perf-test
-module.</p>
-</div>
+<p>We made an effort to make logging garbage-free without requiring code changes in existing applications, but there is one area where this was not possible.
+<a href="https://docs.oracle.com/javase/tutorial/java/data/autoboxing.html">When logging primitive values (i.e., <code>int</code>, <code>double</code>, <code>boolean</code>, etc.) the JVM autoboxes these primitive values to their <code>Object</code> wrapper equivalents, creating garbage.</a>
+Log4j provides an <code>Unbox</code> utility to prevent autoboxing of primitive parameters:</p>
 </div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">import static org.apache.logging.log4j.util.Unbox.box;
+
+LOGGER.debug("Prevent primitive autoboxing {} {}", box(10L), box(2.6d));</code></pre>
 </div>
 </div>
-<div class="sect1">
-<h2 id="UnderTheHood"><a class="anchor" href="#UnderTheHood"></a>Under the Hood</h2>
-<div class="sectionbody">
 <div class="paragraph">
-<p>Custom Message implementations that implement
-<code>org.apache.logging.log4j.util.StringBuilderFormattable</code> can be
-converted to text by garbage-free Layouts without creating temporary
-objects. PatternLayout uses this mechanism and other layouts that
-convert LogEvents to text will likely also look for this interface.</p>
+<p>This utility contains a <code>ThreadLocal</code> pool of reused <code>StringBuilder</code>s.
+The pool size is configured by <a href="#log4j2.unboxRingbufferSize">the <code>log4j2.unboxRingbufferSize</code> system property</a>.
+The <code>Unbox.box(primitive)</code> methods write directly into a <code>StringBuilder</code>, and the resulting text will be copied into the final log message text without creating temporary objects.</p>
+</div>
 </div>
+<div class="sect2">
+<h3 id="api-limitations"><a class="anchor" href="#api-limitations"></a>Limitations</h3>
 <div class="paragraph">
-<p>Custom Layouts that want to be garbage-free should implement the
-<code>Encoder&lt;LogEvent&gt;</code> interface. For custom Layouts that convert a
-LogEvent to a text representation, the
-<code>org.apache.logging.log4j.core.layout.StringBuilderEncoder</code> class may be
-useful to convert this text to bytes in a garbage-free manner.</p>
+<p>Not all Log4j API feature set is garbage-free, specifically:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>The <code>ThreadContext</code> map (aka. MDC) is not garbage-free by default, but can be configured to be garbage-free by setting <a href="#log4j2.garbagefreeThreadContextMap">the <code>log4j2.garbagefreeThreadContextMap</code> system property</a> to <code>true</code>.</p>
+</li>
+<li>
+<p>The <code>ThreadContext</code> stack is not garbage-free.</p>
+</li>
+<li>
+<p>Logging very large messages (i.e., more than <a href="#log4j2.maxReusableMsgSize"><code>log4j2.maxReusableMsgSize</code></a> characters, which defaults to 518), when all loggers are <a href="async.html" class="xref page">asynchronous loggers</a>, will cause the internal <code>StringBuilder</code> in the
+<code>RingBuffer</code> to be trimmed back to their configured maximum size.</p>
+</li>
+<li>
+<p>Logging messages containing <code>${variable}</code> substitutions creates temporary objects.</p>
+</li>
+<li>
+<p>Logging a lambda as a parameter:</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">LOGGER.info("lambda value is {}", () -&gt; callExpensiveMethod());</code></pre>
+</div>
 </div>
 <div class="paragraph">
-<p>Custom Appenders that want to be garbage-free should provide their
-Layout with a <code>ByteBufferDestination</code> implementation that the Layout can
-directly write into.</p>
+<p>creates a vararg array.
+Logging a lambda expression by itself:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">LOGGER.debug(() -&gt; callExpensiveMethod());</code></pre>
+</div>
 </div>
 <div class="paragraph">
-<p><code>AbstractOutputStreamAppender</code> has been modified to make the
-ConsoleAppender, (Rolling)FileAppender,
-(Rolling)RandomAccessFileAppender and MemoryMappedFileAppender
-garbage-free. An effort has been made to minimize impact on custom
-Appenders that extend <code>AbstractOutputStreamAppender</code>, but it is
-impossible to guarantee that changing the superclass will not impact any
-and all subclasses. Custom Appenders that extend
-<code>AbstractOutputStreamAppender</code> should verify that they still function
-correctly. In case there is a problem, system property
-<code>log4j2.enable.direct.encoders</code> can be set to "false" to revert to the
-pre-Log4j 2.6 behaviour.</p>
+<p>is garbage-free.</p>
+</div>
+</li>
+<li>
+<p>The <a href="../javadoc/log4j-api/org/apache/logging/log4j/Logger.html#traceEntry()"><code>traceEntry()</code></a> and <a href="../javadoc/log4j-api/org/apache/logging/log4j/Logger.html#traceExit()"><code>traceExit()</code></a> methods create temporary objects.</p>
+</li>
+<li>
+<p>Time calculations are not garbage-free when the <code>log4j2.usePreciseClock</code> system property (defaults to <code>false</code>) is set to <code>true</code>.</p>
+</li>
+</ul>
+</div>
 </div>
 </div>
 </div>
diff --git a/manual/index.html b/manual/index.html
index c18f32d1e6..ac4f239d00 100644
--- a/manual/index.html
+++ b/manual/index.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/installation.html b/manual/installation.html
index 47fa97f4e4..037f924670 100644
--- a/manual/installation.html
+++ b/manual/installation.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/jmx.html b/manual/jmx.html
index 7f89f018e6..2cf67bf8d4 100644
--- a/manual/jmx.html
+++ b/manual/jmx.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/json-template-layout.html b/manual/json-template-layout.html
index 32711f0309..4dc8aada74 100644
--- a/manual/json-template-layout.html
+++ b/manual/json-template-layout.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
@@ -535,7 +538,7 @@ appender.console.layout.eventTemplateUri = classpath:EcsLayout.json</code></pre>
   <code>log4j.layout.jsonTemplate.nullEventDelimiterEnabled</code> property)</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>maxStringLength</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code><a id="maxStringLength"></a> maxStringLength</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>int</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">truncate string values longer than the specified limit (defaults to 16384 set
   by <code>log4j.layout.jsonTemplate.maxStringLength</code> property)</p></td>
@@ -732,7 +735,7 @@ and integrates with <a href="https://cloud.google.com/error-reporting">Google Er
 it at the point of the JSON where they are declared. For instance, <code>marker</code>
 resolver renders the marker of the event, <code>level</code> resolver renders the level,
 and so on. An event template resolver is denoted with a special object
-containing a`$resolver` key:</p>
+containing a <code>$resolver</code> key:</p>
 </div>
 <div class="listingblock">
 <div class="title">Example event template demonstrating the usage of <code>level</code> resolver</div>
@@ -747,9 +750,8 @@ containing a`$resolver` key:</p>
 </div>
 </div>
 <div class="paragraph">
-<p>Here <code>version</code> field will be rendered as is, while <code>level</code> field will be
-populated by the <code>level</code> resolver. That is, this template will generate JSON
-similar to the following:</p>
+<p>Here <code>version</code> field will be rendered as is, while <code>level</code> field will be populated by <a href="#event-template-resolver-level">the <code>level</code> resolver</a>.
+That is, this template will generate JSON similar to the following:</p>
 </div>
 <div class="listingblock">
 <div class="title">Example JSON generated from the demonstrated event template</div>
@@ -1656,6 +1658,22 @@ stackTraceEnabled = "stackTraceEnabled" -&gt; boolean</code></pre>
 <p>Note that this resolver is toggled by
 <code>log4j.layout.jsonTemplate.locationInfoEnabled</code> property.</p>
 </div>
+<div class="admonitionblock warning">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-warning" title="Warning"></i>
+</td>
+<td class="content">
+<div class="paragraph">
+<p>Mind that capturing the source location information is an expensive operation, and is not garbage-free.
+Note that <a href="#event-template-resolver-logger">the <code>logger</code> resolver</a> can generally be used as a zero-cost substitute for <code>className</code>.
+See <a href="layouts.html#LocationInformation" class="xref page">this section of the layouts page</a> for details.</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
 <div class="sect5">
 <h6 id="_examples_12"><a class="anchor" href="#_examples_12"></a>Examples</h6>
 <div class="paragraph">
@@ -2444,6 +2462,31 @@ alternatives.</p>
 </div>
 </div>
 <div class="sect1">
+<h2 id="performance"><a class="anchor" href="#performance"></a>Performance</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>JSON Template Layout is a heavily optimized piece of software to encode a log event as fast as possible.
+To get the most out of it, mind the following checklist:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Enable <a href="garbagefree.html" class="xref page">garbage-free logging</a></p>
+</li>
+<li>
+<p>Mind <a href="#faq-garbage-free">the garbage footprint of features you use</a></p>
+</li>
+<li>
+<p>Choose a <a href="#recycling-strategy">recycling strategy</a> that suits best to your deployment environment</p>
+</li>
+<li>
+<p>Don&#8217;t give too much slack to <a href="#maxStringLength"><code>maxStringLength</code></a> and try to keep it relatively tight</p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect1">
 <h2 id="faq"><a class="anchor" href="#faq"></a>F.A.Q.</h2>
 <div class="sectionbody">
 <div class="sect2">
@@ -2476,9 +2519,8 @@ logging.</p>
 <div class="sect2">
 <h3 id="faq-garbage-free"><a class="anchor" href="#faq-garbage-free"></a>Is <code>JsonTemplateLayout</code> garbage-free?</h3>
 <div class="paragraph">
-<p>Yes, if the garbage-free layout behaviour toggling properties
-<code>log4j2.enableDirectEncoders</code> and <code>log4j2.garbagefreeThreadContextMap</code> are
-enabled. Take into account the following caveats:</p>
+<p>Yes, if <a href="garbagefree.html" class="xref page">garbage-free logging</a> is enabled.
+Take into account the following caveats:</p>
 </div>
 <div class="ulist">
 <ul>
diff --git a/manual/layouts.html b/manual/layouts.html
index a70a97b266..90646b4c9d 100644
--- a/manual/layouts.html
+++ b/manual/layouts.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
@@ -2593,6 +2596,307 @@ should be used.</p>
 </div>
 </div>
 </div>
+<div class="sect2">
+<h3 id="PatternLayout-gcfree"><a class="anchor" href="#PatternLayout-gcfree"></a>Garbage-free configuration</h3>
+<div class="paragraph">
+<p>PatternLayout with the following limited set of conversion patterns is
+garbage-free. Format modifiers to control such things as field width,
+padding, left and right justification will not generate garbage.</p>
+</div>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 33.3333%;">
+<col style="width: 66.6667%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Conversion Pattern</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%c{precision}, %logger{precision}</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Logger name</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%d, %date</code></p></td>
+<td class="tableblock halign-left valign-top"><div class="content"><div class="paragraph">
+<p>Note: Only the predefined date formats are garbage-free: (millisecond
+separator may be either a comma ',' or a period '.')</p>
+</div>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Pattern</th>
+<th class="tableblock halign-left valign-top">Example</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%d{DEFAULT}</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">2012-11-02 14:34:02,781</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%d{ISO8601}</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">2012-11-02T14:34:02,781</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%d{ISO8601_BASIC}</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">20121102T143402,781</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%d{ABSOLUTE}</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">14:34:02,781</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%d{DATE}</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">02 Nov 2012 14:34:02,781</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%d{COMPACT}</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">20121102143402781</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%d{HH:mm:ss,SSS}</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">14:34:02,781</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%d{dd MMM yyyy HH:mm:ss,SSS}</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">02 Nov 2012 14:34:02,781</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%d{HH:mm:ss}{GMT+0}</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">18:34:02</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%d{UNIX}</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">1351866842</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%d{UNIX_MILLIS}</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">1351866842781</p></td>
+</tr>
+</tbody>
+</table></div></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%enc{pattern}, %encode{pattern}</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Encodes special characters such as
+'\n' and HTML characters to help prevent log forging and some XSS
+attacks that could occur when displaying logs in a web browser -
+garbage-free since 2.8</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%equals{pattern}{test}{substitution},
+%equalsIgnoreCase{pattern}{test}{substitution}</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Replaces occurrences
+of 'test', a string, with its replacement 'substitution' in the string
+resulting from evaluation of the pattern - garbage-free since 2.8</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%highlight{pattern}{style}</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Adds ANSI colors - garbage-free since 2.7
+(unless nested pattern is not garbage free)</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%K{key}, %map{key}, %MAP{key}</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Outputs the entries in a
+<a href="../javadoc/log4j-api/org/apache/logging/log4j/message/MapMessage.html">MapMessage</a>,
+if one is present in the event - garbage-free since 2.8.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%m, %msg, %message</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Log message (garbage-free unless message text
+contains '${')</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%marker</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The full name of the marker (including parents) - garbage-free
+since 2.8</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%markerSimpleName</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The simple name of the marker (not including
+parents)</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%maxLen, %maxLength</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Truncates another pattern to some max number of
+characters - garbage-free since 2.8</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%n</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The platform dependent line separator</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%N, %nano</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">System.nanoTime() when the event was logged</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%notEmpty{pattern}, %varsNotEmpty{pattern},
+%variablesNotEmpty{pattern}</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Outputs the result of evaluating the
+pattern if and only if all variables in the pattern are not empty -
+garbage-free since 2.8</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%p, %level</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The level of the logging event</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%r, %relative</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The number of milliseconds elapsed since the JVM was
+started until the creation of the logging event - garbage-free since 2.8</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%sn, %sequenceNumber</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">A sequence number that will be incremented in
+every event - garbage-free since 2.8</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%style{pattern}{ANSI style}</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Style the message - garbage-free since
+2.7 (unless nested pattern is not garbage free)</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%T, %tid, %threadId</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The ID of the thread that generated the logging
+event</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%t, %tn, %thread, %threadName</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The name of the thread that generated
+the logging event</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%tp</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The priority of the thread that generated the logging event</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>%X{key[,key2&#8230;&#8203;]}, %mdc{key[,key2&#8230;&#8203;]}, %MDC{key[,key2&#8230;&#8203;]}</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Outputs
+the Thread Context Map (also known as the Mapped Diagnostic Context or
+MDC) associated with the thread that generated the logging event -
+garbage-free since 2.8</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>literal text</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Garbage-free unless literal contains '${' (variable
+substitution)</p></td>
+</tr>
+</tbody>
+</table>
+<div class="paragraph">
+<p>Other PatternLayout conversion patterns, and other Layouts may be
+updated to avoid creating temporary objects in future releases. (Patches
+welcome!)</p>
+</div>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+Logging exceptions and stack traces will create temporary
+objects with any layout. (However, Layouts will only create these
+temporary objects when an exception actually occurs.) We haven&#8217;t figured
+out a way to log exceptions and stack traces without creating temporary
+objects. That is unfortunate, but you probably still want to log them
+when they happen.
+</td>
+</tr>
+</table>
+</div>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+<div class="paragraph">
+<p>patterns containing regular expressions and lookups for property
+substitution will result in temporary objects being created during
+steady-state logging.</p>
+</div>
+<div class="paragraph">
+<p>Including location information is done by walking the stacktrace of an
+exception, which creates temporary objects, so the following patterns
+are not garbage-free:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>%C, %class - Class Name</p>
+</li>
+<li>
+<p>%F, %file - File Location</p>
+</li>
+<li>
+<p>%l, %location - Location</p>
+</li>
+<li>
+<p>%L, %line - Line Location</p>
+</li>
+<li>
+<p>%M, %method - Method Location</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Also, the pattern converters for formatting Throwables are not
+garbage-free:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>%ex, %exception, %throwable - The Throwable trace bound to the
+LoggingEvent</p>
+</li>
+<li>
+<p>%rEx, %rException %rThrowable - Same as %ex but with wrapping
+exceptions</p>
+</li>
+<li>
+<p>%xEx, %xException, %xThrowable - Same as %ex but with class packaging
+information</p>
+</li>
+<li>
+<p>%u, %uuid - Creates a new random or time-based UUID while formatting</p>
+</li>
+</ul>
+</div>
+</td>
+</tr>
+</table>
+</div>
+</div>
+<div class="sect2">
+<h3 id="PatternLayout-performance"><a class="anchor" href="#PatternLayout-performance"></a>Performance</h3>
+<div class="paragraph">
+<p>Great effort has been put into the efficiency of Pattern Layout.
+To get the most out of it, mind the following checklist:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Enable <a href="garbagefree.html" class="xref page">garbage-free logging</a></p>
+</li>
+<li>
+<p>Mind <a href="#PatternLayout-gcfree">the garbage footprint of features you use</a></p>
+</li>
+<li>
+<p>Don&#8217;t give too much slack to <a href="configuration.html#log4j2.layoutStringBuilderMaxSize" class="xref page"><code>log4j2.layoutStringBuilderMaxSize</code></a> and try to keep it relatively tight</p>
+</li>
+</ul>
+</div>
+</div>
 </div>
 </div>
 <div class="sect1">
@@ -2820,35 +3124,59 @@ within the message text.</p></td>
 </div>
 </div>
 <div class="sect1">
-<h2 id="LocationInformation"><a class="anchor" href="#LocationInformation"></a>Location Information</h2>
+<h2 id="LocationInformation"><a class="anchor" href="#LocationInformation"></a>Location information</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>If one of the layouts is configured with a location-related attribute
-like HTML <a href="#HtmlLocationInfo">locationInfo</a>, or one of the patterns
-<a href="#PatternClass">%C or %class</a>, <a href="#PatternFile">%F or %file</a>,
-<a href="#PatternLocation">%l or %location</a>, <a href="#PatternLine">%L or %line</a>,
-<a href="#PatternMethod">%M or %method</a>, Log4j will take a snapshot of the
-stack, and walk the stack trace to find the location information.</p>
+<p>Several layouts offer directives to include the <em>location information</em>: the caller class, method, file, and line.
+Log4j takes a snapshot of the stack, and walks the stack trace to find the location information.
+<strong>This is an expensive operation</strong> and should be avoided in performance-sensitive setups.</p>
 </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>This is an expensive operation: 1.3 - 5 times slower for synchronous
-loggers. Synchronous loggers wait as long as possible before they take
-this stack snapshot. If no location is required, the snapshot will never
-be taken.</p>
+<p>Note that <em>the caller class</em> of the location information and <em>the logger name</em> are two different things.
+In most setups just using <em>the logger name</em> – which doesn&#8217;t incur any overhead to obtain while logging! – is a sufficient and <strong>zero-cost substitute for the caller class</strong>.</p>
+</div>
+<details>
+<summary class="title">Example demonstrating that the logger name can be a substitute for the caller name</summary>
+<div class="content">
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">package com.mycompany;
+
+public class PaymentService {
+
+    // Logger name: `com.mycompany.PaymentService`
+    private static final Logger LOGGER = LogManager.getLogger();
+
+    private static final class PaymentTransaction {
+        void doPayment() {
+            // Caller class: `com.mycompany.PaymentService$PaymentTransaction`
+            LOGGER.trace("...");
+        }
+    }
+
+}</code></pre>
+</div>
 </div>
 <div class="paragraph">
-<p>However, asynchronous loggers need to make this decision before passing
-the log message to another thread; the location information will be lost
-after that point. The
-<a href="performance.html#asyncLoggingWithLocation" class="xref page">performance impact</a> of
-taking a stack trace snapshot is even higher for asynchronous loggers:
-logging with location is 30-100 times slower than without location. For
-this reason, asynchronous loggers and asynchronous appenders do not
-include location information by default.</p>
+<p>In the above example, if <em>the caller class</em> (which is expensive to compute!) is omitted in the layout, the produced log line will still be likely to contain sufficient information to trace back the source by just looking at <em>the logger name</em>.</p>
+</div>
+</div>
+</details>
+</td>
+</tr>
+</table>
 </div>
 <div class="paragraph">
-<p>You can override the default behaviour in your logger or asynchronous
-appender configuration by specifying <code>includeLocation="true"</code>.</p>
+<p>Asynchronous loggers need to capture the location information before passing the log message to another thread; otherwise the location information will be lost after that point.
+Due to associated performance implications, <a href="async.html" class="xref page">asynchronous loggers</a> and <a href="appenders.html#AsyncAppender" class="xref page">asynchronous appenders</a> do <strong>not</strong> include location information by default.
+You can override the default behaviour in your asynchronous logger or asynchronous appender configuration.</p>
 </div>
 </div>
 </div>
diff --git a/manual/log4j1-compat.html b/manual/log4j1-compat.html
index 3ac4c40575..84d620c84f 100644
--- a/manual/log4j1-compat.html
+++ b/manual/log4j1-compat.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/logbuilder.html b/manual/logbuilder.html
index 3d9433bffe..34967cb229 100644
--- a/manual/logbuilder.html
+++ b/manual/logbuilder.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/logsep.html b/manual/logsep.html
index 626e47573c..fecd1e81ed 100644
--- a/manual/logsep.html
+++ b/manual/logsep.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/lookups.html b/manual/lookups.html
index c27b443f6f..a85b003666 100644
--- a/manual/lookups.html
+++ b/manual/lookups.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/markers.html b/manual/markers.html
index 9d9adc131e..18bb50cf93 100644
--- a/manual/markers.html
+++ b/manual/markers.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/messages.html b/manual/messages.html
index d43dc7858a..06b17ff64a 100644
--- a/manual/messages.html
+++ b/manual/messages.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/migration.html b/manual/migration.html
index 260e3d44bb..862763ad28 100644
--- a/manual/migration.html
+++ b/manual/migration.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/performance.html b/manual/performance.html
index 04b83b3d88..8c38a7c2f6 100644
--- a/manual/performance.html
+++ b/manual/performance.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item is-current-page" 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>
@@ -302,481 +305,322 @@
 <div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>Apart from functional requirements, an important reason for selecting a
-logging library is often how well it fulfills non-functional
-requirements like reliability and performance.</p>
-</div>
-<div class="paragraph">
-<p>This page compares the performance of a number of logging frameworks
-(java.util.logging "JUL", Logback, Log4j 1.2 and Log4j 2.6), and
-documents some performance trade-offs for Log4j 2 functionality.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="benchmarks"><a class="anchor" href="#benchmarks"></a>Benchmarks</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Performance can mean different things to different people. Common terms
-in this context are throughput and latency: <em>Throughput</em> is a measure of
-capacity and can be expressed in a single number: how many messages can
-be logged in a certain period of time. <em>Response time latency</em> is how
-long it takes to log a message. This cannot be expressed in a single
-number because each measurement has its own response time and we are
-often most interested in the outliers: how many there were and how large
-they were.</p>
+<p>In this page we will guide you through certain steps that will show how to improve the performance of your Log4j configuration to serve your particular use case best.</p>
 </div>
 <div class="paragraph">
-<p>When evaluating a logging framework&#8217;s performance these may be useful
-questions to ask:</p>
+<p>The act of logging is an interplay between the logging API (i.e., Log4j API) where the programmer publishes logs and a logging implementation (i.e., Log4j Core) where published logs get consumed; filtered, enriched, encoded, and written to files, databases, network sockets, etc.
+Both parties can have dramatic impact on performance.
+Hence, we will discuss the performance optimization of both individually:</p>
 </div>
-<div class="qlist qanda">
-<ol>
+<div class="olist arabic">
+<ol class="arabic">
 <li>
-<p><em>What is its <strong>peak throughput</strong>?</em></p>
-<p>Many systems that react to external
-events need to log bursts of messages followed by periods of relative
-quiet. This number is the maximum throughput measured over a short
-period of time and gives some idea of how well the logging library deals
-with bursts. For systems that need to log a lot at a constant high rate
-(for example, batch jobs) this is less likely to be a useful measure of
-performance.</p>
+<p><a href="#api">Using Log4j API efficiently</a></p>
 </li>
 <li>
-<p><em>What is the <strong>maximum sustained throughput</strong>?</em></p>
-<p>This is the throughput
-averaged over a long time. This is a useful measure of the "upper limit"
-of the capacity of the logging library. It is not recommended that
-reactive applications actually log at this rate since under this load
-they will likely experience jitter and large response time spikes.</p>
-</li>
-<li>
-<p><em>What is its <strong>response time</strong> behaviour under various loads?</em></p>
-<p>This is the
-most important question for applications that need to react to external
-events in a timely manner. Response time is the total amount of time it
-takes to log a message and is the sum of the service time and wait time.
-The <strong>service time</strong> is the time it takes to do the work to log the
-message. As the workload increases, the service time often varies
-little: to do X amount of work it always takes X amount of time. The
-<strong>wait time</strong> is how long the request had to wait in a queue before being
-serviced. <em>As the workload increases, wait time often grows to many
-times the service time.</em></p>
+<p><a href="#core">Tuning Log4j Core for performance</a></p>
 </li>
 </ol>
 </div>
-<div class="sect2">
-<h3 id="responseTimeVsServiceTime"><a class="anchor" href="#responseTimeVsServiceTime"></a>Why Care About Response Time Latency?</h3>
-<div class="paragraph">
-<p>What is often measured and reported as <em>latency</em> is actually <em>service
-time</em>, and omits that a service time spike adds wait time for many
-subsequent events. This may present results that are more optimistic
-than what users experience.</p>
 </div>
-<div class="paragraph">
-<p>The graph on the right illustrates how much more optimistic service time
-is than response time. The graph shows response time and service time
-for the same system under a load of 100,000 messages per second. Out of
-24 million measurements, only ~50 are more than 250 microseconds, less
-than 0.001%. In a service time-only graph this would hardly be visible.
-However, the depending on the load it will take a while to catch up
-after a spike.</p>
-</div>
-<div class="paragraph">
-<p>The response time graph shows that in reality many more events are
-impacted by these delays than the service time numbers alone would
-suggest.</p>
 </div>
+<div class="sect1">
+<h2 id="api"><a class="anchor" href="#api"></a>Using Log4j API efficiently</h2>
+<div class="sectionbody">
 <div class="paragraph">
-<p>To learn more, watch Gil Tene&#8217;s eye-opening presentation
-<a href="http://www.infoq.com/presentations/latency-response-time">How NOT to
-measure latency</a>.</p>
+<p>Log4j API bundles a rich set of features to either totally avoid or minimize expensive computations whenever possible.
+We will walk you through these features with examples.</p>
 </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><span class="image"><img src="../_images/ResponseTimeVsServiceTimeAsyncLoggers.png" alt="image" width="480" height="288"></span></p>
-</div>
-</div>
+<p>Remember that a logging API and a logging implementation are two different things.
+You can use Log4j API in combination with a logging implementation other than Log4j Core (e.g., Logback).
+<strong>The tips shared in this section are logging implementation agnostic.</strong></p>
 </div>
+</td>
+</tr>
+</table>
 </div>
-<div class="sect1">
-<h2 id="loglibComparison"><a class="anchor" href="#loglibComparison"></a>Logging Library Performance Comparison</h2>
-<div class="sectionbody">
 <div class="sect2">
-<h3 id="asyncLogging"><a class="anchor" href="#asyncLogging"></a>Asynchronous Logging - Peak Throughput Comparison</h3>
+<h3 id="api-concat"><a class="anchor" href="#api-concat"></a>Don&#8217;t use string concatenation</h3>
 <div class="paragraph">
-<p>Asynchronous logging is useful to deal with bursts of events. How this
-works is that a minimum amount of work is done by the application thread
-to capture all required information in a log event, and this log event
-is then put on a queue for later processing by a background thread. As
-long as the queue is sized large enough, the application threads should
-be able to spend very little time on the logging call and return to the
-business logic very quickly.</p>
+<p>If you are using <code>String</code> concatenation while logging, you are doing something very wrong and dangerous!</p>
 </div>
-<div class="paragraph">
-<p>It turns out that the choice of queue is extremely important for peak
-throughput. Log4j 2&#8217;s Async Loggers use a
-<a href="https://lmax-exchange.github.io/disruptor/">lock-free data structure</a>,
-whereas Logback, Log4j 1.2 and Log4j 2&#8217;s Asynchronous Appenders use an
-ArrayBlockingQueue. With a blocking queue, multi-threaded applications
-often experience lock contention when trying to enqueue the log event.</p>
+<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 class="paragraph">
-<p>The graph below illustrates the difference a lock-free data structure
-can make to throughput in multi-threaded scenarios. <em>Log4j 2 scales
-better with the number of threads: an application with more threads can
-log more. The other logging libraries suffer from lock contention and
-total throughput stays constant or drops when more threads are logging.
-This means that with the other logging libraries, each individual thread
-will be able to log less.</em></p>
 </div>
-<div class="paragraph">
-<p>Bear in mind that this is <em>peak</em> throughput: Log4j 2&#8217;s Async Loggers
-give better throughput up to a point, but once the queue is full, the
-appender thread needs to wait until a slot becomes available in the
-queue, and throughput will drop to the maximum sustained throughput of
-the underlying appenders at best.</p>
+</li>
+<li>
+<p><i class="fa fa-check-square-o"></i> Use message parameters.
+Parameterized messages allow safe encoding of parameters and avoid formatting totally if the message is filtered.
+For instance, if the associated level for the logger is discarded, no formatting will take place.</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 class="paragraph">
-<p><span class="image"><img src="../_images/async-throughput-comparison.png" alt="Peak throughput comparison"></span></p>
 </div>
-<div class="paragraph">
-<p>For details, see the <a href="async.html" class="xref page">Async Loggers</a> manual page.</p>
+</li>
+</ul>
 </div>
 </div>
 <div class="sect2">
-<h3 id="asyncLoggingResponseTime"><a class="anchor" href="#asyncLoggingResponseTime"></a>Asynchronous Logging Response Time</h3>
+<h3 id="api-supplier"><a class="anchor" href="#api-supplier"></a>Use <code>Supplier</code>s to pass computationally expensive arguments</h3>
 <div class="paragraph">
-<p>Response time behaviour varies a lot with the workload and the number of
-threads that log concurrently. The <a href="async.html#Latency" class="xref page">Async
-Loggers</a> manual page and the
-<a href="garbagefree.html#Latency" class="xref page">garbage-free logging</a> manual page
-provide some graphs showing response time behaviour under various loads.</p>
+<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="paragraph">
-<p>This section shows another graph showing response time latency behaviour
-under a modest total workload of 64,000 messages per second, with 4
-threads logging concurrently. At this load and on this hardware/OS/JVM
-configuration, lock contention and context switches play less of a role
-and the pauses are mostly caused by minor garbage collections. Garbage
-collection pause duration and frequency can vary a lot: when testing the
-Log4j 1.2.17 Async Appender a minor GC pause of 7 milliseconds occurred
-while the Log4j 2 Async Appender test only saw a GC pause of a little
-over 2 milliseconds. This does not necessarily mean that one is better
-than the other.</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 `{}` and role `{}`", userId, db.findUserRoleById(userId));</code></pre>
 </div>
-<div class="paragraph">
-<p>Generally, garbage-free async loggers had the best response time
-behaviour in all configurations we tested.</p>
 </div>
 <div class="paragraph">
-<p><span class="image"><img src="../_images/ResponseTimeAsyncLogging4Threads_16kEach.png" alt="Response time comparison"></span></p>
+<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 or the associated <a href="markers.html" class="xref page">marker</a> is not accepted for this package, or due to some other filtering.</p>
 </div>
-<div class="paragraph">
-<p>The above result was obtained with the ResponseTimeTest class which can
-be found in the Log4j 2 unit test source directory, running on JDK
-1.8.0_45 on RHEL 6.5 (Linux 2.6.32-573.1.1.el6.x86_64) with 10-core Xeon
-CPU E5-2660 v3 @2.60GHz with hyperthreading switched on (20 virtual
-cores).</p>
+<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">/* BAD! */ if (LOGGER.isInfoEnabled()) { LOGGER.info(...); }</code></pre>
 </div>
 </div>
-<div class="sect2">
-<h3 id="asyncLoggingWithParams"><a class="anchor" href="#asyncLoggingWithParams"></a>Asynchronous Logging Parameterized Messages</h3>
 <div class="paragraph">
-<p>Many logging libraries offer an API for logging parameterized messages.
-This enables application code to look something like this:</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("Entry number: {} is {}", i, entry[i]);</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>
-<div class="paragraph">
-<p>In the above example, the fully formatted message text is not created
-unless the DEBUG level is enabled for the logger. Without this API, you
-would need three lines of code to accomplish the same:</p>
-</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">if (logger.isDebugEnabled()) {
-    logger.debug("Entry number: " + i + " is " + entry[i].toString());
-}</code></pre>
+<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>
-<div class="paragraph">
-<p>If the DEBUG level <em>is</em> enabled, then at some point the message needs to
-be formatted. When logging asynchronously, the message parameters may be
-changed by the application thread before the background thread had a
-chance to log the message. This would show the wrong values in the log
-file. To prevent this, Log4j 2, Log4j 1.2 and Logback format the message
-text in the application thread <em>before</em> passing off the log event to the
-background thread.</p>
+</li>
+</ul>
 </div>
-<div class="paragraph">
-<p>This is the safe thing to do, but the formatting has a performance cost.
-The graph below compares the throughput of logging messages with
-parameters using various logging libraries. These are all asynchronous
-logging calls, so these numbers do not include the cost of disk I/O and
-represent <em>peak</em> throughput.</p>
 </div>
-<div class="paragraph">
-<p>JUL (java.util.logging) does not have a built-in asynchronous Handler.
-<a href="https://docs.oracle.com/javase/8/docs/api/java/util/logging/MemoryHandler.html"><code>MemoryHandler</code></a>
-is the nearest thing available so we included it here. MemoryHandler
-does <em>not</em> do the safe thing of taking a snapshot of the current
-parameter state (it just keeps a reference to the original parameter
-objects), and as a result it is very fast when single-threaded. However,
-when more application threads are logging concurrently, the cost of lock
-contention outweighs this gain.</p>
 </div>
-<div class="paragraph">
-<p>In absolute numbers, <em>Log4j 2&#8217;s Async Loggers perform well compared to
-the other logging frameworks, but notice that the message formatting
-cost increases sharply with the number of parameters. In this area,
-Log4j 2 still has work to do to improve: we would like to keep this cost
-more constant.</em></p>
-</div>
-<div class="paragraph">
-<p><span class="image"><img src="../_images/ParamMsgThrpt1-4T.png" alt="image"></span></p>
 </div>
+<div class="sect1">
+<h2 id="core"><a class="anchor" href="#core"></a>Tuning Log4j Core for performance</h2>
+<div class="sectionbody">
 <div class="paragraph">
-<p>The results above are for JUL (java.util.logging) 1.8.0_45, Log4j 2.6,
-Log4j 1.2.17 and Logback 1.1.7, and were obtained with the
-<a href="http://openjdk.java.net/projects/code-tools/jmh/">JMH</a> Java benchmark
-harness. See the AsyncAppenderLog4j1Benchmark,
-AsyncAppenderLog4j2Benchmark, AsyncAppenderLogbackBenchmark,
-AsyncLoggersBenchmark and the MemoryHandlerJULBenchmark source code in
-the log4j-perf-test module.</p>
-</div>
+<p>Below sections walk you through a set of features that can have significant impact on the performance of Log4j Core.</p>
+</div>
+<div class="admonitionblock important">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-important" title="Important"></i>
+</td>
+<td class="content">
+<div class="paragraph">
+<p>Extra tuning of any application will deviate you away from defaults and add up to the maintenance load.
+You are strongly advised to measure your application&#8217;s overall performance and then, if Log4j is found to be an important bottleneck factor, tune it carefully.
+When this happens, we also recommend you to evaluate your assumptions on a regular basis to check if they still hold.
+Remember, <a href="https://en.wikipedia.org/wiki/Program_optimization#When_to_optimize">premature optimization is the root of all evil</a>.</p>
+</div>
+</td>
+</tr>
+</table>
+</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>Remember that a logging API and a logging implementation are two different things.
+You can use Log4j Core in combination with a logging API other than Log4j API (e.g., SLF4J, JUL, JPL).
+<strong>The tips shared in this section are logging API agnostic.</strong></p>
+</div>
+</td>
+</tr>
+</table>
 </div>
 <div class="sect2">
-<h3 id="asyncLoggingWithLocation"><a class="anchor" href="#asyncLoggingWithLocation"></a>Asynchronous Logging with Caller Location Information</h3>
-<div class="paragraph">
-<p>Some layouts can show the class, method and line number in the
-application where the logging call was made. In Log4j 2, examples of
-such layout options are HTML
-<a href="layouts.html#HtmlLocationInfo" class="xref page">locationInfo</a>, or one of the patterns
-<a href="layouts.html#PatternClass" class="xref page">%C or $class</a>,
-<a href="layouts.html#PatternFile" class="xref page">%F or %file</a>,
-<a href="layouts.html#PatternLocation" class="xref page">%l or %location</a>,
-<a href="layouts.html#PatternLine" class="xref page">%L or %line</a>,
-<a href="layouts.html#PatternMethod" class="xref page">%M or %method</a>. In order to provide
-caller location information, the logging library will take a snapshot of
-the stack, and walk the stack trace to find the location information.</p>
-</div>
+<h3 id="layouts"><a class="anchor" href="#layouts"></a>Layouts</h3>
 <div class="paragraph">
-<p>The graph below shows the performance impact of capturing caller
-location information when logging asynchronously from a single thread.
-Our tests show that <em>capturing caller location has a similar impact
-across all logging libraries, and slows down asynchronous logging by
-about 30-100x</em>.</p>
+<p><a href="layouts.html" class="xref page">Layouts</a> are responsible for encoding a log event in a certain format (human-readable text, JSON, etc.) and they can have significant impact in your overall logging performance.</p>
 </div>
+<div class="sect3">
+<h4 id="layouts-location"><a class="anchor" href="#layouts-location"></a>Location information</h4>
 <div class="paragraph">
-<p><span class="image"><img src="../_images/AsyncWithLocationThrpt1T-labeled.png" alt="image"></span></p>
+<p>Several layouts offer directives to include the <em>location information</em>: the caller class, method, file, and line.
+Log4j takes a snapshot of the stack, and walks the stack trace to find the location information.
+<strong>This is an expensive operation</strong> and should be avoided in performance-sensitive setups.</p>
 </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>The results above are for JUL (java.util.logging) 1.8.0_45, Log4j 2.6,
-Log4j 1.2.17 and Logback 1.1.7, and were obtained with the
-<a href="http://openjdk.java.net/projects/code-tools/jmh/">JMH</a> Java benchmark
-harness. See the AsyncAppenderLog4j1LocationBenchmark,
-AsyncAppenderLog4j2LocationBenchmark,
-AsyncAppenderLogbackLocationBenchmark, AsyncLoggersLocationBenchmark and
-the MemoryHandlerJULLocationBenchmark source code in the log4j-perf-test
-module.</p>
+<p>Note that <em>the caller class</em> of the location information and <em>the logger name</em> are two different things.
+In most setups just using <em>the logger name</em> – which doesn&#8217;t incur any overhead to obtain while logging! – is a sufficient and <strong>zero-cost substitute for the caller class</strong>.</p>
 </div>
+<details>
+<summary class="title">Example demonstrating that the logger name can be a substitute for the caller name</summary>
+<div class="content">
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">package com.mycompany;
+
+public class PaymentService {
+
+    // Logger name: `com.mycompany.PaymentService`
+    private static final Logger LOGGER = LogManager.getLogger();
+
+    private static final class PaymentTransaction {
+        void doPayment() {
+            // Caller class: `com.mycompany.PaymentService$PaymentTransaction`
+            LOGGER.trace("...");
+        }
+    }
+
+}</code></pre>
 </div>
-<div class="sect2">
-<h3 id="fileLoggingComparison"><a class="anchor" href="#fileLoggingComparison"></a>Synchronous File Logging - Sustained Throughput Comparison</h3>
-<div class="paragraph">
-<p>This section discusses the maximum sustained throughput of logging to a
-file. In any system, the maximum sustained throughput is determined by
-its slowest component. In the case of logging, this is the appender,
-where the message formatting and disk I/O takes place. For this reason
-we will look at simple <em>synchronous</em> logging to a file, without queues
-or background threads.</p>
 </div>
 <div class="paragraph">
-<p>The graph below compares Log4j 2.6&#8217;s RandomAccessFile appender to the
-respective File appenders of Log4j 1.2.17, Logback 1.1.7 and Java util
-logging (JUL) on Oracle Java 1.8.0_45. ImmediateFlush was set to false
-for all loggers that support this. The JUL results are for the
-XMLFormatter (which in our measurements was about twice as fast as the
-SimpleFormatter).</p>
+<p>In the above example, if <em>the caller class</em> (which is expensive to compute!) is omitted in the layout, the produced log line will still be likely to contain sufficient information to trace back the source by just looking at <em>the logger name</em>.</p>
 </div>
-<div class="paragraph">
-<p><em>Log4j 2&#8217;s sustained throughput drops a little when more threads are
-logging simultaneously, but its fine-grained locking pays off and
-throughput stays relatively high. The other logging frameworks'
-throughput drops dramatically in multi-threaded applications: Log4j 1.2
-has 1/4th of its single-threaded capacity, Logback has 1/10th of its
-single-threaded capacity, and JUL steadily drops from 1/4th to 1/10th of
-its single-threaded throughput as more threads are added.</em></p>
 </div>
-<div class="paragraph">
-<p><span class="image"><img src="../_images/SyncThroughputLoggerComparisonLinux.png" alt="image"></span></p>
+</details>
+</td>
+</tr>
+</table>
 </div>
 <div class="paragraph">
-<p>The synchronous logging throughput results above are obtained with the
-<a href="http://openjdk.java.net/projects/code-tools/jmh/">JMH</a> Java benchmark
-harness. See the FileAppenderBenchmark source code in the log4j-perf-test
-module.</p>
+<p>Asynchronous loggers need to capture the location information before passing the log message to another thread; otherwise the location information will be lost after that point.
+Due to associated performance implications, <a href="async.html" class="xref page">asynchronous loggers</a> and <a href="appenders.html#AsyncAppender" class="xref page">asynchronous appenders</a> do <strong>not</strong> include location information by default.
+You can override the default behaviour in your asynchronous logger or asynchronous appender configuration.</p>
 </div>
 </div>
-<div class="sect2">
-<h3 id="_synchronous_file_logging_response_time_comparison"><a class="anchor" href="#_synchronous_file_logging_response_time_comparison"></a>Synchronous File Logging - Response Time Comparison</h3>
+<div class="sect3">
+<h4 id="layouts-efficiency"><a class="anchor" href="#layouts-efficiency"></a>Layout efficiency</h4>
 <div class="paragraph">
-<p>Response time for synchronous file logging varies a lot with the
-workload and the number of threads. Below is a sample for a workload of
-32,000 events per second, with 2 threads logging 16,000 events per
-second each.</p>
+<p>Not all layouts are designed with the same performance considerations in mind.
+Following layouts are known to be well-optimized for performance-sensitive workloads:</p>
 </div>
-<div class="paragraph">
-<p><span class="image"><img src="../_images/SynchronousFileResponseTime2T32k-labeled.png" alt="image"></span></p>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><a href="json-template-layout.html#performance" class="xref page">JSON Template Layout</a></dt>
+<dd>
+<p>It encodes log events into JSON according to the structure described by the template provided.
+Its output can safely be ingested into several log storage solutions: Elasticsearch, Google Cloud Logging, Graylog, Logstash, etc.</p>
+</dd>
+<dt class="hdlist1"><a href="layouts.html#PatternLayout-performance" class="xref page">Pattern Layout</a></dt>
+<dd>
+<p>It encodes log events into human-readable text according to the pattern provided.</p>
+</dd>
+</dl>
 </div>
-<div class="paragraph">
-<p>The above result was obtained with the ResponseTimeTest class which can
-be found in the Log4j 2 unit test source directory, running on JDK
-1.8.0_45 on RHEL 6.5 (Linux 2.6.32-573.1.1.el6.x86_64) with 10-core Xeon
-CPU E5-2660 v3 @2.60GHz with hyperthreading switched on (20 virtual
-cores).</p>
 </div>
 </div>
 <div class="sect2">
-<h3 id="filtering"><a class="anchor" href="#filtering"></a>Filtering by Level</h3>
+<h3 id="async"><a class="anchor" href="#async"></a>Asynchronous logging</h3>
 <div class="paragraph">
-<p>The most basic filtering a logging framework provides is filtering by
-log level. When logging is turned off entirely or just for a set of
-Levels, the cost of a log request consists of a number of method
-invocations plus an integer comparison. Unlike Log4j, Log4j 2 Loggers
-don&#8217;t "walk a hierarchy". Loggers point directly to the Logger
-configuration that best matches the Logger&#8217;s name. This incurs extra
-overhead when the Logger is first created but reduces the overhead every
-time the Logger is used.</p>
+<p>Asynchronous logging is useful to deal with bursts of events.
+How this works is that a minimum amount of work is done by the application thread to capture all required information in a log event, and this log event is then put on a queue for later processing by a background thread.
+As long as the queue is sized large enough, the application threads should be able to spend very little time on the logging call and return to the business logic very quickly.</p>
 </div>
+<div class="sect3">
+<h4 id="async-drawbacks"><a class="anchor" href="#async-drawbacks"></a>Asynchronous logging drawbacks</h4>
+<details>
+<summary class="title">There are certain drawbacks associated with asynchronous logging:</summary>
+<div class="content">
+<div class="dlist">
+<dl>
+<dt class="hdlist1">Error handling</dt>
+<dd>
+<p>If a problem happens during the logging process and an exception is thrown, it is less easy for an asynchronous setting to signal this problem to the application.
+This can partly be alleviated by configuring an exception handler, but this may still not cover all cases.</p>
+</dd>
+<dt class="hdlist1">Stateful messages</dt>
+<dd>
+<p>In some rare cases, care must be taken with mutable messages.
+Most of the time you don&#8217;t need to worry about this.
+Log4 will ensure that log messages like <code>logger.debug("My object is {}", myObject)</code> will use the state of the <code>myObject</code> parameter at the time of the call to <code>logger.debug()</code>.
+The log message will not change even if <code>myObject</code> is modified later.
+It is safe to asynchronously log mutable objects because most <a href="messages.html" class="xref page">built-in <code>Message</code> implementations</a> take a snapshot of the parameters.
+There are some exceptions however: <a href="messages.html#MapMessage" class="xref page"><code>MapMessage</code></a> and <a href="messages.html#StructuredDataMessage" class="xref page"><code>StructuredDataMessage</code></a> are mutable by design, fields can be added to these messages after the message object was created.
+These messages should not be modified after they are logged with asynchronous loggers or asynchronous appenders; you may or may not see the modifications in the resulting log output.
+Similarly, custom <code>Message</code> implementations should be designed with asynchronous use in mind, and either take a snapshot of their parameters at construction time, or document their thread-safety characteristics.</p>
+</dd>
+<dt class="hdlist1">Computational overhead</dt>
+<dd>
+<p>If your application is running in an environment where CPU resources are scarce, like a machine with one CPU with a single core, starting another thread is not likely to give better performance.</p>
+</dd>
+<dt class="hdlist1">Appender performance</dt>
+<dd>
+<p>If the sustained rate at which your application is logging messages is faster than the maximum sustained throughput of the underlying appender, the queue will fill up and the application will end up logging at the speed of the slowest appender. If this happens, consider selecting a faster appender, or logging less. If neither of these is an option, you may get better throughput and fewer latency spikes by logging synchronously.</p>
+</dd>
+</dl>
 </div>
-<div class="sect2">
-<h3 id="_advanced_filtering"><a class="anchor" href="#_advanced_filtering"></a>Advanced Filtering</h3>
-<div class="paragraph">
-<p>Both Logback and Log4j 2 support advanced filtering. Logback calls them
-TurboFilters while Log4j 2 has a single Filter object. Advanced
-filtering provides the capability to filter LogEvents using more than
-just the Level before the events are passed to Appenders. However, this
-flexibility does come with some cost. Since multi-threading can also
-have an impact on the performance of advanced filtering, the chart below
-shows the difference in performance of filtering based on a Marker or a
-Marker&#8217;s parent.</p>
 </div>
-<div class="paragraph">
-<p>The "Simple Marker" comparison checks to see if a Marker that has no
-references to other markers matches the requested Marker. The "Parent
-Marker" comparison checks to see if a Marker that does have references
-to other markers matches the requested Marker.</p>
+</details>
 </div>
+<div class="sect3">
+<h4 id="async-strategies"><a class="anchor" href="#async-strategies"></a>Asynchronous logging strategies</h4>
 <div class="paragraph">
-<p>It appears that coarse-grained synchronization in SLF4J can impact
-performance in multi-threaded scenarios. See
-<a href="http://jira.qos.ch/browse/SLF4J-240">SLF4J-240</a>.</p>
+<p>Log4j provides following strategies users can choose from to do asynchronous logging:</p>
 </div>
+<div class="sect4">
+<h5 id="async-logger"><a class="anchor" href="#async-logger"></a>Asynchronous logger</h5>
 <div class="paragraph">
-<p><span class="image"><img src="../_images/MarkerFilterCostComparison.png" alt="image"></span></p>
+<p><a href="async.html" class="xref page">Asynchronous loggers</a> use <a href="https://lmax-exchange.github.io/disruptor">LMAX Disruptor</a> messaging library to consume log events.
+Their aim is to return from a <code>log()</code> call to the application as soon as possible.</p>
 </div>
-<div class="paragraph">
-<p>Log4j and Logback also support filtering on a value in the Log4j
-ThreadContext vs filtering in Logback on a value in the MDC. The graph
-below shows that the performance difference between Log4j 2 and Logback
-is small for the ThreadContext filter.</p>
-</div>
-<div class="paragraph">
-<p><span class="image"><img src="../_images/ThreadContextFilterCostComparison.png" alt="image"></span></p>
 </div>
+<div class="sect4">
+<h5 id="async-appender"><a class="anchor" href="#async-appender"></a>Asynchronous appender</h5>
 <div class="paragraph">
-<p>The Filter comparison results above are obtained with the
-<a href="http://openjdk.java.net/projects/code-tools/jmh/">JMH</a> Java benchmark
-harness. See the MarkerFilterBenchmark and MDCFilterBenchmark in the
-log4j-perf-test module for details on these benchmarks.</p>
+<p>The <a href="appenders.html#AsyncAppender" class="xref page">asynchronous appender</a> accepts references to other appenders and causes log events to be written to them on a separate thread.
+The backing queue uses <code>ArrayBlockingQueue</code> by default, though it can be replaced with a better performing one suitable for your use case.</p>
 </div>
 </div>
 </div>
 </div>
-<div class="sect1">
-<h2 id="tradeoffs"><a class="anchor" href="#tradeoffs"></a>Trade-offs</h2>
-<div class="sectionbody">
 <div class="sect2">
-<h3 id="whichAppender"><a class="anchor" href="#whichAppender"></a>Which Log4j 2 Appender to Use?</h3>
-<div class="paragraph">
-<p>Assuming that you selected Log4j 2 as your logging framework, next you
-may be interested in learning what the performance trade-offs are for
-selecting a specific Log4j 2 configuration. For example, there are three
-appenders for logging to a file: the File, RandomAccessFile and
-MemoryMappedFile appenders. Which one should you use?</p>
-</div>
-<div class="paragraph">
-<p>If performance is all you care about, the graphs below show your best
-choice is either the MemoryMappedFile appender or the RandomAccessFile
-appender. Some things to bear in mind:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>MemoryMappedFile appender does not have a rolling variant yet.</p>
-</li>
-<li>
-<p>When the log file size exceeds the MemoryMappedFile&#8217;s region length,
-the file needs to be remapped. This can be a very expensive operation,
-taking several seconds if the region is large.</p>
-</li>
-<li>
-<p>MemoryMappedFile appender creates a presized file from the beginning
-and fills it up gradually. This can confuse tools like <code>tail</code>; many such
-tools don&#8217;t work very well with memory mapped files.</p>
-</li>
-<li>
-<p>On Windows, using a tool like <code>tail</code> on a file created by
-RandomAccessFile appender can hold a lock on this file which may prevent
-Log4j from opening the file again when the application is restarted. In
-a development environment where you expect to restart your application
-regularly while using tools like tail to view the log file contents, the
-File appender may be a reasonable trade-off between performance and
-flexibility. For production environments performance may have higher
-priority.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The graph below shows sustained throughput for the console and file
-appenders in Log4j 2.6, and for reference also provides the 2.5
-performance.</p>
-</div>
-<div class="paragraph">
-<p>It turns out that the garbage-free text encoding logic in 2.6 gives
-these appenders a performance boost compared to Log4j 2.5. It used to be
-that the RandomAccessFile appender was significantly faster, especially
-in multi-threaded scenarios, but with the 2.6 release the File appender
-performance has improved and the performance difference between these
-two appender is smaller.</p>
-</div>
-<div class="paragraph">
-<p>Another takeaway is just how much of a performance drag logging to the
-console can be. Considering logging to a file and using a tool like
-<code>tail</code> to watch the file change in real time.</p>
-</div>
-<div class="paragraph">
-<p><span class="image"><img src="../_images/Log4j2AppenderThroughputComparison-linux.png" alt="image"></span></p>
-</div>
-<div class="paragraph">
-<p>On Windows, the results are similar but the RandomAccessFile and
-MemoryMappedFile appenders outperform the plain File appender in
-multi-threaded scenarios. The absolute numbers are higher on Windows: we
-don&#8217;t know why but it looks like Windows handles lock contention better
-than Linux.</p>
-</div>
+<h3 id="gcfree"><a class="anchor" href="#gcfree"></a>Garbage-free logging</h3>
 <div class="paragraph">
-<p><span class="image"><img src="../_images/Log4j2AppenderThroughputComparison-windows.png" alt="image"></span></p>
+<p>Garbage collection pauses are a common cause of latency spikes and for many systems significant effort is spent on controlling these pauses.
+Log4j allocates temporary <code>LogEvent</code>, <code>String</code>, <code>char[]</code>, <code>byte[]</code>, etc. objects during steady state logging.
+This contributes to pressure on the garbage collector and increases the frequency with which garbage collection pauses occur.
+In <em>garbage-free mode</em>, Log4j buffers and reuses objects to lessen this pressure.</p>
 </div>
 <div class="paragraph">
-<p>The Log4j 2 appender comparison results above are obtained with the
-<a href="http://openjdk.java.net/projects/code-tools/jmh/">JMH</a> Java benchmark
-harness. See the Log4j2AppenderComparisonBenchmark source code in the
-log4j-perf-test module.</p>
+<p>See <a href="garbagefree.html" class="xref page">Garbage-free logging</a> for details.</p>
 </div>
 </div>
 </div>
diff --git a/manual/plugins.html b/manual/plugins.html
index 6148e817a3..d9314b5ce5 100644
--- a/manual/plugins.html
+++ b/manual/plugins.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/resource-logger.html b/manual/resource-logger.html
index 2221c46792..ca217c2ceb 100644
--- a/manual/resource-logger.html
+++ b/manual/resource-logger.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/scoped-context.html b/manual/scoped-context.html
index 41e9e4916e..8df29ecb74 100644
--- a/manual/scoped-context.html
+++ b/manual/scoped-context.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/systemproperties.html b/manual/systemproperties.html
index 8940ca4f82..ea5b8b16a0 100644
--- a/manual/systemproperties.html
+++ b/manual/systemproperties.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/thread-context.html b/manual/thread-context.html
index 17fb352486..f800f98d4b 100644
--- a/manual/thread-context.html
+++ b/manual/thread-context.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/manual/usage.html b/manual/usage.html
index 186da0efef..38ac36897e 100644
--- a/manual/usage.html
+++ b/manual/usage.html
@@ -170,12 +170,6 @@
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="filters.html">Filters</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <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>
diff --git a/plugin-reference.html b/plugin-reference.html
index 7fcdf82a84..b925dd656c 100644
--- a/plugin-reference.html
+++ b/plugin-reference.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
@@ -1425,7 +1428,7 @@ Originally developed by Ceki Glc and Anders Kristensen.</p>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>header</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String?</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>boolean?</code></p></td>
 <td class="tableblock halign-left valign-top"></td>
 <td class="tableblock halign-left valign-top"><div class="content"></div></td>
 </tr>
@@ -3952,7 +3955,12 @@ This attribute is ignored if <code>immediateFlush</code> is set to <code>true</c
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>Property</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code><a href="#org-apache-logging-log4j_log4j-core_org-apache-logging-log4j-core-config-Property">Property</a>?</code></p></td>
-<td class="tableblock halign-left valign-top"><div class="content"></div></td>
+<td class="tableblock halign-left valign-top"><div class="content"><div class="paragraph">
+<p>A generic list of key/value properties</p>
+</div>
+<div class="paragraph">
+<p>The meaning of these properties depends on the component.</p>
+</div></div></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"></td>
diff --git a/release-notes.html b/release-notes.html
index 133509f9e0..6d3236330e 100644
--- a/release-notes.html
+++ b/release-notes.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
diff --git a/runtime-dependencies.html b/runtime-dependencies.html
index 738e251ebe..ba547b8072 100644
--- a/runtime-dependencies.html
+++ b/runtime-dependencies.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
diff --git a/sitemap.xml b/sitemap.xml
index ac2d1ee72e..bb1fab9e07 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -2,242 +2,242 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 <url>
 <loc>https://logging.apache.org/log4j/3.x/5min.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/articles.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/development.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/download.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/faq.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/getting-started/index.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/index.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/javadoc.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/log4j-1.2-api.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/log4j-api.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/log4j-docker.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/log4j-flume-ng.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/log4j-iostreams.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/log4j-jpl.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/log4j-jul.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/log4j-mongodb.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/log4j-slf4j-impl.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/log4j-slf4j2-impl.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/log4j-spring-cloud-config-client.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/log4j-to-jul.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/log4j-to-slf4j.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/api-separation.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/api.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/appenders.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/architecture.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/async.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/cloud.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/compatibility.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/configuration.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/customconfig.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/customloglevels.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/dependencyinjection.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/eventlogging.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/extending.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/filters.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/flowtracing.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/garbagefree.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/index.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/installation.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/jmx.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/json-template-layout.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/layouts.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/log4j1-compat.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/logbuilder.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/logsep.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/lookups.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/markers.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/messages.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/migration.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/performance.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/plugins.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/resource-logger.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/scoped-context.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/systemproperties.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/thread-context.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/usage.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/plugin-reference.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/release-notes.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/runtime-dependencies.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/thanks.html</loc>
-<lastmod>2024-05-20T10:30:24.271Z</lastmod>
+<lastmod>2024-05-21T11:33:48.494Z</lastmod>
 </url>
 </urlset>
diff --git a/thanks.html b/thanks.html
index 34c39d0885..3bb13836e6 100644
--- a/thanks.html
+++ b/thanks.html
@@ -170,12 +170,6 @@
   <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">
-    <a class="nav-link" href="manual/async.html">Lock-free Asynchronous Loggers for Low-Latency Logging</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="manual/garbagefree.html">Garbage-free Steady State Logging</a>
-  </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="manual/extending.html">Extending Log4j 3</a>
   </li>
@@ -195,7 +189,16 @@
     <a class="nav-link" href="manual/logsep.html">Logging Separation</a>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
     <a class="nav-link" href="manual/performance.html">Performance</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/async.html">Asynchronous loggers</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="manual/garbagefree.html">Garbage-free logging</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>