Merge branch '1.5.x'

2017-01-04 09:56:19 +01:00
parent 24f5125a8b e1977aa86e
commit 506f6497c0
11 changed files with 14 additions and 14 deletions
--- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java
+++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java
@@ -125,8 +125,8 @@ public class Repackager {

 	/**
 	 * Sets the layout factory for the jar. The factory can be used when no specific
-	 * layout is specific.
-	 * @param layoutFactory the layoutFactory to set
+	 * layout is specified.
+	 * @param layoutFactory the layout factory to set
 	 */
 	public void setLayoutFactory(LayoutFactory layoutFactory) {
 		this.layoutFactory = layoutFactory;