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

vy pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/2.x by this push:
     new 2c8790d406 Improve AsciiDoc formatting (2nd pass)
2c8790d406 is described below

commit 2c8790d406588440e608f98c978bfa5cf4792d61
Author: Volkan Yazıcı <[email protected]>
AuthorDate: Thu Jun 13 10:48:09 2024 +0200

    Improve AsciiDoc formatting (2nd pass)
---
 src/site/antora/modules/ROOT/nav.adoc              | 12 ++--
 src/site/antora/modules/ROOT/pages/faq.adoc        |  2 +-
 .../pages/log4j-spring-cloud-config-client.adoc    |  2 +-
 .../antora/modules/ROOT/pages/log4j-taglib.adoc    |  2 +-
 src/site/antora/modules/ROOT/pages/manual/api.adoc |  6 +-
 .../modules/ROOT/pages/manual/appenders.adoc       | 70 +++++++++++-----------
 .../antora/modules/ROOT/pages/manual/async.adoc    | 12 ++--
 .../modules/ROOT/pages/manual/configuration.adoc   | 17 +++---
 .../modules/ROOT/pages/manual/garbagefree.adoc     |  4 +-
 src/site/antora/modules/ROOT/pages/manual/jmx.adoc | 11 ++--
 .../antora/modules/ROOT/pages/manual/layouts.adoc  |  8 +--
 .../antora/modules/ROOT/pages/manual/logsep.adoc   |  2 +-
 .../antora/modules/ROOT/pages/manual/lookups.adoc  |  6 +-
 .../modules/ROOT/pages/manual/pattern-layout.adoc  |  6 +-
 .../antora/modules/ROOT/pages/manual/scripts.adoc  |  4 +-
 .../ROOT/pages/manual/systemproperties.adoc        |  6 +-
 .../modules/ROOT/pages/manual/thread-context.adoc  |  2 +-
 .../manual/layouts-location-information.adoc       |  2 +-
 .../properties-async-logger-config.adoc            |  6 +-
 .../systemproperties/properties-async-logger.adoc  |  8 +--
 .../properties-configuration-factory.adoc          |  2 +-
 .../properties-context-selector.adoc               |  3 +-
 .../properties-garbage-collection.adoc             |  4 +-
 .../manual/systemproperties/properties-jndi.adoc   |  2 +-
 .../properties-log4j-core-misc.adoc                |  2 +-
 .../systemproperties/properties-log4j-jul.adoc     | 20 +++----
 .../systemproperties/properties-provider.adoc      |  2 +-
 .../systemproperties/properties-simple-logger.adoc |  4 +-
 .../properties-thread-context.adoc                 |  2 +-
 .../properties-transport-security.adoc             | 16 ++---
 30 files changed, 121 insertions(+), 124 deletions(-)

diff --git a/src/site/antora/modules/ROOT/nav.adoc 
b/src/site/antora/modules/ROOT/nav.adoc
index a3221fef6a..9b7f68f2ec 100644
--- a/src/site/antora/modules/ROOT/nav.adoc
+++ b/src/site/antora/modules/ROOT/nav.adoc
@@ -76,9 +76,9 @@
 * xref:log4j-spring-cloud-config-client.adoc[]
 
 .Related projects
-* link:/log4j/jakarta[Log4j Jakarta EE]
-* link:/log4j/jmx-gui[Log4j JMX GUI]
-* link:/log4j/kotlin[Log4j Kotlin]
-* link:/log4j/scala[Log4j Scala]
-* link:/log4j/tools[Log4j Tools]
-* link:/log4j/transform[Log4j Transformation Tools]
+* {logging-services-url}/log4j/jakarta[Log4j Jakarta EE]
+* {logging-services-url}/log4j/jmx-gui[Log4j JMX GUI]
+* {logging-services-url}/log4j/kotlin[Log4j Kotlin]
+* {logging-services-url}/log4j/scala[Log4j Scala]
+* {logging-services-url}/log4j/tools[Log4j Tools]
+* {logging-services-url}/log4j/transform[Log4j Transformation Tools]
diff --git a/src/site/antora/modules/ROOT/pages/faq.adoc 
b/src/site/antora/modules/ROOT/pages/faq.adoc
index 8499c57a4d..f284885fa0 100644
--- a/src/site/antora/modules/ROOT/pages/faq.adoc
+++ b/src/site/antora/modules/ROOT/pages/faq.adoc
@@ -202,7 +202,7 @@ The solution is to provide the correct FQCN.
 The easiest way to do this is to let Log4j generate the logger wrapper for you.
 Log4j comes with a Logger wrapper generator tool.
 This tool was originally meant to support custom log levels and was moved to 
the
-link:/log4j/transform/latest/index.html[Log4j Transform subproject].
+{logging-services-url}/log4j/transform/latest/index.html[Log4j Transform 
subproject].
 The generated logger code will take care of the FQCN.
 
 [#proguard-rules]
diff --git 
a/src/site/antora/modules/ROOT/pages/log4j-spring-cloud-config-client.adoc 
b/src/site/antora/modules/ROOT/pages/log4j-spring-cloud-config-client.adoc
index cbde7c9d77..ea8b5f128a 100644
--- a/src/site/antora/modules/ROOT/pages/log4j-spring-cloud-config-client.adoc
+++ b/src/site/antora/modules/ROOT/pages/log4j-spring-cloud-config-client.adoc
@@ -125,7 +125,7 @@ Note that Log4j currently does not directly support 
encrypting the password.
 However, Log4j does use Spring's  standard APIs to access properties in the 
Spring configuration so any customizations made to Spring's property handling 
would apply to the properties Log4j uses as well.
 
 If more extensive authentication is required an `AuthorizationProvider` can be 
implemented and its fully qualified class name should be specified in the
-xref:manual/systemproperties.adoc#log4j2.configurationAuthorizationProvider[log4j2.configurationAuthorizationProvider]
+xref:manual/systemproperties.adoc#log4j2.configurationAuthorizationProvider[`log4j2.configurationAuthorizationProvider`]
 system property, in log4j2.component.properties or in Spring's `bootstrap.yml` 
using either the `log4j2.authorizationProvider` or 
`logging.auth.authorizationProvider` key.
 
 For the properties required by TLS configuration see 
xref:manual/systemproperties.adoc#properties-transport-security[the Transport 
Security configuration].
diff --git a/src/site/antora/modules/ROOT/pages/log4j-taglib.adoc 
b/src/site/antora/modules/ROOT/pages/log4j-taglib.adoc
index ff074eb08e..e232964e50 100644
--- a/src/site/antora/modules/ROOT/pages/log4j-taglib.adoc
+++ b/src/site/antora/modules/ROOT/pages/log4j-taglib.adoc
@@ -38,7 +38,7 @@ You may need to do something similar on other containers if 
they skip scanning L
 
 == Usage
 
-In accordance with the 
link:javadoc/log4j-api/org/apache/logging/log4j/Logger.html[Logger] API, this 
tag library has tags to support the following logging calls: "catching", 
"entry", "exit", "log", "trace", "debug", "info", "warn", "error", and "fatal".
+In accordance with the 
link:javadoc/log4j-api/org/apache/logging/log4j/Logger.html[`Logger`] API, this 
tag library has tags to support the following logging calls: "catching", 
"entry", "exit", "log", "trace", "debug", "info", "warn", "error", and "fatal".
 The "trace" tag was not supported in Jakarta Commons Log Taglib.
 The "setLogger", "catching", "entry", and "trace" tags are new to this library.
 This tag library also supports the conditional tag "ifEnabled" (new) and 
troubleshooting tag "dump" (existed in Jakarta Commons Log Taglib).
diff --git a/src/site/antora/modules/ROOT/pages/manual/api.adoc 
b/src/site/antora/modules/ROOT/pages/manual/api.adoc
index 465bec3178..92e7b528b5 100644
--- a/src/site/antora/modules/ROOT/pages/manual/api.adoc
+++ b/src/site/antora/modules/ROOT/pages/manual/api.adoc
@@ -159,7 +159,7 @@ Some common ones are accessible through convenient factory 
methods, which we wil
 === Formatter logger
 
 The `Logger` instance returned by default replaces the occurrences of `{}` 
placeholders with the `toString()` output of the associated parameter.
-If you need more control over how the parameters are formatted, you can also 
use the 
http://docs.oracle.com/javase/6/docs/api/java/util/Formatter.html#syntax[`java.util.Formatter`]
 format strings by obtaining your `Logger` using 
link:../javadoc/log4j-api/org/apache/logging/log4j/LogManager.html#getFormatterLogger(java.lang.Class)[`LogManager#getFormatterLogger()`]:
+If you need more control over how the parameters are formatted, you can also 
use the 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/util/Formatter.html#syntax[`java.util.Formatter`]
 format strings by obtaining your `Logger` using 
link:../javadoc/log4j-api/org/apache/logging/log4j/LogManager.html#getFormatterLogger(java.lang.Class)[`LogManager#getFormatterLogger()`]:
 
 [source,java]
 ----
@@ -205,7 +205,7 @@ xref:manual/resource-logger.adoc[Read more on resource 
loggers...]
 [#event-logger]
 === Event logger
 
-link:../javadoc/log4j-api/org/apache/logging/log4j/LogManager.html[`EventLogger`]
 provides a simple way to log structured events conforming with the 
`STRCUTURED-DATA` format defined in https://tools.ietf.org/html/rfc5424[RFC 
5424 (The Syslog Protocol)].
+link:../javadoc/log4j-api/org/apache/logging/log4j/EventLogger.html[`EventLogger`]
 provides a simple way to log structured events conforming with the 
