Merge branch 'master' of github.com:jclouds/jclouds into 1.5.x
* 'master' of github.com:jclouds/jclouds:
Fixes TemplateBuilder.from(...) javadoc
diff --git a/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilder.java b/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilder.java
index 19bf4c6..b8b48b0 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilder.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilder.java
@@ -56,7 +56,7 @@
TemplateBuilder fromTemplate(Template image);
/**
- * Constructs a new {@code TemplateBuilderSpec} instance with the settings specified in {@code spec}.
+ * Configure and return this template, updating it with the populated values of the given {@code spec}.
*
* @since 1.5
*/
@@ -64,7 +64,7 @@
TemplateBuilder from(TemplateBuilderSpec spec);
/**
- * Constructs a new {@code TemplateBuilder} instance with the settings specified in {@code spec}.
+ * Configure and return this template, updating it with the populated values of the given {@code spec}.
* This is especially useful for command-line configuration of a {@code TemplateBuilder}.
*
* @param spec a String in the format specified by {@link TemplateBuilderSpec}
