From 3943fb6eaf4c202a3c162ff392353a1f52fdddf6 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 6 Jun 2011 17:07:49 +0000
Subject: [PATCH] Correct doc error reported on users list

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1132703 13f79535-47bb-0310-9956-ffa450edef68
---
 webapps/docs/changelog.xml |  8 ++++++++
 webapps/docs/logging.xml   | 10 +++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f05fdd9fd..4fb1b5976 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -55,6 +55,14 @@
       </fix>
     </changelog>
   </subsection>
+  <subsection name="Web applications">
+    <changelog>
+      <fix>
+        Correct the log4j configuration settings when defining conversion
+        patterns in the documentation web application. (markt)
+      </fix>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 7.0.15 (markt)">
   <subsection name="Catalina">
diff --git a/webapps/docs/logging.xml b/webapps/docs/logging.xml
index 6e2bc0e87..9e65d3448 100644
--- a/webapps/docs/logging.xml
+++ b/webapps/docs/logging.xml
@@ -420,7 +420,7 @@ log4j.appender.CATALINA.encoding=UTF-8<br />
 # Roll-over the log once per day<br />
 log4j.appender.CATALINA.DatePattern='.'yyyy-MM-dd'.log'<br />
 log4j.appender.CATALINA.layout = org.apache.log4j.PatternLayout
-log4j.appender.CATALINA.conversionPattern = %d [%t] %-5p %c- %m%n<br />
+log4j.appender.CATALINA.layout.conversionPattern = %d [%t] %-5p %c- %m%n<br />
 log4j.appender.CATALINA.append=true<br />
 <br />
 log4j.appender.LOCALHOST=org.apache.log4j.DailyRollingFileAppender<br />
@@ -428,7 +428,7 @@ log4j.appender.LOCALHOST.file=${catalina.base}/logs/localhost.<br />
 log4j.appender.LOCALHOST.encoding=UTF-8<br />
 log4j.appender.LOCALHOST.DatePattern='.'yyyy-MM-dd'.log'<br />
 log4j.appender.LOCALHOST.layout = org.apache.log4j.PatternLayout
-log4j.appender.LOCALHOST.conversionPattern = %d [%t] %-5p %c- %m%n<br />
+log4j.appender.LOCALHOST.layout.conversionPattern = %d [%t] %-5p %c- %m%n<br />
 log4j.appender.LOCALHOST.append=true<br />
 
 log4j.appender.MANAGER=org.apache.log4j.DailyRollingFileAppender<br />
@@ -436,7 +436,7 @@ log4j.appender.MANAGER.file=${catalina.base}/logs/manager.<br />
 log4j.appender.MANAGER.encoding=UTF-8<br />
 log4j.appender.MANAGER.DatePattern='.'yyyy-MM-dd'.log'<br />
 log4j.appender.MANAGER.layout = org.apache.log4j.PatternLayout
-log4j.appender.MANAGER.conversionPattern = %d [%t] %-5p %c- %m%n<br />
+log4j.appender.MANAGER.layout.conversionPattern = %d [%t] %-5p %c- %m%n<br />
 log4j.appender.MANAGER.append=true<br />
 
 log4j.appender.HOST-MANAGER=org.apache.log4j.DailyRollingFileAppender<br />
@@ -444,13 +444,13 @@ log4j.appender.HOST-MANAGER.file=${catalina.base}/logs/host-manager.<br />
 log4j.appender.HOST-MANAGER.encoding=UTF-8<br />
 log4j.appender.HOST-MANAGER.DatePattern='.'yyyy-MM-dd'.log'<br />
 log4j.appender.HOST-MANAGER.layout = org.apache.log4j.PatternLayout
-log4j.appender.HOST-MANAGER.conversionPattern = %d [%t] %-5p %c- %m%n<br />
+log4j.appender.HOST-MANAGER.layout.conversionPattern = %d [%t] %-5p %c- %m%n<br />
 log4j.appender.HOST-MANAGER.append=true<br />
 
 log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender<br />
 log4j.appender.CONSOLE.encoding=UTF-8<br />
 log4j.appender.CONSOLE.layout = org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.conversionPattern = %d [%t] %-5p %c- %m%n<br />
+log4j.appender.CONSOLE.layout.conversionPattern = %d [%t] %-5p %c- %m%n<br />
 <br />
 # Configure which loggers log to which appenders<br />
 log4j.logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost]=INFO, LOCALHOST<br />
-- 
2.11.0