`STRCUTURED-DATA` format defined in https://tools.ietf.org/html/rfc5424[RFC 
5424 (The Syslog Protocol)].
 
 xref:manual/eventlogging.adoc[Read more on event loggers...]
 
@@ -324,7 +324,7 @@ xref:manual/scoped-context.adoc[Read more on Scoped 
Context...]
 [#thread-context]
 === Thread Context
 
-Just like 
https://docs.oracle.com/javase/8/docs/api/java/lang/ThreadLocal.html[Java's 
`ThreadLocal`], _Thread Context_ facilitates associating information with the 
executing thread and making this information accessible to the rest of the 
logging system.
+Just like 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/lang/ThreadLocal.html[Java's
 `ThreadLocal`], _Thread Context_ facilitates associating information with the 
executing thread and making this information accessible to the rest of the 
logging system.
 Thread Context offers both
 
 * map-structured – referred to as _Thread Context Map_ or _Mapped Diagnostic 
Context (MDC)_
diff --git a/src/site/antora/modules/ROOT/pages/manual/appenders.adoc 
b/src/site/antora/modules/ROOT/pages/manual/appenders.adoc
index 0901191553..5e8300a271 100644
--- a/src/site/antora/modules/ROOT/pages/manual/appenders.adoc
+++ b/src/site/antora/modules/ROOT/pages/manual/appenders.adoc
@@ -59,7 +59,7 @@ If set to `true`, Log4j will flush all Java buffers at the 
end of each event:
 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/io/OutputStream.html[`OutputStream`]
 a call to the `OutputStream.flush()` method is performed.
 * if 
xref:manual/systemproperties.adoc#log4j2.enableDirectEncoders[`log4j2.enableDirectEncoders`]
 is set to `true`, many Log4j appenders use a
-https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html[`ByteBuffer`]
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/ByteBuffer.html[`ByteBuffer`]
 to format log events before sending them to the underlying resource.
 Setting `immediateFlush` to `true` flushes these buffers at each event.
 
@@ -77,7 +77,7 @@ Note that exceptions while writing to those Appenders will be 
hidden from the ap
 The AsyncAppender should be configured after the appenders it references to 
allow it to shut down properly.
 
 By default, AsyncAppender uses
-https://docs.oracle.com/javase/7/docs/api/java/util/concurrent/ArrayBlockingQueue.html[`java.util.concurrent.ArrayBlockingQueue`]
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/util/concurrent/ArrayBlockingQueue.html[`java.util.concurrent.ArrayBlockingQueue`]
 which does not require any external libraries.
 Note that multi-threaded applications should exercise care when using this 
appender as such: the blocking queue is susceptible to lock contention and our
 xref:manual/performance.adoc#async[tests showed] performance may become worse 
when more threads are logging concurrently.
@@ -212,7 +212,7 @@ Log4j ships with the following implementations:
 |=======================================================================
 |Plugin Name |Description
 |ArrayBlockingQueue |This is the default implementation that uses
-https://docs.oracle.com/javase/7/docs/api/java/util/concurrent/ArrayBlockingQueue.html[`ArrayBlockingQueue`].
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/util/concurrent/ArrayBlockingQueue.html[`ArrayBlockingQueue`].
 
 |DisruptorBlockingQueue |This uses the
 https://github.com/conversant/disruptor[Conversant Disruptor]
@@ -225,7 +225,7 @@ bounded lock-free queue.
 This implementation is provided by the `log4j-jctools` artifact.
 
 |LinkedTransferQueue |This uses the new Java 7 implementation
-https://docs.oracle.com/javase/7/docs/api/java/util/concurrent/LinkedTransferQueue.html[`LinkedTransferQueue`].
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/util/concurrent/LinkedTransferQueue.html[`LinkedTransferQueue`].
 Note that this queue does not use the `bufferSize` configuration
 attribute from AsyncAppender as `LinkedTransferQueue` does not support a
 maximum capacity.
@@ -575,7 +575,7 @@ File attribute permissions in POSIX format to apply 
whenever the file is
 created.
 
 The underlying files system shall support
-https://docs.oracle.com/javase/7/docs/api/java/nio/file/attribute/PosixFileAttributeView.html[POSIX]
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/file/attribute/PosixFileAttributeView.html[POSIX]
 file attribute view.
 
 Examples: `rw-------` or `rw-rw-rw-` etc...
@@ -591,14 +591,14 @@ 
http://www.gnu.org/software/libc/manual/html_node/Options-for-Files.html[_POSIX_
 is in effect for path.
 
 The underlying files system shall support file
-https://docs.oracle.com/javase/7/docs/api/java/nio/file/attribute/FileOwnerAttributeView.html[owner]
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/file/attribute/FileOwnerAttributeView.html[owner]
 attribute view.
 
 |fileGroup |String a|
 File group to define whenever the file is created.
 
 The underlying files system shall support
-https://docs.oracle.com/javase/7/docs/api/java/nio/file/attribute/PosixFileAttributeView.html[POSIX]
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/file/attribute/PosixFileAttributeView.html[POSIX]
 file attribute view.
 
 |=======================================================================
@@ -863,7 +863,7 @@ As of Log4j 2.11.0, JDBC support has moved from the 
existing module
 `log4j-core` to the new module `log4j-jdbc`.
 
 The JDBC Appender configured with a `DataSource` requires JNDI support so as 
of release 2.17.1 this appender will not function unless 
`log4j2.enableJndiJdbc=true` is configured as a system property or environment 
variable.
-See the 
xref:manual/systemproperties.adoc#log4j2.enableJndiJdbc[log4j2.enableJndiJdbc] 
system property.
+See the 
xref:manual/systemproperties.adoc#log4j2.enableJndiJdbc[`log4j2.enableJndiJdbc`]
 system property.
 
 The JDBCAppender writes log events to a relational database table using 
standard JDBC.
 It can be configured to obtain JDBC connections using a JNDI `DataSource` or a 
custom factory method.
@@ -1276,7 +1276,7 @@ However, configurations written for 2.0 that use the 
`<JMSQueue/>` or `<JMSTopic
 | factoryName
 | String
 | _Required_
-| The fully qualified class name that should be used to define the Initial 
Context Factory as defined in 
https://download.oracle.com/javase/7/docs/api/javax/naming/Context.html#INITIAL_CONTEXT_FACTORY[INITIAL_CONTEXT_FACTORY].
 If a `factoryName` is specified without a `providerURL`, a warning message 
will be logged as this is likely to cause problems.
+| The fully qualified class name that should be used to define the Initial 
Context Factory as defined in 
https://docs.oracle.com/javase/{java-target-version}/docs/api/javax/naming/Context.html#INITIAL_CONTEXT_FACTORY[`INITIAL_CONTEXT_FACTORY`].
 If a `factoryName` is specified without a `providerURL`, a warning message 
will be logged as this is likely to cause problems.
 
 | filter
 | Filter
@@ -1301,7 +1301,7 @@ However, configurations written for 2.0 that use the 
`<JMSQueue/>` or `<JMSTopic
 | providerURL
 | String
 | _Required_
-| The URL of the provider to use as defined by 
https://download.oracle.com/javase/7/docs/api/javax/naming/Context.html#PROVIDER_URL[PROVIDER_URL].
 From Log4j 2.17, only the `java:` protocol is supported.
+| The URL of the provider to use as defined by 
https://docs.oracle.com/javase/{java-target-version}/docs/api/javax/naming/Context.html#PROVIDER_URL[PROVIDER_URL].
 From Log4j 2.17, only the `java:` protocol is supported.
 
 | destinationBindingName
 | String
@@ -1311,12 +1311,12 @@ However, configurations written for 2.0 that use the 
`<JMSQueue/>` or `<JMSTopic
 | securityPrincipalName
 | String
 | null
-| The name of the identity of the Principal as specified by 
https://download.oracle.com/javase/7/docs/api/javax/naming/Context.html#SECURITY_PRINCIPAL[SECURITY_PRINCIPAL].
 If a securityPrincipalName is specified without `securityCredentials`, a 
warning message will be logged as this is likely to cause problems.
+| The name of the identity of the Principal as specified by 
https://docs.oracle.com/javase/{java-target-version}/docs/api/javax/naming/Context.html#SECURITY_PRINCIPAL[SECURITY_PRINCIPAL].
 If a securityPrincipalName is specified without `securityCredentials`, a 
warning message will be logged as this is likely to cause problems.
 
 | securityCredentials
 | String
 | null
-| The security credentials for the principal as specified by 
https://download.oracle.com/javase/7/docs/api/javax/naming/Context.html#SECURITY_CREDENTIALS[SECURITY_CREDENTIALS].
+| The security credentials for the principal as specified by 
https://docs.oracle.com/javase/{java-target-version}/docs/api/javax/naming/Context.html#SECURITY_CREDENTIALS[SECURITY_CREDENTIALS].
 
 | ignoreExceptions
 | boolean
@@ -1336,7 +1336,7 @@ However, configurations written for 2.0 that use the 
`<JMSQueue/>` or `<JMSTopic
 | urlPkgPrefixes
 | String
 | null
-| A colon-separated list of package prefixes for the class name of the factory 
class that will create a URL context factory as defined by 
https://download.oracle.com/javase/7/docs/api/javax/naming/Context.html#URL_PKG_PREFIXES[URL_PKG_PREFIXES].
+| A colon-separated list of package prefixes for the class name of the factory 
class that will create a URL context factory as defined by 
https://docs.oracle.com/javase/{java-target-version}/docs/api/javax/naming/Context.html#URL_PKG_PREFIXES[URL_PKG_PREFIXES].
 
 | userName
 | String
