Merge branch '2.6.x' into 2.7.x

Closes gh-31951

spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/external-config.adoc

@@ -565,7 +565,7 @@ If you need a secure way to store credentials and passwords, the https://cloud.s
 [[features.external-config.yaml]]
 === Working with YAML
 https://yaml.org[YAML] is a superset of JSON and, as such, is a convenient format for specifying hierarchical configuration data.
-The `SpringApplication` class automatically supports YAML as an alternative to properties whenever you have the https://bitbucket.org/asomov/snakeyaml[SnakeYAML] library on your classpath.
+The `SpringApplication` class automatically supports YAML as an alternative to properties whenever you have the https://github.com/snakeyaml/snakeyaml[SnakeYAML] library on your classpath.
 
 NOTE: If you use "`Starters`", SnakeYAML is automatically provided by `spring-boot-starter`.
 

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

@@ -266,7 +266,7 @@ In order to release logging resources when your application terminates, a shutdo
 This shutdown hook is registered automatically unless your application is deployed as a war file.
 If your application has complex context hierarchies the shutdown hook may not meet your needs.
 If it does not, disable the shutdown hook and investigate the options provided directly by the underlying logging system.
-For example, Logback offers http://logback.qos.ch/manual/loggingSeparation.html[context selectors] which allow each Logger to be created in its own context.
+For example, Logback offers https://logback.qos.ch/manual/loggingSeparation.html[context selectors] which allow each Logger to be created in its own context.
 You can use the configprop:logging.register-shutdown-hook[] property to disable the shutdown hook.
 Setting it to `false` will disable the registration.
 You can set the property in your `application.properties` or `application.yaml` file: