Update docs with Servlet property load ordering

Fixes gh-5752 Closes gh-5752
10 years ago · a3469c5e26
1 changed files with 2 additions and 0 deletions
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@ -333,6 +333,8 @@ sensible overriding of values, properties are considered in the following order:
				@@ -333,6 +333,8 @@ sensible overriding of values, properties are considered in the following order:

 . Command line arguments.
 . Properties from `SPRING_APPLICATION_JSON` (inline JSON embedded in an environment variable or system property)
+. `ServletConfig` init parameters.
+. `ServletContext` init parameters.
 . JNDI attributes from `java:comp/env`.
 . Java System properties (`System.getProperties()`).
 . OS environment variables.