From 860eb929473845615cc0db09617b398b226516ca Mon Sep 17 00:00:00 2001
From: buildmaster <buildmaster@springframework.org>
Date: Wed, 18 Jan 2017 18:07:16 +0000
Subject: [PATCH] Sync docs from 1.1.x to gh-pages

---
 1.1.x/index.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/1.1.x/index.html b/1.1.x/index.html
index fb4b66fca..129678841 100644
--- a/1.1.x/index.html
+++ b/1.1.x/index.html
@@ -850,8 +850,9 @@ we&#8217;re passing the dependencies in the <code>groupId:artifactId:version</co
 	&lt;!-- Example for logging into the build folder of your project --&gt;
 	&lt;property name="LOG_FILE" value="${BUILD_FOLDER:-build}/${springAppName}"/&gt;​
 
+	&lt;!-- You can override this to have a custom pattern --&gt;
 	&lt;property name="CONSOLE_LOG_PATTERN"
-			  value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr([${springAppName:-},%X{X-B3-TraceId:-},%X{X-B3-SpanId:-},%X{X-B3-ParentSpanId:-},%X{X-Span-Export:-}]){yellow} %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/&gt;
+			  value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/&gt;
 
 	&lt;!-- Appender to log to console --&gt;
 	&lt;appender name="console" class="ch.qos.logback.core.ConsoleAppender"&gt;
@@ -912,7 +913,8 @@ we&#8217;re passing the dependencies in the <code>groupId:artifactId:version</co
 	​
 	&lt;root level="INFO"&gt;
 		&lt;appender-ref ref="console"/&gt;
-		&lt;appender-ref ref="logstash"/&gt;
+		&lt;!-- uncomment this to have also JSON logs --&gt;
+		&lt;!--&lt;appender-ref ref="logstash"/&gt;--&gt;
 		&lt;!--&lt;appender-ref ref="flatfile"/&gt;--&gt;
 	&lt;/root&gt;
 &lt;/configuration&gt;</code></pre>