[2/3] incubator-freemarker git commit: (Change log fix)

[dd...@apache.org]

(Change log fix)


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

Branch: refs/heads/3
Commit: ac26aa3246b33050354ee3ad1b91bb100598674d
Parents: eca6684
Author: ddekany <dd...@apache.org>
Authored: Tue Jul 4 00:47:35 2017 +0200
Committer: ddekany <dd...@apache.org>
Committed: Tue Jul 4 00:47:35 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ac26aa32/FM3-CHANGE-LOG.txt
----------------------------------------------------------------------
diff --git a/FM3-CHANGE-LOG.txt b/FM3-CHANGE-LOG.txt
index 6a80de0..617cb5e 100644
--- a/FM3-CHANGE-LOG.txt
+++ b/FM3-CHANGE-LOG.txt
@@ -181,7 +181,7 @@ the FreeMarer 3 changelog here:
   builders to create them.
   - Removed CustomAttribute class. Custom attribute keys can be anything Serializable.
   - As "attributes" can't be modifiable after Builder.build(), and hence didn't fit into the new system, the "attributes" setting was removed.
-    In place of, two new concepts were introduced, targetting two different "attributes" use-cases:
+    In place of that, two new concepts were introduced, targetting two different "attributes" use-cases:
     - Custom states: CustomStateKey class and the CustomStateScope interface was introduced, which
       is somewhat similar to the now removed CustomAttribute. CustomStateScope contains one method, Object getCustomState(CustomStateKey), which
       may calls CustomStateKey.create() to lazily create the state object for the key. Configuration, Template and Environment implements
@@ -190,6 +190,8 @@ the FreeMarer 3 changelog here:
       in the Envronment. You can get their values with `getCustomSetting(Serializble key[, Object defaultValue])`. If no default is specified,
       and the custom setting is not set, a CustomSettingNotSetException is thrown. Just like standard settings, custom settings automatically
       inherited from higher scopes.
+    - In the #ftl header, the `attributes` parameter name was changed to `customSettings`
+      (The template converter tool takes care of this conversion.)
   - Added ProcessingConfiguration interface for the read-only access of template processing settings. This is similar to the
     already existing (in FM2) ParserConfiguration interface.
   - Renamed Configurable to MutableProcessingAndParserConfiguration. Made it abstract too.