Merge branch '2.6.x' into 2.7.x

Closes gh-32099

Author: snicoll

spring-boot-project/spring-boot-actuator-autoconfigure/src/docs/asciidoc/endpoints/info.adoc

@@ -20,7 +20,7 @@ include::{snippets}/info/http-response.adoc[]
 === Response Structure
 The response contains general information about the application.
 Each section of the response is contributed by an `InfoContributor`.
-Spring Boot provides `build` and `git` contributions.
+Spring Boot provides several contributors that are described below.
 
 
 
@@ -39,3 +39,6 @@ The following table describes the structure of the `git` section of the response
 
 [cols="2,1,3"]
 include::{snippets}/info/response-fields-beneath-git.adoc[]
+
+NOTE: This is the "simple" output.
+The contributor can also be configured to output all available data.