@@ -1574,7 +1574,7 @@ Additional headers can be specified with embedded 
Property elements.
 It will also wait for a response from the server, and throw an error if no 2xx 
response is received.
 
 Implemented with
-https://docs.oracle.com/javase/7/docs/api/java/net/HttpURLConnection.html[`HttpURLConnection`].
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/net/HttpURLConnection.html[`HttpURLConnection`].
 
 .HttpAppender Parameters
 [cols="20%,20%,60%",options="header",]
@@ -1761,7 +1761,7 @@ CompositeFilter.
 
 |immediateFlush |boolean a|
 When set to true, each write will be followed by a call to
-http://docs.oracle.com/javase/7/docs/api/java/nio/MappedByteBuffer.html#force()[MappedByteBuffer.force()].
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/MappedByteBuffer.html#force()[`MappedByteBuffer#force()`].
 This will guarantee the data is written to the storage device.
 
 The default for this parameter is `false`. This means that the data is
@@ -2522,7 +2522,7 @@ of its parent directories, do not exist, they will be 
created.
 file. The format of the pattern is dependent on the `RolloverPolicy` that
 is used. The DefaultRolloverPolicy will accept both a date/time pattern
 compatible with
-https://download.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html[`SimpleDateFormat`]
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/text/SimpleDateFormat.html[`SimpleDateFormat`]
 and/or a %i which represents an integer counter. The integer counter
 allows specifying a padding, like %3i for space-padding the counter to
 3 digits or (usually more useful) %03i for zero-padding the counter to
@@ -2571,7 +2571,7 @@ File attribute permissions in POSIX format to apply 
whenever the file is
 created.
 
 The underlying files system shall support
-https://docs.oracle.com/javase/7/docs/api/java/nio/file/attribute/PosixFileAttributeView.html[POSIX]
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/file/attribute/PosixFileAttributeView.html[POSIX]
 file attribute view.
 
 Examples: rw------- or rw-rw-rw- etc...
@@ -2587,14 +2587,14 @@ 
http://www.gnu.org/software/libc/manual/html_node/Options-for-Files.html[_POSIX_
 is in effect for path.
 
 The underlying files system shall support file
-https://docs.oracle.com/javase/7/docs/api/java/nio/file/attribute/FileOwnerAttributeView.html[owner]
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/file/attribute/FileOwnerAttributeView.html[owner]
 attribute view.
 
 |fileGroup |String a|
 File group to define whenever the file is created.
 
 The underlying files system shall support
-https://docs.oracle.com/javase/7/docs/api/java/nio/file/attribute/PosixFileAttributeView.html[POSIX]
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/file/attribute/PosixFileAttributeView.html[POSIX]
 file attribute view.
 
 |=======================================================================
@@ -3011,9 +3011,9 @@ Users can create custom conditions or use the built-in 
conditions:
 
 * <<DeleteIfFileName,`IfFileName`>> - accepts files whose path
 (relative to the base path) matches a
-https://docs.oracle.com/javase/7/docs/api/java/util/regex/Pattern.html[regular
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/util/regex/Pattern.html[regular
 expression] or a
-https://docs.oracle.com/javase/7/docs/api/java/nio/file/FileSystem.html#getPathMatcher(java.lang.String)[glob].
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/file/FileSystem.html#getPathMatcher(java.lang.String)[glob].
 * <<DeleteIfLastModified,`IfLastModified`>> - accepts files that are as
 old as or older than the specified
 
link:../javadoc/log4j-core/org/apache/logging/log4j/core/appender/rolling/action/Duration.html#parse(CharSequence)[duration].
@@ -3054,13 +3054,13 @@ and must return a list with the paths to delete.
 |glob |String |_Required if regex is not specified._ Matches the relative
 path (relative to the base path) using a limited pattern language that
 resembles regular expressions but with a
-https://docs.oracle.com/javase/7/docs/api/java/nio/file/FileSystem.html#getPathMatcher(java.lang.String)[simpler
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/file/FileSystem.html#getPathMatcher(java.lang.String)[simpler
 syntax].
 
 |regex |String |_Required if glob not specified._ Matches the relative
 path (relative to the base path) using a regular expression as defined
 by the
-https://docs.oracle.com/javase/7/docs/api/java/util/regex/Pattern.html[`Pattern`]
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/util/regex/Pattern.html[`Pattern`]
 class.
 
 |nestedConditions |PathCondition[] |An optional set of nested
@@ -3336,7 +3336,7 @@ File attribute permissions in POSIX format to apply when 
action is
 executed.
 
 The underlying files system shall support
-https://docs.oracle.com/javase/7/docs/api/java/nio/file/attribute/PosixFileAttributeView.html[`POSIX`]
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/file/attribute/PosixFileAttributeView.html[`POSIX`]
 file attribute view.
 
 Examples: rw------- or rw-rw-rw- etc...
@@ -3352,14 +3352,14 @@ 
http://www.gnu.org/software/libc/manual/html_node/Options-for-Files.html[_POSIX_
 is in effect for path.
 
 The underlying files system shall support file
-https://docs.oracle.com/javase/7/docs/api/java/nio/file/attribute/FileOwnerAttributeView.html[`owner`]
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/file/attribute/FileOwnerAttributeView.html[`owner`]
 attribute view.
 
 |fileGroup |String a|
 File group to define when action is executed.
 
 The underlying files system shall support
-https://docs.oracle.com/javase/7/docs/api/java/nio/file/attribute/PosixFileAttributeView.html[`POSIX`]
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/file/attribute/PosixFileAttributeView.html[`POSIX`]
 file attribute view.
 
 |=======================================================================
@@ -3439,7 +3439,7 @@ of its parent directories, do not exist, they will be 
created.
 file. The format of the pattern should is dependent on the
 RolloverPolicy that is used. The DefaultRolloverPolicy will accept both
 a date/time pattern compatible with
-https://download.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html[`SimpleDateFormat`]
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/text/SimpleDateFormat.html[`SimpleDateFormat`]
 and/or a %i which represents an integer counter. The pattern also
 supports interpolation at runtime so any of the Lookups (such as the
 xref:manual/lookups.adoc#DateLookup[DateLookup] can be included in the
@@ -3481,7 +3481,7 @@ File attribute permissions in POSIX format to apply 
whenever the file is
 created.
 
 The underlying files system shall support
-https://docs.oracle.com/javase/7/docs/api/java/nio/file/attribute/PosixFileAttributeView.html[`POSIX`]
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/file/attribute/PosixFileAttributeView.html[`POSIX`]
 file attribute view.
 
 Examples: `rw-------` or `rw-rw-rw-` etc...
@@ -3497,14 +3497,14 @@ 
http://www.gnu.org/software/libc/manual/html_node/Options-for-Files.html[_POSIX_
 is in effect for path.
 
 The underlying file system shall support file
-https://docs.oracle.com/javase/7/docs/api/java/nio/file/attribute/FileOwnerAttributeView.html[`owner`]
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/file/attribute/FileOwnerAttributeView.html[`owner`]
 attribute view.
 
 |fileGroup |String a|
 File group to define whenever the file is created.
 
 The underlying files system shall support
-https://docs.oracle.com/javase/7/docs/api/java/nio/file/attribute/PosixFileAttributeView.html[`POSIX`]
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/file/attribute/PosixFileAttributeView.html[`POSIX`]
 file attribute view.
 
 |=======================================================================
@@ -4106,12 +4106,12 @@ combined with either `password` or 
`passwordEnvironmentVariable`.
 |type |String |Optional KeyStore type, e.g. `JKS`, `PKCS12`, `PKCS11`,
 `BKS`, `Windows-MY/Windows-ROOT`, `KeychainStore`, etc. The default is
 JKS. See also
-http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#KeyStore[Standard
+https://docs.oracle.com/javase/{java-target-version}/docs/technotes/guides/security/StandardNames.html#KeyStore[Standard
 types].
 
 |keyManagerFactoryAlgorithm |String |Optional KeyManagerFactory
 algorithm. The default is `SunX509`. See also
-http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#KeyManagerFactory[Standard
+https://docs.oracle.com/javase/{java-target-version}/docs/technotes/guides/security/StandardNames.html#KeyManagerFactory[Standard
 algorithms].
 |=======================================================================
 
@@ -4142,12 +4142,12 @@ combined with either `password` or 
`passwordEnvironmentVariable`.
 |type |String |Optional KeyStore type, e.g. `JKS`, `PKCS12`, `PKCS11`,
 `BKS`, `Windows-MY/Windows-ROOT`, `KeychainStore`, etc. The default is
 JKS. See also
-http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#KeyStore[Standard
+https://docs.oracle.com/javase/{java-target-version}/docs/technotes/guides/security/StandardNames.html#KeyStore[Standard
 types].
 
 |trustManagerFactoryAlgorithm |String |Optional TrustManagerFactory
 algorithm. The default is `SunX509`. See also
-http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#TrustManagerFactory[Standard
+https://docs.oracle.com/javase/{java-target-version}/docs/technotes/guides/security/StandardNames.html#TrustManagerFactory[Standard
 algorithms].
 |=======================================================================
 
@@ -4180,7 +4180,7 @@ syslog record.
 
 |charset |String |The character set to use when converting the Syslog
 String to a byte array. The String must be a valid
