Return-Path: 
 <dev-return-116717-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
X-Original-To: apmail-tomcat-dev-archive@www.apache.org
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id DA3454B75
	for <apmail-tomcat-dev-archive@www.apache.org>;
 Mon,  6 Jun 2011 17:08:36 +0000 (UTC)
Received: (qmail 30198 invoked by uid 500); 6 Jun 2011 17:08:36 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 30131 invoked by uid 500); 6 Jun 2011 17:08:36 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 30122 invoked by uid 99); 6 Jun 2011 17:08:35 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Jun 2011 17:08:35 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Jun 2011 17:08:33 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 340BE2388A3D; Mon,  6 Jun 2011 17:08:12 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1132705 - in /tomcat/tc6.0.x/trunk/webapps/docs:
 changelog.xml
 logging.xml
Date: Mon, 06 Jun 2011 17:08:12 -0000
To: dev@tomcat.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110606170812.340BE2388A3D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: markt
Date: Mon Jun  6 17:08:11 2011
New Revision: 1132705

URL: http://svn.apache.org/viewvc?rev=1132705&view=rev
Log:
CTR
Correct doc error reported on users list

Modified:
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
    tomcat/tc6.0.x/trunk/webapps/docs/logging.xml

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1132705&r1=1132704&r2=1132705&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jun  6 17:08:11 2011
@@ -186,6 +186,10 @@
         Manager application was running web applications that were defined in
         server.xml. (markt)
       </fix>
+      <fix>
+        Correct the log4j configuration settings when defining conversion
+        patterns in the documentation web application. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Other">

Modified: tomcat/tc6.0.x/trunk/webapps/docs/logging.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/logging.xml?rev=1132705&r1=1132704&r2=1132705&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/logging.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/logging.xml Mon Jun  6 17:08:11 2011
@@ -423,7 +423,7 @@ log4j.appender.CATALINA.encoding=UTF-8<b
 # 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 />
@@ -431,7 +431,7 @@ log4j.appender.LOCALHOST.file=${catalina
 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 />
@@ -439,7 +439,7 @@ log4j.appender.MANAGER.file=${catalina.b
 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 />
@@ -447,13 +447,13 @@ log4j.appender.HOST-MANAGER.file=${catal
 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 />



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org