From a3469c5e268680c3fcfc8d0e4a313aa3e65d60ca Mon Sep 17 00:00:00 2001
From: Dustin Schultz <schultz.dustin@gmail.com>
Date: Sun, 24 Apr 2016 09:39:24 -0600
Subject: [PATCH] Update docs with Servlet property load ordering

Fixes gh-5752
Closes gh-5752
---
 spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
index c9fefac9c2..da3322c43a 100644
--- 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:
 
 . 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.