Skip to content

Commit aa3f055

Browse files
author
Phillip Webb
committed
Fixup asciidoc formatting and links
1 parent bae26e2 commit aa3f055

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -794,13 +794,13 @@ The auto-configuration adds the following features on top of Spring's defaults:
794794
* Static `index.html` support.
795795
* Custom `Favicon` support.
796796

797-
If you want to take complete control of Spring MVC you can add your
798-
own `@Configuration` annotated with `@EnableWebMvc`. If you want the
799-
Boot features, and just want to add additional [normal MVC
800-
configuration](http://docs.spring.io/spring/docs/current/spring-framework-reference/html/mvc.html),
801-
like interceptors, formatters, view controllers etc, you can simply
802-
add your own `@Bean` of type `WebMvcConfigurerAdapter` (like normal
803-
MVC), but don't forget *not* to add `@EnableWebMvc`.
797+
If you want to take complete control of Spring MVC, you can add your own `@Configuration`
798+
annotated with `@EnableWebMvc`. If you want to keep Spring Boot MVC features, and
799+
you just want to add additional {spring-reference}#mvc[MVC configuration] (interceptors,
800+
formatters, view controllers etc.) you can add your own `@Bean` of type
801+
`WebMvcConfigurerAdapter`, but *without* `@EnableWebMvc`.
802+
803+
804804

805805
[[boot-features-spring-mvc-message-converters]]
806806
==== HttpMessageConverters

0 commit comments

Comments
 (0)