This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch 2.3 in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit aee8eb486a9125cd957446f9b942b71ce8419d22 Merge: 2ba7e9c 06421cf Author: ddekany <[email protected]> AuthorDate: Fri Nov 1 19:55:35 2019 +0100 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 src/main/java/freemarker/core/BuiltIn.java | 6 +- .../java/freemarker/core/BuiltInsForCallables.java | 42 +-- src/main/java/freemarker/core/Environment.java | 37 +- src/main/java/freemarker/core/HashLiteral.java | 58 +-- src/main/java/freemarker/core/Macro.java | 29 +- src/main/java/freemarker/core/MethodCall.java | 4 + .../freemarker/template/utility/DOMNodeModel.java | 5 +- src/main/javacc/FTL.jj | 27 +- src/manual/en_US/book.xml | 399 +++++++++++---------- .../java/freemarker/core/EndTagSyntaxTest.java | 76 ++++ ...gsBuiltInTest.java => WithArgsBuiltInTest.java} | 260 +++++++------- ...readArgsExamples.java => WithArgsExamples.java} | 4 +- ...hArgsExamples-usingWithArgsSpecialVariable.ftl} | 2 +- ...sExamples-usingWithArgsSpecialVariable.ftl.out} | 0 14 files changed, 530 insertions(+), 419 deletions(-)
