Skip to content

Commit

Permalink
Fixup asciidoc formatting and links
Browse files Browse the repository at this point in the history
  • Loading branch information
Phillip Webb committed Mar 26, 2014
1 parent bae26e2 commit aa3f055
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -794,13 +794,13 @@ The auto-configuration adds the following features on top of Spring's defaults:
* Static `index.html` support.
* Custom `Favicon` support.

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



[[boot-features-spring-mvc-message-converters]]
==== HttpMessageConverters
Expand Down

0 comments on commit aa3f055

Please sign in to comment.