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

Merge pull request #1027 from Youmoo/patch-2 

* pr/1027:
  Fix typo
This commit is contained in:
Stephane Nicoll 2016-04-04 17:36:36 +02:00
parent 1f9a9cf404 1bccc8f1cd
commit ad7285df0b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java
View File

@ -41,7 +41,7 @@ import java.lang.annotation.Target;
* <p>Each attribute is mutually exclusive, so only set one attribute per annotation instance
* (the one most convenient one for your formatting needs).
* When the pattern attribute is specified, it takes precedence over both the style and ISO attribute.
* When the {@link #iso} attribute is specified, if takes precedence over the style attribute.
* When the {@link #iso} attribute is specified, it takes precedence over the style attribute.
* When no annotation attributes are specified, the default format applied is style-based
* with a style code of 'SS' (short date, short time).
*