Repository: incubator-freemarker
Updated Branches:
  refs/heads/3 8915ac9bd -> 3dc00fb8b


Commit comment and change log correction: "It's an error to set a template 
resolution related settings that the TemplateResolver doesn't support."


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

Branch: refs/heads/3
Commit: 3dc00fb8ba8f11f6261050addd6fb0c3bd776f50
Parents: 8915ac9
Author: ddekany <[email protected]>
Authored: Wed Jun 7 01:30:50 2017 +0200
Committer: ddekany <[email protected]>
Committed: Wed Jun 7 01:30:50 2017 +0200

----------------------------------------------------------------------
 FM3-CHANGE-LOG.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/3dc00fb8/FM3-CHANGE-LOG.txt
----------------------------------------------------------------------
diff --git a/FM3-CHANGE-LOG.txt b/FM3-CHANGE-LOG.txt
index 7c4cfcf..180db5c 100644
--- a/FM3-CHANGE-LOG.txt
+++ b/FM3-CHANGE-LOG.txt
@@ -85,8 +85,8 @@ the FreeMarer 3 changelog here:
   giving total control over this aspect of FreeMarker, in case replacing 
Configuration settings like `templateLoader`
   or `cacheStorage` wasn't enough. The `TemplateResolver` implementation 
declares which of the template resolution
   related Configuration settings it supports (for example, it may still want 
to rely on the `templateLoader`, but
-  doesn't use the other settings). It's a template resolution related settings 
that the TemplateResolver doesn't
-  support. The default implementation, `DefaultTemplateResolver`, supports all 
of them of course. Note that the
+  doesn't use the other settings). It's an error to set a template resolution 
related settings that the TemplateResolver
+  doesn't support. The default implementation, `DefaultTemplateResolver`, 
supports all of them of course. Note that the
   `TemplateCache` was removed, and was basically replaced by 
`DefaultTemplateResolver`.
 - Marked most static utility classes as internal, and renamed them to start 
with "_" (for example StringUtils was
   renamed to _StringUtil, thus people won't accidentally use it when they 
wanted to autocomplete to Apache Commons

Reply via email to