Merge branch '2.5.x'

Closes spring-projectsgh-28467

Author: snicoll

spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/logging.adoc

@@ -182,7 +182,7 @@ The following rotation policy properties are supported:
 | The maximum amount of size log archives can take before being deleted.
 
 | configprop:logging.logback.rollingpolicy.max-history[]
-| The number of days to keep log archives (defaults to 7)
+| The maximum number of archive log files to keep (defaults to 7).
 |===
 
 

spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -156,7 +156,7 @@
     {
       "name": "logging.file.max-history",
       "type": "java.lang.Integer",
-      "description": "Maximum number of days archive log files are kept. Only supported with the default logback setup.",
+      "description": "Maximum number of archive log files to keep. Only supported with the default logback setup.",
       "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
       "defaultValue": 7,
       "deprecation": {
@@ -194,7 +194,7 @@
     {
       "name": "logging.logback.rollingpolicy.max-history",
       "type": "java.lang.Integer",
-      "description": "Maximum number of days archive log files are kept.",
+      "description": "Maximum number of archive log files to keep.",
       "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
       "defaultValue": 7
     },