Repository: incubator-freemarker Updated Branches: refs/heads/3 c80caeb2f -> b4ffc4c3f
(JavaDoc typo) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/b4ffc4c3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/b4ffc4c3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/b4ffc4c3 Branch: refs/heads/3 Commit: b4ffc4c3f9e9aeba1f2984265749bda268192824 Parents: c80caeb Author: ddekany <[email protected]> Authored: Sat Nov 4 10:45:01 2017 +0100 Committer: ddekany <[email protected]> Committed: Sat Nov 4 10:45:01 2017 +0100 ---------------------------------------------------------------------- .../org/apache/freemarker/core/util/TemplateLanguageUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b4ffc4c3/freemarker-core/src/main/java/org/apache/freemarker/core/util/TemplateLanguageUtils.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/util/TemplateLanguageUtils.java b/freemarker-core/src/main/java/org/apache/freemarker/core/util/TemplateLanguageUtils.java index 26bbee4..e2e32e4 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/util/TemplateLanguageUtils.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/util/TemplateLanguageUtils.java @@ -26,21 +26,21 @@ import org.apache.freemarker.core._CoreAPI; import org.apache.freemarker.core.model.AdapterTemplateModel; import org.apache.freemarker.core.model.TemplateBooleanModel; import org.apache.freemarker.core.model.TemplateCallableModel; -import org.apache.freemarker.core.model.TemplateIterableModel; import org.apache.freemarker.core.model.TemplateCollectionModel; import org.apache.freemarker.core.model.TemplateDateModel; import org.apache.freemarker.core.model.TemplateDirectiveModel; import org.apache.freemarker.core.model.TemplateFunctionModel; import org.apache.freemarker.core.model.TemplateHashModel; import org.apache.freemarker.core.model.TemplateHashModelEx; +import org.apache.freemarker.core.model.TemplateIterableModel; import org.apache.freemarker.core.model.TemplateMarkupOutputModel; import org.apache.freemarker.core.model.TemplateModel; import org.apache.freemarker.core.model.TemplateModelIterator; import org.apache.freemarker.core.model.TemplateNodeModel; import org.apache.freemarker.core.model.TemplateNodeModelEx; import org.apache.freemarker.core.model.TemplateNumberModel; -import org.apache.freemarker.core.model.TemplateStringModel; import org.apache.freemarker.core.model.TemplateSequenceModel; +import org.apache.freemarker.core.model.TemplateStringModel; import org.apache.freemarker.core.model.WrapperTemplateModel; import org.apache.freemarker.core.model.impl.BeanAndStringModel; import org.apache.freemarker.core.model.impl.BeanModel; @@ -187,7 +187,7 @@ public final class TemplateLanguageUtils { } /** - * Unescapes a string that was escaped to be part of an FTL string literal. The string to unescape most not include + * Unescapes a string that was escaped to be part of an FTL string literal. The string to unescape must not include * the two quotation marks or two apostrophe-quotes that delimit the literal. * <p> * \\, \", \', \n, \t, \r, \b and \f will be replaced according to
