Merge remote-tracking branch 'origin/2.x' into fix/2.x/xEx-regression

Author: vy

log4j-parent/pom.xml

@@ -134,7 +134,7 @@
     <wiremock.version>2.35.2</wiremock.version>
     <xmlunit.version>2.10.0</xmlunit.version>
     <xz.version>1.10</xz.version>
-    <zstd.version>1.5.6-6</zstd.version>
+    <zstd.version>1.5.6-7</zstd.version>
 
     <!-- =====================================================
          Pinned transitive dependency version properties (in alphabetical order)

src/changelog/.2.x.x/update_com_github_luben_zstd_jni.xml

@@ -3,6 +3,6 @@
        xmlns="https://logging.apache.org/xml/ns"
        xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
        type="updated">
-  <issue id="2998" link="https://github.com/apache/logging-log4j2/pull/2998"/>
-  <description format="asciidoc">Update `com.github.luben:zstd-jni` to version `1.5.6-6`</description>
+  <issue id="3129" link="https://github.com/apache/logging-log4j2/pull/3129"/>
+  <description format="asciidoc">Update `com.github.luben:zstd-jni` to version `1.5.6-7`</description>
 </entry>

src/site/antora/modules/ROOT/examples/manual/configuration/xinclude-loggers.xml

@@ -16,9 +16,9 @@
   ~ limitations under the License.
   -->
 <Loggers>
-  <Rogger name="org.example" level="DEBUG" additivity="false">
+  <Logger name="org.example" level="DEBUG" additivity="false">
     <AppenderRef ref="FILE" />
-  </Rogger>
+  </Logger>
   <Root level="ERROR">
     <AppenderRef ref="CONSOLE" />
   </Root>