Merge branch '1.5.x'

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/MultipartProperties.java

@@ -25,19 +25,18 @@ import org.springframework.util.StringUtils;
 /**
  * Properties to be used in configuring a {@link MultipartConfigElement}.
  * <ul>
- * <li>{@link #getLocation() location} specifies the directory where files will be stored.
- * The default is "". A common value is to use the system's temporary directory</li>
+ * <li>{@link #getLocation() location} specifies the directory where uploaded files will
+ * be stored. When not specified, a temporary directory will be used.</li>
  * <li>{@link #getMaxFileSize() max-file-size} specifies the maximum size permitted for
  * uploaded files. The default is 1MB</li>
  * <li>{@link #getMaxRequestSize() max-request-size} specifies the maximum size allowed
- * for {@literal multipart/form-data} requests. The default is 10MB</li>
+ * for {@literal multipart/form-data} requests. The default is 10MB.</li>
  * <li>{@link #getFileSizeThreshold() file-size-threshold} specifies the size threshold
- * after which files will be written to disk. Default is 0, which means that the file will
- * be written to disk immediately</li>
+ * after which files will be written to disk. The default is 0.</li>
  * </ul>
  * <p>
- * These properties are ultimately passed through {@link MultipartConfigFactory} which
- * means you may specify the values using {@literal long} values or using more readable
+ * These properties are ultimately passed to {@link MultipartConfigFactory} which means
+ * you may specify numeric values using {@literal long} values or using more readable
  * {@literal String} variants that accept {@literal KB} or {@literal MB} suffixes.
  *
  * @author Josh Long