-https://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html[`Charset`].
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/charset/Charset.html[`Charset`].
 If not specified, the default system Charset will be used.
 
 |connectTimeoutMillis |integer |The connect timeout in milliseconds. The
diff --git a/src/site/antora/modules/ROOT/pages/manual/async.adoc 
b/src/site/antora/modules/ROOT/pages/manual/async.adoc
index bc5f7e742b..65ff085619 100644
--- a/src/site/antora/modules/ROOT/pages/manual/async.adoc
+++ b/src/site/antora/modules/ROOT/pages/manual/async.adoc
@@ -65,7 +65,7 @@ Under the hood these methods use different Log4j plugins, but 
also share a
 === Making all loggers asynchronous
 
 This is the simplest to configure and gives the best performance: to make all 
logger asynchronous, **all** you need to set the
-xref:manual/systemproperties.adoc#log4j2.contextSelector[log4j2.contextSelector]
+xref:manual/systemproperties.adoc#log4j2.contextSelector[`log4j2.contextSelector`]
 property to one of the asynchronous logger context selectors:
 
 
link:../javadoc/log4j-core/org/apache/logging/log4j/core/async/BasicAsyncLoggerContextSelector.html[`org.apache.logging.log4j.core.async.BasicAsyncLoggerContextSelector`]::
@@ -102,7 +102,7 @@ See 
xref:manual/systemproperties.adoc#properties-async-logger[asynchronous logge
 [TIP]
 ====
 You can place the selected value of the
-xref:manual/systemproperties.adoc#log4j2.contextSelector[log4j2.contextSelector]
 and other configuration properties in a `log4j2.component.properties` file at 
the root of your application's classpath.
+xref:manual/systemproperties.adoc#log4j2.contextSelector[`log4j2.contextSelector`]
 and other configuration properties in a `log4j2.component.properties` file at 
the root of your application's classpath.
 
 See xref:manual/systemproperties.adoc#property-sources[Property Sources] for 
more details.
 ====
@@ -114,7 +114,7 @@ Synchronous and asynchronous loggers can be combined in a 
single configuration.
 This gives you more flexibility at the cost of a slight loss in performance 
(compared to making all loggers asynchronous).
 
 In order to use this configuration, you need to keep the
-xref:manual/systemproperties.adoc#log4j2.contextSelector[log4j2.contextSelector]
 at its default value and use one of the
+xref:manual/systemproperties.adoc#log4j2.contextSelector[`log4j2.contextSelector`]
 at its default value and use one of the
 `AsyncRoot` and `AsyncLogger` configuration elements to designate the loggers 
that you want to be asynchronous.
 
 A configuration that mixes asynchronous loggers might look like:
@@ -233,7 +233,7 @@ In order to enable it for a certain logger, set its 
xref:manual/configuration.ad
 == Exception handler
 
 In order to handle exceptions that occur on the asynchronous thread, you can 
configure a custom
-https://lmax-exchange.github.io/disruptor/javadoc/com.lmax.disruptor/com/lmax/disruptor/ExceptionHandler.html[ExceptionHandler<T>].
+https://lmax-exchange.github.io/disruptor/javadoc/com.lmax.disruptor/com/lmax/disruptor/ExceptionHandler.html[`ExceptionHandler<T>`].
 
 The exact type of handler depends on the configuration mode:
 
@@ -243,7 +243,7 @@ If all the loggers are asynchronous you need to:
 +
 * implement an 
link:../javadoc/log4j-core/org/apache/logging/log4j/core/async/RingBufferLogEvent.html[`ExceptionHandler<?
 super RingBufferLogEvent>`]
 * set its fully qualified class name as value of the
-xref:manual/systemproperties.adoc#log4j2.asyncLoggerExceptionHandler[log4j2.asyncLoggerExceptionHandler]
+xref:manual/systemproperties.adoc#log4j2.asyncLoggerExceptionHandler[`log4j2.asyncLoggerExceptionHandler`]
 configuration property.
 
 Mixed synchronous/asynchronous::
@@ -253,5 +253,5 @@ If you use a mix of synchronous and asynchronous loggers 
you need to:
 * implement a
 
link:../javadoc/log4j-core/org/apache/logging/log4j/core/async/AsyncLoggerConfigDisruptor.Log4jEventWrapper.html[`ExceptionHandler<?
 super AsyncLoggerConfigDisruptor.Log4jEventWrapper>`]
 * set its fully qualified class name as value of the
-xref:manual/systemproperties.adoc#log4j2.asyncLoggerConfigExceptionHandler[log4j2.asyncLoggerConfigExceptionHandler]
+xref:manual/systemproperties.adoc#log4j2.asyncLoggerConfigExceptionHandler[`log4j2.asyncLoggerConfigExceptionHandler`]
 configuration property.
diff --git a/src/site/antora/modules/ROOT/pages/manual/configuration.adoc 
b/src/site/antora/modules/ROOT/pages/manual/configuration.adoc
index 05cc479f30..96c71090c0 100644
--- a/src/site/antora/modules/ROOT/pages/manual/configuration.adoc
+++ b/src/site/antora/modules/ROOT/pages/manual/configuration.adoc
@@ -63,7 +63,7 @@ Upon initialization of a new logger context, Log4j assigns it 
a context name and
 
link:../javadoc/log4j-core/org/apache/logging/log4j/core/config/DefaultConfiguration.html[`DefaultConfiguration`]
 and the xref:manual/status-logger.adoc[status logger] prints a warning.
 The default configuration prints all messages less specific than
-xref:manual/systemproperties.adoc#log4j2.level[log4j2.level]
+xref:manual/systemproperties.adoc#log4j2.level[`log4j2.level`]
 to the console.
 
 [CAUTION]
@@ -110,11 +110,11 @@ See xref:manual/webapp.adoc#configuration[Log4j
 [NOTE]
 ====
 It is also possible to override the location of the configuration file using 
the
-xref:manual/systemproperties.adoc#log4j2.configurationFile[log4j2.configurationFile]
+xref:manual/systemproperties.adoc#log4j2.configurationFile[`log4j2.configurationFile`]
 configuration property.
 In this case, Log4j will guess the configuration file format from the provided 
configuration file extension or use the default configuration factory if the 
extension is unknown.
 
-See 
xref:manual/systemproperties.adoc#log4j2.configurationFile[log4j2.configurationFile]
 for details.
+See 
xref:manual/systemproperties.adoc#log4j2.configurationFile[`log4j2.configurationFile`]
 for details.
 ====
 
 [id=configuration-syntax]
@@ -582,7 +582,7 @@ xref:manual/architecture.adoc#logger-hierarchy[parent 
logger]).
 
 | Default value
 a|
-* xref:manual/systemproperties.adoc#log4j2.level[log4j2.level],
+* xref:manual/systemproperties.adoc#log4j2.level[`log4j2.level`],
 for `Root` and `AsyncRoot`,
 * inherited from the
 xref:manual/architecture.adoc#logger-hierarchy[parent logger],
@@ -610,14 +610,13 @@ a|
 ** `false` for `AsyncRoot` and `AsyncLogger`.
 
 See
-xref:manual/systemproperties.adoc#log4j2.contextSelector[log4j2.contextSelector]
+xref:manual/systemproperties.adoc#log4j2.contextSelector[`log4j2.contextSelector`]
 for more details.
 |===
 
 Specifies whether Log4j is allowed to compute location information.
 If set to `false`, Log4j will not attempt to infer the location of the logging 
call unless said location was provided explicitly using one of the available
-https://logging.apache.org/log4j/2.x/javadoc/log4j-api/org/apache/logging/log4j/LogBuilder.html[LogBuilder
-.withLocation()]
+https://logging.apache.org/log4j/2.x/javadoc/log4j-api/org/apache/logging/log4j/LogBuilder.html[`LogBuilder#withLocation()`]
 methods.
 
 See xref:manual/layouts.adoc#LocationInformation[Location information] for 
more details.
@@ -1074,13 +1073,13 @@ 
include::example$manual/configuration/arbiters-select.properties[tag=select]
 === Composite Configuration
 
 Log4j allows multiple configuration files to be used at the same time by 
specifying them as a list of comma-separated file paths or URLs in the
-xref:manual/systemproperties.adoc#log4j2.configurationFile[log4j2.configurationFile]
+xref:manual/systemproperties.adoc#log4j2.configurationFile[`log4j2.configurationFile`]
 configuration property.
 
 These configuration files are merged into a single configuration file using
 
link:../javadoc/log4j-core/org/apache/logging/log4j/core/config/composite/MergeStrategy.html[`MergeStrategy`]
 service that can be customized using the
-xref:manual/systemproperties.adoc#log4j2.mergeStrategy[log4j2.mergeStrategy]
+xref:manual/systemproperties.adoc#log4j2.mergeStrategy[`log4j2.mergeStrategy`]
 configuration property.
 
 The default merge strategy will merge the files using the following rules:
diff --git a/src/site/antora/modules/ROOT/pages/manual/garbagefree.adoc 
b/src/site/antora/modules/ROOT/pages/manual/garbagefree.adoc
index 842f168948..c8736c8ef1 100644
--- a/src/site/antora/modules/ROOT/pages/manual/garbagefree.adoc
+++ b/src/site/antora/modules/ROOT/pages/manual/garbagefree.adoc
@@ -168,14 +168,14 @@ xref:manual/api.adoc[Log4j API] contains several features 
to facilitate garbage-
 === Parameterized message arguments
 
 The `Logger` interface contains methods for parameterized messages up to 10 
