freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [1/2] incubator-freemarker git commit: (JavaDoc typo)
Date Mon, 23 Jan 2017 13:45:49 GMT
Repository: incubator-freemarker
Updated Branches:
  refs/heads/2.3-gae a0417c90d -> 43ae3ded6


(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/6b03d666
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/6b03d666
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/6b03d666

Branch: refs/heads/2.3-gae
Commit: 6b03d6668213e9137e5b734a12a48d963caee696
Parents: a0417c9
Author: ddekany <ddekany@apache.org>
Authored: Sun Jan 22 13:28:29 2017 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Sun Jan 22 13:28:29 2017 +0100

----------------------------------------------------------------------
 src/main/java/freemarker/cache/TemplateLookupContext.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6b03d666/src/main/java/freemarker/cache/TemplateLookupContext.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/TemplateLookupContext.java b/src/main/java/freemarker/cache/TemplateLookupContext.java
index c605e15..bcb5dbf 100644
--- a/src/main/java/freemarker/cache/TemplateLookupContext.java
+++ b/src/main/java/freemarker/cache/TemplateLookupContext.java
@@ -42,8 +42,9 @@ public abstract class TemplateLookupContext {
      * 
      * @param templateName
      *            Must be a normalized name, like {@code "foo/bar/baaz.ftl"}. A name is not
normalized when, among
-     *            others, it starts with {@code /}, or contains {@code .} or {@code ..} paths
steps, or it uses
-     *            backslash ({@code \}) instead of {@code /}. A normalized name might contains
"*" steps.
+     *            others, it starts with {@code /}, or contains {@code .} or {@code ..} path
steps, or it uses
+     *            backslash ({@code \}) instead of {@code /}. A normalized name might contains
"*" path steps
+     *            (acquisition).
      * 
      * @return The result of the lookup. Not {@code null}; check {@link TemplateLookupResult#isPositive()}
to see if the
      *         lookup has found anything.


Mime
View raw message