From 1f97a60d164e34a92141abffe95bdf87d48c3fdb Mon Sep 17 00:00:00 2001 From: michal Date: Mon, 20 May 2019 00:55:20 +0200 Subject: [PATCH] Clarify documentation on logback include files Update documentation and comments on Logback to show the correct use of `default.xml` rather than `base.xml`. See gh-16901 --- .../spring-boot-docs/src/main/asciidoc/howto.adoc | 4 ++-- .../org/springframework/boot/logging/logback/defaults.xml | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc index ab218c1933..2d2e76e937 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc @@ -1270,13 +1270,13 @@ By default, Spring Boot picks up the native configuration from its default locat [[howto-configure-logback-for-logging]] === Configure Logback for Logging If you put a `logback.xml` in the root of your classpath, it is picked up from there (or from `logback-spring.xml`, to take advantage of the templating features provided by Boot). -Spring Boot provides a default base configuration that you can include if you want to set levels, as shown in the following example: +Spring Boot provides a default level configuration that you can include if you want to set levels, as shown in the following example: [source,xml,indent=0,subs="verbatim,quotes,attributes"] ---- - + ---- diff --git a/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml b/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml index 4d761badcf..e351f0008f 100644 --- a/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml +++ b/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml @@ -1,8 +1,7 @@