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 c96660e6 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 add 204d76ab Add fine-grained mixed-content support to markup output formats. add 836903b6 Merge pull request #83 from nolaviz/nolaviz-devel add 7aebdda3 Improved documentation for the MarkupOutputFormat.outputForeign PR (and minor test cleanup). add 3018a7bd Slightly improved DefaultMemberAccessPolicy-rules (used by default), and unsafeMethods.properties (long deprecated, not used by default). add de52b49e Updated version for the coming release add b08bee6e Minor documentation adjustments new 133d53c3 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: .../core/CombinedMarkupOutputFormat.java | 5 ++++ src/main/java/freemarker/core/Configurable.java | 4 +-- src/main/java/freemarker/core/DollarVariable.java | 10 +++++-- .../java/freemarker/core/MarkupOutputFormat.java | 12 ++++++++ src/main/java/freemarker/core/OutputFormat.java | 20 +++++++++----- .../ext/beans/DefaultMemberAccessPolicy-rules | 2 +- .../freemarker/ext/beans/unsafeMethods.properties | 5 ++-- src/main/resources/freemarker/version.properties | 8 +++--- src/manual/en_US/book.xml | 32 +++++++++++++++++++--- .../java/freemarker/core/DummyOutputFormat.java | 18 +++++++++++- .../java/freemarker/core/OutputFormatTest.java | 9 ++++++ 11 files changed, 100 insertions(+), 25 deletions(-)