Merge pull request #23634 from izeye

* pr/23634:
  Polish

Closes gh-23634
pull/23694/head
Phillip Webb 4 years ago
commit bd27756efc

@ -49,7 +49,7 @@ public class FreeMarkerProperties extends AbstractTemplateViewResolverProperties
private String[] templateLoaderPath = new String[] { DEFAULT_TEMPLATE_LOADER_PATH }; private String[] templateLoaderPath = new String[] { DEFAULT_TEMPLATE_LOADER_PATH };
/** /**
* Whether to prefer file system access for template loading to enables hot detection * Whether to prefer file system access for template loading to enable hot detection
* of template changes. When a template path is detected as a directory, templates are * of template changes. When a template path is detected as a directory, templates are
* loaded from the directory only and other matching classpath locations will not be * loaded from the directory only and other matching classpath locations will not be
* considered. * considered.

@ -43,7 +43,7 @@ If you find problems with the docs or if you want to improve them, please {sprin
[[boot-documentation-upgrading]] [[boot-documentation-upgrading]]
== Upgrading from an Earlier Version == Upgrading from an Earlier Version
Instructions for how to upgrade from earlier versions of Spring Boot are provided on the project {github-wiki}[wiki]. Instructions for how to upgrade from earlier versions of Spring Boot are provided on the project {github-wiki}[wiki].
Follow the links in the in the {github-wiki}#release-notes[release notes] section to find the version that you want to upgrade to. Follow the links in the {github-wiki}#release-notes[release notes] section to find the version that you want to upgrade to.
Upgrading instructions are always the first item in the release notes. Upgrading instructions are always the first item in the release notes.
If you are more than one release behind, please make sure that you also review the release notes of the versions that you jumped. If you are more than one release behind, please make sure that you also review the release notes of the versions that you jumped.

@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Andy Wilkinson * @author Andy Wilkinson
*/ */
@ClassPathExclusions("kotlin-daemon-client-*.jar") @ClassPathExclusions("kotlin-daemon-client-*.jar")
public class SpringBootPluginTests { class SpringBootPluginTests {
@TempDir @TempDir
File temp; File temp;

@ -137,9 +137,9 @@ This example shows how you can customize the port in case `9001` is already used
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version> <version>{gradle-project-version}</version>
<configuration> <configuration>
<jmxPort>9009</jmxPort> <jmxPort>9009</jmxPort>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>pre-integration-test</id> <id>pre-integration-test</id>

Loading…
Cancel
Save