Merge branch '1.5.x'

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Library.java

@@ -71,7 +71,7 @@ public class Library {
 
 	/**
 	 * Return the name of file as it should be written.
-	 * @return then name.
+	 * @return the name
 	 */
 	public String getName() {
 		return this.name;

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ApplicationArguments.java

@@ -34,7 +34,7 @@ public interface ApplicationArguments {
 	String[] getSourceArgs();
 
 	/**
-	 * Return then names of all option arguments. For example, if the arguments were
+	 * Return the names of all option arguments. For example, if the arguments were
 	 * "--foo=bar --debug" would return the values {@code ["foo", "debug"]}.
 	 * @return the option names or an empty set
 	 */