Merge branch '2.4.x'

Closes gh-24685

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLocation.java

 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -22,10 +22,10 @@ import org.springframework.util.StringUtils;
 
 /**
  * A user specified location that can be {@link ConfigDataLocationResolver resolved} to
- * one or {@link ConfigDataResource config data resources}. A {@link ConfigDataLocation}
- * is a simple wrapper around a {@link String} value. The exact format of the value will
- * depend on the underlying technology, but is usually a URL like syntax consisting of a
- * prefix and path. For example, {@code crypt:somehost/somepath}.
+ * one or more {@link ConfigDataResource config data resources}. A
+ * {@link ConfigDataLocation} is a simple wrapper around a {@link String} value. The exact
+ * format of the value will depend on the underlying technology, but is usually a URL like
+ * syntax consisting of a prefix and path. For example, {@code crypt:somehost/somepath}.
  * <p>
  * Locations can be mandatory or {@link #isOptional() optional}. Optional locations are
  * prefixed with {@code optional:}.