From 4bac6c6688809f7c7670058ea6202a71b1f73a39 Mon Sep 17 00:00:00 2001
From: Muhammad Hewedy <mhewedy@gmail.com>
Date: Tue, 5 Mar 2019 13:20:34 +0300
Subject: [PATCH 1/2] Order the search locations in javadoc by precedence order

See gh-16099
---
 .../boot/context/config/ConfigFileApplicationListener.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
index 1ba833ba2d..f186397761 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
@@ -72,12 +72,13 @@ import org.springframework.util.StringUtils;
 /**
  * {@link EnvironmentPostProcessor} that configures the context environment by loading
  * properties from well known file locations. By default properties will be loaded from
- * 'application.properties' and/or 'application.yml' files in the following locations:
+ * 'application.properties' and/or 'application.yml' files in the following locations
+ * ordered by the search order:
  * <ul>
- * <li>classpath:</li>
+ * <li>file:./config/:</li>
  * <li>file:./</li>
  * <li>classpath:config/</li>
- * <li>file:./config/:</li>
+ * <li>classpath:</li>
  * </ul>
  * <p>
  * Alternative search locations and names can be specified using

From 372802a2038b7c180a3e65a4ef3c4ccff9401c9e Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Sat, 16 Mar 2019 08:23:22 +0100
Subject: [PATCH 2/2] Polish "Order the search locations in javadoc by
 precedence order"

Closes gh-16099
---
 .../boot/context/config/ConfigFileApplicationListener.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
index f186397761..efc3f82aa8 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,14 +72,15 @@ import org.springframework.util.StringUtils;
 /**
  * {@link EnvironmentPostProcessor} that configures the context environment by loading
  * properties from well known file locations. By default properties will be loaded from
- * 'application.properties' and/or 'application.yml' files in the following locations
- * ordered by the search order:
+ * 'application.properties' and/or 'application.yml' files in the following locations:
  * <ul>
  * <li>file:./config/:</li>
  * <li>file:./</li>
  * <li>classpath:config/</li>
  * <li>classpath:</li>
  * </ul>
+ * The list is ordered by precedence (properties defined in locations higher in the list
+ * override those defined in lower locations).
  * <p>
  * Alternative search locations and names can be specified using
  * {@link #setSearchLocations(String)} and {@link #setSearchNames(String)}.