arguments.
-Logging more than 10 parameters creates 
https://docs.oracle.com/javase/8/docs/technotes/guides/language/varargs.html[vararg
 arrays].
+Logging more than 10 parameters creates 
https://docs.oracle.com/javase/{java-target-version}/docs/technotes/guides/language/varargs.html[vararg
 arrays].
 
 [#api-encode-custom-object]
 === Encoding custom objects
 
 When a message parameter contains an unknown type by the layout, it will 
encode by calling `toString()` on these objects.
 Most objects don't have garbage-free `toString()` methods.
-Objects themselves can implement their own garbage-free encoders by either 
extending from 
https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html[Java's 
`CharSequence`] or 
link:../javadoc/log4j-api/org/apache/logging/log4j/util/StringBuilderFormattable.html[Log4j's
 `StringBuilderFormattable`].
+Objects themselves can implement their own garbage-free encoders by either 
extending from 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/lang/CharSequence.html[Java's
 `CharSequence`] or 
link:../javadoc/log4j-api/org/apache/logging/log4j/util/StringBuilderFormattable.html[Log4j's
 `StringBuilderFormattable`].
 
 [#codeImpact]
 === Avoiding autoboxing
diff --git a/src/site/antora/modules/ROOT/pages/manual/jmx.adoc 
b/src/site/antora/modules/ROOT/pages/manual/jmx.adoc
index 8795690d13..46a30e019e 100644
--- a/src/site/antora/modules/ROOT/pages/manual/jmx.adoc
+++ b/src/site/antora/modules/ROOT/pages/manual/jmx.adoc
@@ -33,7 +33,7 @@ JMX support is disabled by default.
 NOTE: JMX support was enabled by default in Log4j 2 versions before 2.24.0.
 
 To enable JMX support, set the
-xref:manual/systemproperties.adoc#log4j2.disableJmx[log4j2.disableJmx]
+xref:manual/systemproperties.adoc#log4j2.disableJmx[`log4j2.disableJmx`]
 system property when starting the Java VM:
 
 `log4j2.disableJmx=false`
@@ -42,14 +42,13 @@ system property when starting the Java VM:
 == Local Monitoring and Management
 
 To perform local monitoring you need to set the
-xref:manual/systemproperties.adoc#log4j2.disableJmx[log4j2
-.disableJmx]
+xref:manual/systemproperties.adoc#log4j2.disableJmx[`log4j2.disableJmx`]
 system property to `false`.
 The JConsole tool that is included in the Java JDK can be
 used to monitor your application. Start JConsole by typing
 `$JAVA_HOME/bin/jconsole` in a command shell. For more details,
 see Oracle's documentation at
-https://docs.oracle.com/javase/7/docs/technotes/guides/management/jconsole.html[how
+https://docs.oracle.com/javase/{java-target-version}/docs/technotes/guides/management/jconsole.html[how
 to use JConsole].
 
 [#Remote]
@@ -68,14 +67,14 @@ In the property above, `portNum` is the port number through 
which you
 want to enable JMX RMI connections.
 
 For more details, see Oracle's documentation at
-https://docs.oracle.com/javase/7/docs/technotes/guides/management/agent.html#gdenl[Remote
+https://docs.oracle.com/javase/{java-target-version}/docs/technotes/guides/management/agent.html#gdenl[Remote
 Monitoring and Management].
 
 [#RMI_GC]
 == RMI impact on Garbage Collection
 
 Be aware that RMI by default triggers a full GC every hour. See the
-https://docs.oracle.com/javase/7/docs/technotes/guides/rmi/sunrmiproperties.html[Oracle
+https://docs.oracle.com/javase/{java-target-version}/docs/technotes/guides/rmi/sunrmiproperties.html[Oracle
 documentation] for the `sun.rmi.dgc.server.gcInterval` and
 `sun.rmi.dgc.client.gcInterval` properties. The default value of both
 properties is 3600000 milliseconds (one hour). Before Java 6, it was one
diff --git a/src/site/antora/modules/ROOT/pages/manual/layouts.adoc 
b/src/site/antora/modules/ROOT/pages/manual/layouts.adoc
index 5e54e9238d..17a06a8c4f 100644
--- a/src/site/antora/modules/ROOT/pages/manual/layouts.adoc
+++ b/src/site/antora/modules/ROOT/pages/manual/layouts.adoc
@@ -32,7 +32,7 @@ This section introduces you to some common concerns shared by 
almost all <<colle
 [#charset]
 === Character encoding
 
-All <<collection[predefined layouts] produce `String` that eventually get 
converted into a `byte>>` using the 
https://docs.oracle.com/javase/8/docs/api/java/nio/charset/Charset.html[`Charset`]
 configured.
+All <<collection[predefined layouts] produce `String` that eventually get 
converted into a `byte>>` using the 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/charset/Charset.html[`Charset`]
 configured.
 While doing so, unless an explicit encoding configuration is stated, they use 
`UTF-8` by default.
 If you want all your log events to be formatted in a certain character 
encoding that is different from what the employed layout defaults to, make sure 
to configure the layout's character encoding as needed.
 
@@ -424,8 +424,8 @@ For other valid values, refer to 
xref:manual/pattern-layout.adoc#converter-date[
 |timezone
 |String
 |The time zone ID of the log event.
-If not specified, this layout uses the 
https://docs.oracle.com/javase/8/docs/api/java/util/TimeZone.html#getDefault()[`TimeZone.getDefault()`]
 as the default.
-You can use time zone IDs supported by 
https://docs.oracle.com/javase/8/docs/api/java/util/TimeZone.html#getTimeZone(java.lang.String)[`TimeZone.getTimeZone(String)`].
+If not specified, this layout uses the 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/util/TimeZone.html#getDefault()[`TimeZone.getDefault()`]
 as the default.
+You can use time zone IDs supported by 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/util/TimeZone.html#getTimeZone(java.lang.String)[`TimeZone.getTimeZone(String)`].
 
 |title
 |String
@@ -837,7 +837,7 @@ This attribute only applies to RFC 5424 Syslog records.
 [#SerializedLayout]
 === Serialized Layout
 
-`SerializedLayout` encodes a log event using 
https://docs.oracle.com/javase/8/docs/platform/serialization/spec/protocol.html[Java
 Serialization].
+`SerializedLayout` encodes a log event using 
https://docs.oracle.com/javase/{java-target-version}/docs/platform/serialization/spec/protocol.html[Java
 Serialization].
 It accepts no configuration parameters.
 
 [WARNING]
diff --git a/src/site/antora/modules/ROOT/pages/manual/logsep.adoc 
b/src/site/antora/modules/ROOT/pages/manual/logsep.adoc
index e277989943..21675680c6 100644
--- a/src/site/antora/modules/ROOT/pages/manual/logsep.adoc
+++ b/src/site/antora/modules/ROOT/pages/manual/logsep.adoc
@@ -108,7 +108,7 @@ in each web application.
 
 The `JndiContextSelector` will not work unless `log4j2.enableJndi=true` is set 
as a system property
 or environment variable. See the
-xref:manual/systemproperties.adoc#log4j2.enableJndiContextSelector[log4j2.enableJndiContextSelector]
+xref:manual/systemproperties.adoc#log4j2.enableJndiContextSelector[`log4j2.enableJndiContextSelector`]
 configuration property.
 
 The exact method for setting system properties depends on the container.
diff --git a/src/site/antora/modules/ROOT/pages/manual/lookups.adoc 
b/src/site/antora/modules/ROOT/pages/manual/lookups.adoc
index 1136a22981..3b24c6ee4d 100644
--- a/src/site/antora/modules/ROOT/pages/manual/lookups.adoc
+++ b/src/site/antora/modules/ROOT/pages/manual/lookups.adoc
@@ -52,7 +52,7 @@ resolve the variable for each event. Note that the pattern
 The DateLookup is somewhat unusual from the other lookups as it doesn't
 use the key to locate an item. Instead, the key can be used to specify a
 date format string that is valid for
-http://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html[SimpleDateFormat].
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/text/SimpleDateFormat.html[`SimpleDateFormat`].
 The current date, or the date associated with the current log event will
 be formatted as specified.
 
@@ -269,7 +269,7 @@ For example:
 
 As of Log4j 2.15.1 JNDI operations require that `log4j2.enableJndi=true` be 
set as a system property or the
 corresponding environment variable for this lookup to function. See the
-xref:manual/systemproperties.adoc#log4j2.enableJndiLookup[log4j2.enableJndiLookup]
 system property.
+xref:manual/systemproperties.adoc#log4j2.enableJndiLookup[`log4j2.enableJndiLookup`]
 system property.
 
 The JndiLookup allows variables to be retrieved via JNDI. By default the
 key will be prefixed with java:comp/env/, however if the key contains a
@@ -303,7 +303,7 @@ acquire the JVM arguments.
 Use the prefix `jvmrunargs` to access JVM arguments.
 
 See the Javadocs for
-https://docs.oracle.com/javase/8/docs/api/java/lang/management/RuntimeMXBean.html#getInputArguments--[`java.lang.management.RuntimeMXBean.getInputArguments()`].
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/lang/management/RuntimeMXBean.html#getInputArguments--[`java.lang.management.RuntimeMXBean.getInputArguments()`].
 
 *Java's JMX module is not available on Android or on Google App Engine.*
 
