Skip to content

Commit

Permalink
Fix site conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
rgoers committed Apr 4, 2024
1 parent c82a083 commit cf01425
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
2 changes: 2 additions & 0 deletions src/site/antora/modules/ROOT/nav.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
** xref:manual/eventlogging.adoc[]
** xref:manual/messages.adoc[]
** xref:manual/thread-context.adoc[]
** xref:manual/scoped-context.adoc[]
** xref:manual/resource-logger.adoc[]
** xref:manual/configuration.adoc[]
** xref:manual/usage.adoc[]
** xref:manual/cloud.adoc[]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
////
= Log4j 2 API
Ralph Goers <rgoers@apache.org>;
== Resource Logging
= Resource Logging
The link:../log4j-api/apidocs/org/apache/logging/log4j/ResourceLogger.html[`ResourceLogger`]
is available in Log4j API releases 2.24.0 and greater.
Expand Down
8 changes: 3 additions & 5 deletions src/site/antora/modules/ROOT/pages/manual/scoped-context.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
////
= Log4j 2 API
Ralph Goers <rgoers@apache.org>;
== Scoped Context
= Scoped Context
The link:../log4j-api/apidocs/org/apache/logging/log4j/ScopedContext.html[`ScopedContext`]
is available in Log4j API releases 2.24.0 and greater.
Expand Down Expand Up @@ -60,7 +58,7 @@ if they do not implement the Renderable interface.
Note that in the example above `UUID.randomUUID()` returns a UUID. By default, when it is
included in LogEvents its toString() method will be used.
=== Thread Support ===
== Thread Support
ScopedContext provides support for passing the ScopedContext and the ThreadContext to
child threads by way of an ExecutorService. For example, the following will create a
Expand Down Expand Up @@ -95,7 +93,7 @@ private class Worker implements Runnable {
ScopeContext also supports call methods in addition to run methods so the called functions can
directly return values.
=== Nested ScopedContexts
== Nested ScopedContexts
ScopedContexts may be nested. Becuase ScopedContexts are immutable the `where` method may
be called on the current ScopedContext from within the run or call methods to append new
Expand Down

0 comments on commit cf01425

Please sign in to comment.