root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #546 from gcuisinier/master 

fix javadoc link for RestController and PropertySource
This commit is contained in:
Brian Clozel 2014-05-24 22:39:20 +02:00
parent e3a6fce403 8d306bfbc0
commit 31c07dbfa4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/asciidoc/index.adoc
View File

@ -7642,7 +7642,7 @@ You can find out more about
http://spring.io/blog/2011/02/15/spring-3-1-m1-unified-property-management/[Unified http://spring.io/blog/2011/02/15/spring-3-1-m1-unified-property-management/[Unified
Property Management], the Property Management], the
{javadoc-baseurl}/org/springframework/core/env/PropertySource.html[`PropertySource` class] {javadoc-baseurl}/org/springframework/core/env/PropertySource.html[`PropertySource` class]
and the {javadoc-baseurl}org/springframework/context/annotation/PropertySource.html[`@PropertySource` and the {javadoc-baseurl}/org/springframework/context/annotation/PropertySource.html[`@PropertySource`
annotation]. annotation].
@ -29299,7 +29299,7 @@ JSON, XML or custom MediaType content. For convenience, instead of annotating al
`@RequestMapping` methods with `@ResponseBody`, you can annotate your Controller Class `@RequestMapping` methods with `@ResponseBody`, you can annotate your Controller Class
with `@RestController`. with `@RestController`.
{javadoc-baseurl}org/springframework/web/bind/annotation/RestController.html[`@RestController`] {javadoc-baseurl}/org/springframework/web/bind/annotation/RestController.html[`@RestController`]
is a stereotype annotation that combines `@ResponseBody` and `@Controller`. More than is a stereotype annotation that combines `@ResponseBody` and `@Controller`. More than
that, it gives more meaning to your Controller and also may carry additional semantics that, it gives more meaning to your Controller and also may carry additional semantics
in future releases of the framework. in future releases of the framework.