This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch 2.3
in repository https://gitbox.apache.org/repos/asf/freemarker.git.
from 19690e2 Merge remote-tracking branch 'origin/2.3-gae' into 2.3
add 75f3996 Manual: Fix HTLM typos
add 201533e Merge pull request #73 from agriffis/fix-htlm-typos
add a3b88c1 fix typo 'TemplatException' to 'TemplateException'
add 0cfab23 Merge pull request #75 from ILyaCyclone/2.3-gae
add d0c00d6 Fix: Typos "clalc." in TemplateException
add 3a311da Merge pull request #76 from theHacker/patch-1
add e34c270 [FREEMARKER-187] Build failed on some systems due to
character encoding issue
add 172bffc Updated version to 2.3.32-SNAPSHOT
add 054b290 [FREEMARKER-190]: Updated dom4j version used during
FreeMarker project compilation from 1.3 to 2.1.3. Users can still use
FreeMarker with dom4j 1.3 (mostly just luck, but it works). We were forced to
do this because old dom4j versions have security vulnerabilities, and although
FreeMarker is not affected by them (like we do not pull in dom4j as dependency
into the projects of our users), we were flagged as vulnerable at certain
places for merely supporting 1.3.
add ec74c48 Fixed mistake in legacy XML wrapper documentation
add b5d2d40 This is related to freemarker.ext.xml, which is the very old,
long deprecated XML wrapper (the commonly used one is freemarker.ext.dom),
which almost nobody uses, or maybe truly nobody. Still, now the
_registerNamespace key works, doing what the documentation always stated.
Before this fix it just behaved as if it was the name of an element you are
looking for.
new 62f9a0f Merge remote-tracking branch 'origin/2.3-gae' into 2.3
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.xml | 1 +
ivy.xml | 6 +-
.../core/DefaultTruncateBuiltinAlgorithm.java | 4 +-
.../java/freemarker/ext/xml/NodeListModel.java | 19 +++--
.../java/freemarker/template/Configuration.java | 3 +
.../freemarker/template/TemplateException.java | 4 +-
.../java/freemarker/template/_TemplateAPI.java | 1 +
src/main/resources/freemarker/version.properties | 8 +-
src/manual/en_US/book.xml | 87 ++++++++++++++++------
src/manual/zh_CN/book.xml | 8 +-
.../template/DefaultObjectWrapperTest.java | 1 +
.../manual/AutoEscapingExample-convert.ftlh | 2 +-
.../manual/AutoEscapingExample-convert.ftlh.out | 2 +-
13 files changed, 97 insertions(+), 49 deletions(-)
