Skip to content

S
spring-boot
Commit a3469c5e authored by Dustin Schultz's avatar Dustin Schultz Committed by Phillip Webb
Browse files
Options

Update docs with Servlet property load ordering 

Fixes gh-5752
Closes gh-5752
parent cf28f55e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View file @ a3469c5e
...@@ -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. . Command line arguments.
. Properties from `SPRING_APPLICATION_JSON` (inline JSON embedded in an environment variable or system property) . 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`. . JNDI attributes from `java:comp/env`.
. Java System properties (`System.getProperties()`). . Java System properties (`System.getProperties()`).
. OS environment variables. . OS environment variables.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment