You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2018/12/19 09:28:08 UTC

[2/3] freemarker git commit: (JavaDoc typo fix)

(JavaDoc typo fix)


Project: http://git-wip-us.apache.org/repos/asf/freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/freemarker/commit/75e37955
Tree: http://git-wip-us.apache.org/repos/asf/freemarker/tree/75e37955
Diff: http://git-wip-us.apache.org/repos/asf/freemarker/diff/75e37955

Branch: refs/heads/3
Commit: 75e379555767cf92130105a57dc0a30689354bb2
Parents: a4a5192
Author: ddekany <dd...@apache.org>
Authored: Sun Oct 21 19:46:41 2018 +0200
Committer: ddekany <dd...@apache.org>
Committed: Sun Oct 21 19:46:41 2018 +0200

----------------------------------------------------------------------
 .../freemarker/core/templateresolver/TemplateResolver.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/freemarker/blob/75e37955/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateResolver.java
----------------------------------------------------------------------
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateResolver.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateResolver.java
index 38815d5..ee4e68f 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateResolver.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateResolver.java
@@ -142,9 +142,9 @@ public abstract class TemplateResolver {
      * @return A {@link GetTemplateResult} object that contains the {@link Template}, or a
      *         {@link GetTemplateResult} object that contains {@code null} as the {@link Template} and information
      *         about the missing template. The return value itself is never {@code null}. Note that exceptions occurring
-     *         during template loading mustn't be treated as a missing template, they must cause an exception to be
+     *         during template loading mustn't be treated as a missing templates, they must cause an exception to be
      *         thrown by this method instead of returning a {@link GetTemplateResult}. The idea is that having a
-     *         missing template is normal (not exceptional), because of how some lookup strategies work. That the
+     *         missing template is normal (not exceptional), because of how some lookup strategies work. The
      *         backing storage mechanism should indeed check that it's missing though, and not cover an error as such.
      * 
      * @throws MalformedTemplateNameException