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/5bfa9ac4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/5bfa9ac4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/5bfa9ac4

Branch: refs/heads/2.3
Commit: 5bfa9ac426bbf0a03c2cd5009c03e76640a27bd6
Parents: 6442fd7 8286a7b
Author: ddekany <ddek...@apache.org>
Authored: Sat Mar 10 21:01:58 2018 +0100
Committer: ddekany <ddek...@apache.org>
Committed: Sat Mar 10 21:01:58 2018 +0100

----------------------------------------------------------------------
 .../freemarker/cache/TemplateNameFormat.java    |  42 +++++++-
 src/main/java/freemarker/cache/_CacheAPI.java   |   5 +
 src/main/java/freemarker/core/BuiltIn.java      |   3 +-
 .../freemarker/core/BuiltInsForStringsMisc.java |  47 +++++++++
 src/main/java/freemarker/core/Environment.java  |  26 ++++-
 src/manual/en_US/book.xml                       | 104 +++++++++++++++++--
 .../cache/TemplateNameFormatTest.java           |  23 +++-
 .../core/AbsoluteTemplateNameBITest.java        |  72 +++++++++++++
 .../manual/AbsoluteTemplateNameBIExample.java   |  31 ++++++
 .../AbsoluteTemplateNameBIExample-foo.ftl       |  19 ++++
 .../AbsoluteTemplateNameBIExample-lib.ftl       |  38 +++++++
 .../dir/AbsoluteTemplateNameBIExample-foo.ftl   |  19 ++++
 .../dir/AbsoluteTemplateNameBIExample-main.ftl  |  24 +++++
 .../AbsoluteTemplateNameBIExample-main.ftl.out  |  26 +++++
 14 files changed, 463 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


Reply via email to