You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2024/04/04 13:04:42 UTC

(logging-log4j2) 04/06: Fix doc typos

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

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

commit 0d4b6515775547b9ddb2729b8bdd538206d0f6b7
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Thu Apr 4 14:38:51 2024 +0200

    Fix doc typos
---
 src/site/antora/modules/ROOT/pages/faq.adoc        | 14 ++++++-------
 .../antora/modules/ROOT/pages/log4j-flume-ng.adoc  | 24 +++++++++++-----------
 .../antora/modules/ROOT/pages/manual/index.adoc    |  1 -
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/site/antora/modules/ROOT/pages/faq.adoc b/src/site/antora/modules/ROOT/pages/faq.adoc
index adce801597..0dd19e9281 100644
--- a/src/site/antora/modules/ROOT/pages/faq.adoc
+++ b/src/site/antora/modules/ROOT/pages/faq.adoc
@@ -266,12 +266,12 @@ You can use the `ThreadContext` map value to determine the log file name.
 [source,xml]
 ----
 <Routing name="Routing">
-  <Routes pattern="${dollar}${dollar}{ctx:ROUTINGKEY}">
+  <Routes pattern="$${ctx:ROUTINGKEY}">
 
     <!-- This route is chosen if ThreadContext has value 'special' for key ROUTINGKEY. -->
     <Route key="special">
-      <RollingFile name="Rolling-${dollar}{ctx:ROUTINGKEY}" fileName="logs/special-${dollar}{ctx:ROUTINGKEY}.log"
-	filePattern="./logs/${dollar}{date:yyyy-MM}/${dollar}{ctx:ROUTINGKEY}-special-%d{yyyy-MM-dd}-%i.log.gz">
+      <RollingFile name="Rolling-${ctx:ROUTINGKEY}" fileName="logs/special-${ctx:ROUTINGKEY}.log"
+	filePattern="./logs/${date:yyyy-MM}/${ctx:ROUTINGKEY}-special-%d{yyyy-MM-dd}-%i.log.gz">
 	<PatternLayout>
 	  <pattern>%d{ISO8601} [%t] %p %c{3} - %m%n</pattern>
 	</PatternLayout>
@@ -283,9 +283,9 @@ You can use the `ThreadContext` map value to determine the log file name.
     </Route>
 
     <!-- This route is chosen if ThreadContext has no value for key ROUTINGKEY. -->
-    <Route key="$${dollar}{ctx:ROUTINGKEY}">
+    <Route key="$${ctx:ROUTINGKEY}">
       <RollingFile name="Rolling-default" fileName="logs/default.log"
-	filePattern="./logs/${dollar}{date:yyyy-MM}/default-%d{yyyy-MM-dd}-%i.log.gz">
+	filePattern="./logs/${date:yyyy-MM}/default-%d{yyyy-MM-dd}-%i.log.gz">
         <PatternLayout>
 	  <pattern>%d{ISO8601} [%t] %p %c{3} - %m%n</pattern>
         </PatternLayout>
@@ -300,8 +300,8 @@ You can use the `ThreadContext` map value to determine the log file name.
          (other than the value 'special' which had its own route above).
          The value dynamically determines the name of the log file. -->
     <Route>
-      <RollingFile name="Rolling-${dollar}{ctx:ROUTINGKEY}" fileName="logs/other-${dollar}{ctx:ROUTINGKEY}.log"
-	filePattern="./logs/${dollar}{date:yyyy-MM}/${dollar}{ctx:ROUTINGKEY}-other-%d{yyyy-MM-dd}-%i.log.gz">
+      <RollingFile name="Rolling-${ctx:ROUTINGKEY}" fileName="logs/other-${ctx:ROUTINGKEY}.log"
+	filePattern="./logs/${date:yyyy-MM}/${ctx:ROUTINGKEY}-other-%d{yyyy-MM-dd}-%i.log.gz">
 	<PatternLayout>
 	  <pattern>%d{ISO8601} [%t] %p %c{3} - %m%n</pattern>
 	</PatternLayout>
diff --git a/src/site/antora/modules/ROOT/pages/log4j-flume-ng.adoc b/src/site/antora/modules/ROOT/pages/log4j-flume-ng.adoc
index 382eb64818..a829d0994c 100644
--- a/src/site/antora/modules/ROOT/pages/log4j-flume-ng.adoc
+++ b/src/site/antora/modules/ROOT/pages/log4j-flume-ng.adoc
@@ -83,62 +83,62 @@ The following is a sample pom file for Maven that can be used as a template for
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>${dollar}{slf4j.version}</version>
+        <version>${slf4j.version}</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-ext</artifactId>
-        <version>${dollar}{slf4j.version}</version>
+        <version>${slf4j.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-api</artifactId>
-        <version>${dollar}{log4j.version}</version>
+        <version>${log4j.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-1.2-api</artifactId>
-        <version>${dollar}{log4j.version}</version>
+        <version>${log4j.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-core</artifactId>
-        <version>${dollar}{log4j.version}</version>
+        <version>${log4j.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-flume-ng</artifactId>
-        <version>${dollar}{log4j.version}</version>
+        <version>${log4j.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-slf4j-impl</artifactId>
-        <version>${dollar}{log4j.version}</version>
+        <version>${log4j.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-jcl</artifactId>
-        <version>${dollar}{log4j.version}</version>
+        <version>${log4j.version}</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.jackson</groupId>
         <artifactId>jackson-core-asl</artifactId>
-        <version>${dollar}{jackson.version}</version>
+        <version>${jackson.version}</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.jackson</groupId>
         <artifactId>jackson-mapper-asl</artifactId>
-        <version>${dollar}{jackson.version}</version>
+        <version>${jackson.version}</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.jackson</groupId>
         <artifactId>jackson-jaxrs</artifactId>
-        <version>${dollar}{jackson.version}</version>
+        <version>${jackson.version}</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.jackson</groupId>
         <artifactId>jackson-xc</artifactId>
-        <version>${dollar}{jackson.version}</version>
+        <version>${jackson.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/src/site/antora/modules/ROOT/pages/manual/index.adoc b/src/site/antora/modules/ROOT/pages/manual/index.adoc
index 2ab8e552f2..15f93a160b 100644
--- a/src/site/antora/modules/ROOT/pages/manual/index.adoc
+++ b/src/site/antora/modules/ROOT/pages/manual/index.adoc
@@ -30,7 +30,6 @@ version, including full-source code, class files and documentation can
 be found at
 https://logging.apache.org/log4j/2.x/index.html[*https://logging.apache.org/log4j/2.x/index.html*].
 
-Inserting log statements into code is a low-tech method for debugging
 Inserting log statements into code is a low-tech method for debugging
 it. It may also be the only way because debuggers are not always
 available or applicable. This is usually the case for multithreaded