Skip to content

Commit c55e8b9

Browse files
Merge branch '3.1.x'
Closes gh-37072
2 parents 0f20fc2 + 23de8a1 commit c55e8b9

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
:dynatrace-help: https://www.dynatrace.com/support/help
103103
:gradle-docs: https://docs.gradle.org/current/userguide
104104
:hibernate-docs: https://docs.jboss.org/hibernate/orm/{hibernate-version}/userguide/html_single/Hibernate_User_Guide.html
105-
:java-api: https://docs.oracle.com/javase/17/docs/api
105+
:java-api: https://docs.oracle.com/en/java/javase/17/docs/api
106106
:jooq-docs: https://www.jooq.org/doc/{jooq-version}/manual-single-page
107107
:junit5-docs: https://junit.org/junit5/docs/current/user-guide
108108
:kotlin-docs: https://kotlinlang.org/docs/reference/

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1049,7 +1049,7 @@ Spring Boot has dedicated support for expressing durations.
10491049
If you expose a `java.time.Duration` property, the following formats in application properties are available:
10501050

10511051
* A regular `long` representation (using milliseconds as the default unit unless a `@DurationUnit` has been specified)
1052-
* The standard ISO-8601 format {java-api}/java/time/Duration.html#parse-java.lang.CharSequence-[used by `java.time.Duration`]
1052+
* The standard ISO-8601 format {java-api}/java.base/java/time/Duration.html#parse(java.lang.CharSequence)[used by `java.time.Duration`]
10531053
* A more readable format where the value and the unit are coupled (`10s` means 10 seconds)
10541054

10551055
Consider the following example:
@@ -1088,7 +1088,7 @@ In addition to durations, Spring Boot can also work with `java.time.Period` type
10881088
The following formats can be used in application properties:
10891089

10901090
* An regular `int` representation (using days as the default unit unless a `@PeriodUnit` has been specified)
1091-
* The standard ISO-8601 format {java-api}/java/time/Period.html#parse-java.lang.CharSequence-[used by `java.time.Period`]
1091+
* The standard ISO-8601 format {java-api}/java.base/java/time/Period.html#parse(java.lang.CharSequence)[used by `java.time.Period`]
10921092
* A simpler format where the value and the unit pairs are coupled (`1y3d` means 1 year and 3 days)
10931093

10941094
The following units are supported with the simple format:

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[[features.logging]]
22
== Logging
33
Spring Boot uses https://commons.apache.org/logging[Commons Logging] for all internal logging but leaves the underlying log implementation open.
4-
Default configurations are provided for {java-api}/java/util/logging/package-summary.html[Java Util Logging], https://logging.apache.org/log4j/2.x/[Log4j2], and https://logback.qos.ch/[Logback].
4+
Default configurations are provided for {java-api}/java.logging/java/util/logging/package-summary.html[Java Util Logging], https://logging.apache.org/log4j/2.x/[Log4j2], and https://logback.qos.ch/[Logback].
55
In each case, loggers are pre-configured to use console output with optional file output also available.
66

77
By default, if you use the "`Starters`", Logback is used for logging.

0 commit comments

Comments
 (0)