diff --git a/src/site/antora/modules/ROOT/pages/manual/pattern-layout.adoc 
b/src/site/antora/modules/ROOT/pages/manual/pattern-layout.adoc
index 27522f65e3..fac5648b2a 100644
--- a/src/site/antora/modules/ROOT/pages/manual/pattern-layout.adoc
+++ b/src/site/antora/modules/ROOT/pages/manual/pattern-layout.adoc
@@ -230,7 +230,7 @@ This performs a function similar to <<converter-replace,the 
`replace` converter>
 
 It supports following attributes:
 
-`regex`:: A 
https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html[Java-compliant
 regular expression] to match the resulting string
+`regex`:: A 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/util/regex/Pattern.html[Java-compliant
 regular expression] to match the resulting string
 
 `replacement`:: The string to replace any matched substrings with
 
@@ -389,7 +389,7 @@ d{pattern}
 date{pattern}
 ----
 
-The date conversion specifier may be followed by a set of braces containing a 
date and time pattern string per 
https://docs.oracle.com/javase/8/docs/api/java/text/SimpleDateFormat.html[`SimpleDateFormat`].
+The date conversion specifier may be followed by a set of braces containing a 
date and time pattern string per 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/text/SimpleDateFormat.html[`SimpleDateFormat`].
 The predefined _named_ formats are:
 
 [%header,cols="2m,3m"]
@@ -443,7 +443,7 @@ The predefined _named_ formats are:
 |1351866842781
 |===
 
-You can also use a set of braces containing a time zone id per 
https://docs.oracle.com/javase/8/docs/api/java/util/TimeZone.html#getTimeZone(java.lang.String)[`java.util.TimeZone#getTimeZone(String)`].
+You can also use a set of braces containing a time zone id per 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/util/TimeZone.html#getTimeZone(java.lang.String)[`java.util.TimeZone#getTimeZone(String)`].
 If no date format specifier is given then the `DEFAULT` format is used.
 
 You can also define custom date formats, see following examples:
diff --git a/src/site/antora/modules/ROOT/pages/manual/scripts.adoc 
b/src/site/antora/modules/ROOT/pages/manual/scripts.adoc
index a3a60c8ca6..2d150312d6 100644
--- a/src/site/antora/modules/ROOT/pages/manual/scripts.adoc
+++ b/src/site/antora/modules/ROOT/pages/manual/scripts.adoc
@@ -18,13 +18,13 @@
 = Scripts
 
 Log4j provides support for
-https://docs.oracle.com/javase/6/docs/technotes/guides/scripting/[JSR
+https://docs.oracle.com/javase/{java-target-version}/docs/technotes/guides/scripting/[JSR
 223] scripting languages to be used in some of its components.
 
 [WARNING]
 ====
 In order to enable a scripting language, its name must be included in the
-xref:manual/systemproperties.adoc#log4j2.scriptEnableLanguages[log4j2.scriptEnableLanguages]
+xref:manual/systemproperties.adoc#log4j2.scriptEnableLanguages[`log4j2.scriptEnableLanguages`]
 configuration property.
 ====
 
diff --git a/src/site/antora/modules/ROOT/pages/manual/systemproperties.adoc 
b/src/site/antora/modules/ROOT/pages/manual/systemproperties.adoc
index 32f2ea30b7..822d343bfe 100644
--- a/src/site/antora/modules/ROOT/pages/manual/systemproperties.adoc
+++ b/src/site/antora/modules/ROOT/pages/manual/systemproperties.adoc
@@ -189,7 +189,7 @@ 
include::partial$manual/systemproperties/properties-thread-context.adoc[leveloff
 [id=properties-transport-security]
 === Transport security
 
-Since configuration files can be used to load arbitrary classes into a Log4j 
Core `Configuration`, users need to ensure that all the configuration elements 
come from trusted sources (cf. 
link:/security#threat-common-config-sources[Thread model] for more information).
+Since configuration files can be used to load arbitrary classes into a Log4j 
Core `Configuration`, users need to ensure that all the configuration elements 
come from trusted sources (cf. 
{logging-services-url}/security#threat-common-config-sources[Thread model] for 
more information).
 
 In order to protect the user Log4j disables the `http` URI scheme by default 
and provides several configuration options to ensure secure transport of 
configuration files:
 
@@ -225,7 +225,7 @@ 
link:../javadoc/log4j-api/org/apache/logging/log4j/util/PropertySource.html[`Pro
 
 Additional property source classes can be added through:
 
-* the standard Java SE 
https://docs.oracle.com/en/java/javase/{java-target-version}/docs/api/java.base/java/util/ServiceLoader.html[ServiceLoader]
 mechanism,
+* the standard Java SE 
https://docs.oracle.com/en/java/javase/{java-target-version}/docs/api/java.base/java/util/ServiceLoader.html[`ServiceLoader`]
 mechanism,
 * programmatically using `addPropertySource()` and `removePropertySource()` 
static methods of `PropertiesUtil`.
 
 Each property source can define its own naming convention for property names, 
although most of them support the standard:
@@ -249,7 +249,7 @@ Log4j provides the following implementations:
 | -100
 | standard
 | log4j-spring
-| Delegates property resolution to a Spring 
https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/core/env/Environment.html[Environment].
 See xref:log4j-spring-boot.adoc[] for details.
+| Delegates property resolution to a Spring 
https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/core/env/Environment.html[`Environment`].
 See xref:log4j-spring-boot.adoc[] for details.
 
 | SystemPropertiesPropertySource
 | 0
diff --git a/src/site/antora/modules/ROOT/pages/manual/thread-context.adoc 
b/src/site/antora/modules/ROOT/pages/manual/thread-context.adoc
index 7354b5a0e5..771394cbfa 100644
--- a/src/site/antora/modules/ROOT/pages/manual/thread-context.adoc
+++ b/src/site/antora/modules/ROOT/pages/manual/thread-context.adoc
@@ -17,7 +17,7 @@
 
 = Thread Context
 
-Just like 
https://docs.oracle.com/javase/8/docs/api/java/lang/ThreadLocal.html[Java's 
`ThreadLocal`], _Thread Context_ facilitates associating information with the 
executing thread and making this information accessible to the rest of the 
logging system.
+Just like 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/lang/ThreadLocal.html[Java's
 `ThreadLocal`], _Thread Context_ facilitates associating information with the 
executing thread and making this information accessible to the rest of the 
logging system.
 Thread Context is one of many xref:manual/api.adoc#fish-tagging[_fish tagging_ 
capabilities provided by Log4j API].
 
 [#usage]
diff --git 
a/src/site/antora/modules/ROOT/partials/manual/layouts-location-information.adoc
 
b/src/site/antora/modules/ROOT/partials/manual/layouts-location-information.adoc
index 4695c80bea..1688a7e9e6 100644
--- 
a/src/site/antora/modules/ROOT/partials/manual/layouts-location-information.adoc
+++ 
b/src/site/antora/modules/ROOT/partials/manual/layouts-location-information.adoc
@@ -57,5 +57,5 @@ You can override the default behaviour in your asynchronous 
logger or asynchrono
 [NOTE]
 ====
 Even if a layout is configured not to **request** location information, it 
might use it if the information is already available.
-This is always the case if the location information is captured at build time 
using the link:/log4j/transform/latest/#log4j-transform-maven-plugin[Log4j 
Transform Maven Plugin].
+This is always the case if the location information is captured at build time 
using the 
{logging-services-url}/log4j/transform/latest/#log4j-transform-maven-plugin[Log4j
 Transform Maven Plugin].
 ====
diff --git 
a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-async-logger-config.adoc
 
b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-async-logger-config.adoc
index 03c37d9751..c8883cc040 100644
--- 
a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-async-logger-config.adoc
+++ 
b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-async-logger-config.adoc
@@ -23,13 +23,13 @@
 | `LOG4J_ASYNC_LOGGER_CONFIG_EXCEPTION_HANDLER`
 
 | Type
-| 
https://lmax-exchange.github.io/disruptor/javadoc/com.lmax.disruptor/com/lmax/disruptor/ExceptionHandler.html[Class<?
 extends ExceptionHandler<? super Log4jEventWrapper>>]
+| 
https://lmax-exchange.github.io/disruptor/javadoc/com.lmax.disruptor/com/lmax/disruptor/ExceptionHandler.html[`Class<?
 extends ExceptionHandler<? super Log4jEventWrapper>>`]
 
 | Default value
 | 
link:../javadoc/log4j-core/org/apache/logging/log4j/core/async/AsyncLoggerConfigDefaultExceptionHandler.html[`AsyncLoggerConfigDefaultExceptionHandler`]
 |===
 
-Fully qualified name of a class that implements the 
https://lmax-exchange.github.io/disruptor/javadoc/com.lmax.disruptor/com/lmax/disruptor/ExceptionHandler.html[ExceptionHandler]
 interface, which will be notified when an exception occurs while logging 
messages.
+Fully qualified name of a class that implements the 
https://lmax-exchange.github.io/disruptor/javadoc/com.lmax.disruptor/com/lmax/disruptor/ExceptionHandler.html[`ExceptionHandler`]
 interface, which will be notified when an exception occurs while logging 
messages.
 The class needs to have a public zero-argument constructor.
 
 The default exception handler will print a message and stack trace to the 
standard error output stream.
@@ -63,7 +63,7 @@ When the application is logging faster than the underlying 
appender can keep up
 | Default value | `Timeout`
 |===
 
-Specifies the 
https://lmax-exchange.github.io/disruptor/javadoc/com.lmax.disruptor/com/lmax/disruptor/WaitStrategy.html[WaitStrategy]
 used by the LMAX Disruptor.
+Specifies the 
https://lmax-exchange.github.io/disruptor/javadoc/com.lmax.disruptor/com/lmax/disruptor/WaitStrategy.html[`WaitStrategy`]
 used by the LMAX Disruptor.
 
 The value needs to be one of the predefined constants:
 
diff --git 
a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-async-logger.adoc
 
b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-async-logger.adoc
index 0e1e2c83d5..7cd1af19e6 100644
--- 
a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-async-logger.adoc
+++ 
b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-async-logger.adoc
@@ -20,11 +20,11 @@
 [cols="1h,5"]
 |===
 | Env. variable | `LOG4J_ASYNC_LOGGER_EXCEPTION_HANDLER`
-| Type          | 
https://lmax-exchange.github.io/disruptor/javadoc/com.lmax.disruptor/com/lmax/disruptor/ExceptionHandler.html[Class<?
 extends ExceptionHandler<? super RingBufferLogEvent>>]
+| Type          | 
https://lmax-exchange.github.io/disruptor/javadoc/com.lmax.disruptor/com/lmax/disruptor/ExceptionHandler.html[`Class<?
 extends ExceptionHandler<? super RingBufferLogEvent>>`]
 | Default value | 
link:../javadoc/log4j-core/org/apache/logging/log4j/core/async/AsyncLoggerDefaultExceptionHandler.html[`AsyncLoggerDefaultExceptionHandler`]
 |===
 
-Fully qualified name of a class that implements the 
https://lmax-exchange.github.io/disruptor/javadoc/com.lmax.disruptor/com/lmax/disruptor/ExceptionHandler.html[ExceptionHandler]
 interface, which will be notified when an exception occurs while logging 
messages.
+Fully qualified name of a class that implements the 
https://lmax-exchange.github.io/disruptor/javadoc/com.lmax.disruptor/com/lmax/disruptor/ExceptionHandler.html[`ExceptionHandler`]
 interface, which will be notified when an exception occurs while logging 
messages.
 The class needs to have a public zero-argument constructor.
 
 The default exception handler will print a message and stack trace to the 
standard error output stream.
@@ -58,7 +58,7 @@ When the application is logging faster than the underlying 
appender can keep up
 | Default value | `Timeout`
 |===
 
-Specifies the 
https://lmax-exchange.github.io/disruptor/javadoc/com.lmax.disruptor/com/lmax/disruptor/WaitStrategy.html[WaitStrategy]
 used by the LMAX Disruptor.
+Specifies the 
https://lmax-exchange.github.io/disruptor/javadoc/com.lmax.disruptor/com/lmax/disruptor/WaitStrategy.html[`WaitStrategy`]
 used by the LMAX Disruptor.
 
 The value needs to be one of the predefined constants:
 
@@ -150,7 +150,7 @@ Setting this value to `false` may lead to very high CPU 
utilization when the asy
 Specifies the
 
link:../javadoc/log4j-core/org/apache/logging/log4j/core/async/ThreadNameCachingStrategy.html[`ThreadNameCachingStrategy`]
 to use to cache the result of https://docs.oracle
-.com/javase/{java-target-version}/docs/api/java/lang/Thread.html#getName--[Thread.getName()].
+.com/javase/{java-target-version}/docs/api/java/lang/Thread.html#getName--[`Thread#getName()`].
 
 This setting allows to cache the result of `Thread.getName()` calls and has 
two values:
 
diff --git 
a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-configuration-factory.adoc
 
b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-configuration-factory.adoc
index eb128a789f..1841a4ee4d 100644
--- 
a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-configuration-factory.adoc
+++ 
b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-configuration-factory.adoc
@@ -36,7 +36,7 @@ Log4j will attempt to use the provided configuration factory 
before any other fa
 [cols="1h,5"]
 |===
 | Env. variable | `LOG4J_CONFIGURATION_FILE`
-| Type          | Comma-separated list of 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/file/Path.html[Path]s
 or 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/net/URI.html[`URI`]s
+| Type          | Comma-separated list of 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/file/Path.html[`Path`]s
 or 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/net/URI.html[`URI`]s
 | Default value | 
xref:manual/configuration.adoc#AutomaticConfiguration[automatically detected]
 |===
 
diff --git 
a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-context-selector.adoc
 
b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-context-selector.adoc
index 47d0980d38..551f7b9bc2 100644
--- 
a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-context-selector.adoc
+++ 
b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-context-selector.adoc
@@ -44,8 +44,7 @@ Creates a single logger context and 
xref:manual/async.adoc[asynchronous loggers]
 
link:../javadoc/log4j-core/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.html[`org.apache.logging.log4j.core.selector.ClassLoaderContextSelector`]::
 Creates a separate logger context per classloader and synchronous loggers
 
-link:../javadoc/log4j-core/org/apache/logging/log4j/core/async/AsyncLoggerContextSelector.html[org.apache.logging.log4j
-.core.async.AsyncLoggerContextSelector]::
+link:../javadoc/log4j-core/org/apache/logging/log4j/core/async/AsyncLoggerContextSelector.html[`org.apache.logging.log4j.core.async.AsyncLoggerContextSelector`]::
 Creates a separate logger context per classloader and 
xref:manual/async.adoc[asynchronous loggers]
 
 
link:../javadoc/log4j-core/org/apache/logging/log4j/core/osgi/BundleContextSelector.html[`org.apache.logging.log4j.core.osgi.BundleContextSelector`]::
diff --git 
a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-garbage-collection.adoc
 
b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-garbage-collection.adoc
index 628b0bb328..702ad5fb1a 100644
--- 
a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-garbage-collection.adoc
+++ 
b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-garbage-collection.adoc
@@ -24,7 +24,7 @@
 | Default value | `true`
 |===
 
-If `true`, garbage-aware layouts will directly encode log events into 
https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html[`ByteBuffer`]s
 provided by appenders.
+If `true`, garbage-aware layouts will directly encode log events into 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/ByteBuffer.html[`ByteBuffer`]s
 provided by appenders.
 
 This prevents allocating temporary `String` and `char[]` instances.
 
@@ -39,7 +39,7 @@ This prevents allocating temporary `String` and `char[]` 
instances.
 |===
 
 The size in bytes of the
-https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html[`ByteBuffer`]s
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/ByteBuffer.html[`ByteBuffer`]s
 stored in `ThreadLocal` fields by layouts and
 
link:../javadoc/log4j-core/org/apache/logging/log4j/core/layout/StringBuilderEncoder.html[`StringBuilderEncoder`]s.
 
diff --git 
a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-jndi.adoc
 
b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-jndi.adoc
index 5f93b221e0..bd2f07ba13 100644
--- 
a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-jndi.adoc
+++ 
b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-jndi.adoc
@@ -37,7 +37,7 @@ See xref:manual/webapp.adoc#use-jndi-context-selector[Web 
application] for more
 | Default value | `false`
 |===
 
-When `true`, a Log4j JDBC Appender can use JNDI to retrieve a 
https://docs.oracle.com/javase/8/docs/api/javax/sql/DataSource.html[`DataSource`]
 using the `java:` protocol.
+When `true`, a Log4j JDBC Appender can use JNDI to retrieve a 
https://docs.oracle.com/javase/{java-target-version}/docs/api/javax/sql/DataSource.html[`DataSource`]
 using the `java:` protocol.
 
 [id=log4j2.enableJndiJms]
 == `log4j2.enableJndiJms`
diff --git 
a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-log4j-core-misc.adoc
 
b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-log4j-core-misc.adoc
index 8276e26fb2..d23e19f378 100644
--- 
a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-log4j-core-misc.adoc
+++ 
b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-log4j-core-misc.adoc
@@ -192,7 +192,7 @@ 
link:../javadoc/log4j-core/org/apache/logging/log4j/core/util/ShutdownCallbackRe
 implementation.
 Integrators can use this to customize the shutdown order of the JVM.
 
-The default implementation executes all shutdown actions in a separate 
`Thread` registered through 
https://docs.oracle.com/javase/8/docs/api/java/lang/Runtime.html#addShutdownHook-java.lang.Thread-[`Runtime#addShutdownHook()`].
+The default implementation executes all shutdown actions in a separate 
`Thread` registered through 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/lang/Runtime.html#addShutdownHook-java.lang.Thread-[`Runtime#addShutdownHook()`].
 
 [id=log4j2.uuidSequence]
 == `log4j2.uuidSequence`
diff --git 
a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-log4j-jul.adoc
 
b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-log4j-jul.adoc
index 31a9a62fc0..a52e0d5b3e 100644
--- 
a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-log4j-jul.adoc
+++ 
b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-log4j-jul.adoc
@@ -33,31 +33,31 @@ Fully qualified name of an alternative 
`org.apache.logging.log4j.jul.LevelConver
 |===
 | Java Level | Log4j Level
 
-| 
http://docs.oracle.com/javase/6/docs/api/java/util/logging/Level.html#OFF[OFF]
+| 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/util/logging/Level.html#OFF[OFF]
 | OFF
 
-| 
http://docs.oracle.com/javase/6/docs/api/java/util/logging/Level.html#SEVERE[SEVERE]
+| 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/util/logging/Level.html#SEVERE[SEVERE]
 | ERROR
 
-| 
http://docs.oracle.com/javase/6/docs/api/java/util/logging/Level.html#WARNING[WARNING]
+| 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/util/logging/Level.html#WARNING[WARNING]
 | WARN
 
-| 
http://docs.oracle.com/javase/6/docs/api/java/util/logging/Level.html#INFO[INFO]
+| 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/util/logging/Level.html#INFO[INFO]
 | INFO
 
-| 
http://docs.oracle.com/javase/6/docs/api/java/util/logging/Level.html#CONFIG[CONFIG]
+| 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/util/logging/Level.html#CONFIG[CONFIG]
 | CONFIG
 
-| 
http://docs.oracle.com/javase/6/docs/api/java/util/logging/Level.html#FINE[FINE]
+| 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/util/logging/Level.html#FINE[FINE]
 | DEBUG
 
-| 
http://docs.oracle.com/javase/6/docs/api/java/util/logging/Level.html#FINER[FINER]
+| 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/util/logging/Level.html#FINER[FINER]
 | TRACE
 
-| 
http://docs.oracle.com/javase/6/docs/api/java/util/logging/Level.html#FINEST[FINEST]
+| 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/util/logging/Level.html#FINEST[FINEST]
 | FINEST
 
-| 
http://docs.oracle.com/javase/6/docs/api/java/util/logging/Level.html#ALL[ALL]
+| 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/util/logging/Level.html#ALL[ALL]
 | ALL
 |===
 ====
@@ -78,7 +78,7 @@ This property allows users to choose between two 
implementation of the logging b
 
 org.apache.logging.log4j.jul.CoreLoggerAdapter::
 The default if `log4j-core` is found in the class path.
-It allows users to modify the Log4j Core configuration through the JUL 
https://docs.oracle.com/javase/8/docs/api/java/util/logging/Logger.html[`Logger`]
 interface.
+It allows users to modify the Log4j Core configuration through the JUL 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/util/logging/Logger.html[`Logger`]
 interface.
 
 org.apache.logging.log4j.jul.ApiLoggerAdapter::
 The default if `log4j-core` cannot be found in the class path.
diff --git 
a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-provider.adoc
 
b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-provider.adoc
index a83fc56067..097b4abbf3 100644
--- 
a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-provider.adoc
+++ 
b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-provider.adoc
@@ -30,7 +30,7 @@ 
link:../javadoc/log4j-api/org/apache/logging/log4j/spi/Provider.html[`Provider`]
 to use.
 
 By default, Log4j uses
-https://docs.oracle.com/javase/8/docs/api/java/util/ServiceLoader.html[`ServiceLoader`]
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/util/ServiceLoader.html[`ServiceLoader`]
 to select the provider to use.
 In case multiple providers are found on the classpath the provider with the 
highest priority is selected and a `WARN` message is logger by 
xref:manual/status-logger.adoc[].
 
diff --git 
a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-simple-logger.adoc
 
b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-simple-logger.adoc
index 381cca4f15..8c7b9b60f6 100644
--- 
a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-simple-logger.adoc
+++ 
b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-simple-logger.adoc
@@ -31,7 +31,7 @@ Default level for new logger instances.
 
 [cols="1h,5"]
 |===
-| Env. variable | LOG4J_SIMPLELOG_&lt;LOGGER_NAME&gt;_LEVEL
+| Env. variable | `LOG4J_SIMPLELOG_&lt;loggerName&gt;_LEVEL`
 | Type          | 
link:../javadoc/log4j-api/org/apache/logging/log4j/Level.html[`Level`]
 | Default value | value of <<log4j2.simplelogLevel>>
 |===
@@ -92,7 +92,7 @@ If `true`, a timestamp is included in each log message.
 [cols="1h,5"]
 |===
 | Env. variable | `LOG4J_SIMPLELOG_DATE_TIME_FORMAT`
-| Type          | 
https://docs.oracle.com/javase/8/docs/api/java/text/SimpleDateFormat.html[`SimpleDateFormat`]
 pattern
+| Type          | 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/text/SimpleDateFormat.html[`SimpleDateFormat`]
 pattern
 | Default value | `yyyy/MM/dd HH:mm:ss:SSS zzz`
 |===
 
diff --git 
a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-thread-context.adoc
 
b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-thread-context.adoc
index fe127f62ce..684974cb8d 100644
--- 
a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-thread-context.adoc
+++ 
b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-thread-context.adoc
@@ -94,7 +94,7 @@ GarbageFree:: a garbage-free implementation.
 If `true` uses an `InheritableThreadLocal` to copy the thread context map to 
newly created threads.
 
 Note that, as explained in
-http://docs.oracle.com/javase/6/docs/api/java/util/concurrent/Executors.html#privilegedThreadFactory()[Java's
 `Executors#privilegedThreadFactory()`], when you are dealing with _privileged 
threads_, thread context might not get propagated completely.
+https://docs.oracle.com/javase/{java-target-version}/docs/api/java/util/concurrent/Executors.html#privilegedThreadFactory()[Java's
 `Executors#privilegedThreadFactory()`], when you are dealing with _privileged 
threads_, thread context might not get propagated completely.
 
 // tag::gcfree[]
 
diff --git 
a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-transport-security.adoc
 
b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-transport-security.adoc
index 6fed32e7c2..445c9ec541 100644
--- 
a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-transport-security.adoc
+++ 
b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-transport-security.adoc
@@ -57,7 +57,7 @@ implementation to use with `http` and `https` URL protocols.
 [cols="1h,5"]
 |===
 | Env. variable | `LOG4J_CONFIGURATION_AUTHORIZATION_ENCODING`
-| Type          | 
https://docs.oracle.com/javase/8/docs/api/java/nio/charset/Charset.html[`Charset`]
+| Type          | 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/charset/Charset.html[`Charset`]
 | Default value | `UTF-8`
 |===
 
@@ -116,7 +116,7 @@ The username used in HTTP Basic authentication.
 [cols="1h,5"]
 |===
 | Env. variable | `LOG4J_TRUST_STORE_LOCATION`
-| Type          | 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/file/Path.html[Path]
 or 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/net/URI.html[`URI`]
+| Type          | 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/nio/file/Path.html[`Path`]
 or 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/net/URI.html[`URI`]
 | Default value | see link:{jsse-default-keystores}[Default Java trust store]
 |===
 
@@ -164,7 +164,7 @@ The name of the environment variable that contains password 
for the trust store.
 [cols="1h,5"]
 |===
 | Env. variable | `LOG4J_TRUST_STORE_TYPE`
-| Type          | 
https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#KeyStore[`KeyStore`
 type]
