Repository: incubator-freemarker
Updated Branches:
  refs/heads/3 db64ebc97 -> 18fd4e8f2


(Minor JavaDoc improvement)


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

Branch: refs/heads/3
Commit: 18fd4e8f277aea0bd0a6f600012bcdc18d1a6632
Parents: db64ebc
Author: ddekany <[email protected]>
Authored: Fri Jun 9 00:09:39 2017 +0200
Committer: ddekany <[email protected]>
Committed: Fri Jun 9 00:09:39 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/18fd4e8f/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 2dde324..0d018eb 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
@@ -35,6 +35,8 @@ import org.apache.freemarker.core.util._NullArgumentException;
  * in case the standard mechanism (a {@link DefaultTemplateResolver} combined 
with all the {@link Configuration}
  * settings like {@link Configuration#getTemplateLoader() templateLoader},
  * {@link Configuration#getTemplateConfigurations() templateConfigurations}, 
etc.) is not flexible enough.
+ * The {@link TemplateResolver} is put into use by setting the
+ * {@link Configuration#getTemplateResolver() templateResolver} configuration 
setting.
  * <p>
  * A custom {@link TemplateResolver} can depend on a selected set of {@link 
Configuration} settings; the same ones that
  * {@link DefaultTemplateResolver} depends on. These settings are collected 
into the

Reply via email to