Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/bdc90250 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/bdc90250 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/bdc90250 Branch: refs/heads/2.3 Commit: bdc902508893c202a1cc370ef6c19a9b18abd16b Parents: dd60aef b246de2 Author: ddekany <[email protected]> Authored: Mon Sep 25 17:15:38 2017 +0200 Committer: ddekany <[email protected]> Committed: Mon Sep 25 17:15:38 2017 +0200 ---------------------------------------------------------------------- .../freemarker/core/ArithmeticExpression.java | 38 +++--- src/main/java/freemarker/core/BuiltIn.java | 4 +- .../freemarker/core/BuiltInsForSequences.java | 29 +++++ .../freemarker/core/CollectionAndSequence.java | 11 +- src/main/java/freemarker/core/Configurable.java | 26 ++-- .../freemarker/core/NonSequenceException.java | 9 +- .../core/UnexpectedTypeException.java | 12 ++ src/manual/en_US/book.xml | 123 ++++++++++++++++--- .../freemarker/core/MiscErrorMessagesTest.java | 11 ++ .../freemarker/core/SequenceBuiltInTest.java | 82 +++++++++++++ .../core/StringLiteralInterpolationTest.java | 2 +- .../freemarker/template/ConfigurationTest.java | 24 ++++ 12 files changed, 322 insertions(+), 49 deletions(-) ----------------------------------------------------------------------