+| Type          | 
https://docs.oracle.com/javase/{java-target-version}/docs/technotes/guides/security/StandardNames.html#KeyStore[`KeyStore`
 type]
 | Default value | 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/security/KeyStore.html#getDefaultType--[Default
 Java `KeyStore` type]
 |===
 
@@ -176,7 +176,7 @@ The type of trust store.
 [cols="1h,5"]
 |===
 | Env. variable | `LOG4J_TRUST_STORE_KEY_MANAGER_FACTORY_ALGORITHM`
-| Type          | 
https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#KeyManagerFactory[`KeyManagerFactory`]
+| Type          | 
https://docs.oracle.com/javase/{java-target-version}/docs/technotes/guides/security/StandardNames.html#KeyManagerFactory[`KeyManagerFactory`]
 | Default value | 
https://docs.oracle.com/javase/{java-target-version}/docs/api/javax/net/ssl/KeyManagerFactory.html#getDefaultAlgorithm--[Default
 Java `KeyManagerFactory` algorithm]
 |===
 
@@ -249,12 +249,12 @@ The name of the environment variable that contains the 
password for the private
 [cols="1h,5"]
 |===
 | Env. variable | `LOG4J_KEY_STORE_TYPE`
-| Type          | 
https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#KeyStore[`KeyStore`]
+| Type          | 
https://docs.oracle.com/javase/{java-target-version}/docs/technotes/guides/security/StandardNames.html#KeyStore[`KeyStore`]
 | Default value | 
https://docs.oracle.com/javase/{java-target-version}/docs/api/java/security/KeyStore.html#getDefaultType--[Default
 Java `KeyStore` type]
 |===
 
 The type of private key store.
-See 
https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#KeyStore[`KeyStore`].
+See 
https://docs.oracle.com/javase/{java-target-version}/docs/technotes/guides/security/StandardNames.html#KeyStore[`KeyStore`].
 
 [id=log4j2.keyStoreKeyManagerFactoryAlgorithm]
 == `log4j2.keyStoreKeyManagerFactoryAlgorithm`
@@ -262,9 +262,9 @@ See 
https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardName
 [cols="1h,5"]
 |===
 | Env. variable | `LOG4J_KEY_STORE_KEY_MANAGER_FACTORY_ALGORITHM`
-| Type          | 
https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#KeyManagerFactory[`KeyManagerFactory`]
+| Type          | 
https://docs.oracle.com/javase/{java-target-version}/docs/technotes/guides/security/StandardNames.html#KeyManagerFactory[`KeyManagerFactory`]
 | Default value | 
https://docs.oracle.com/javase/{java-target-version}/docs/api/javax/net/ssl/KeyManagerFactory.html#getDefaultAlgorithm--[Default
 Java `KeyManagerFactory` algorithm]
 |===
 
 Name of the 
https://docs.oracle.com/javase/{java-target-version}/docs/api/javax/net/ssl/KeyManagerFactory.html[`KeyManagerFactory`]
 implementation to use for the private key store.
-See 
https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#KeyManagerFactory[`KeyManagerFactory`].
\ No newline at end of file
+See 
https://docs.oracle.com/javase/{java-target-version}/docs/technotes/guides/security/StandardNames.html#KeyManagerFactory[`KeyManagerFactory`].
\ No newline at end of file

Reply via email to