This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch 2.3-gae in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit ec74c4865e2e93ff569209edb1de2f55d45a87c3 Author: ddekany <[email protected]> AuthorDate: Sat Oct 23 23:37:45 2021 +0200 Fixed mistake in legacy XML wrapper documentation --- .../java/freemarker/ext/xml/NodeListModel.java | 6 --- src/manual/en_US/book.xml | 46 +++++++++++++++++----- 2 files changed, 37 insertions(+), 15 deletions(-) diff --git a/src/main/java/freemarker/ext/xml/NodeListModel.java b/src/main/java/freemarker/ext/xml/NodeListModel.java index 2f96767..a1ef241 100644 --- a/src/main/java/freemarker/ext/xml/NodeListModel.java +++ b/src/main/java/freemarker/ext/xml/NodeListModel.java @@ -254,12 +254,6 @@ implements * to same node types as <tt>_parent</tt>.</td> * </tr> * <tr> - * <td><tt>_cname</tt></td> - * <td>the canonical names of current nodes (namespace URI + local - * name), one string per node (non-recursive). Applicable to - * elements and attributes</td> - * </tr> - * <tr> * <td><tt>_content</tt></td> * <td>the complete content of current nodes, including children * elements, text, entity references, and processing instructions diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml index 49d3f03..d44b9a8 100644 --- a/src/manual/en_US/book.xml +++ b/src/manual/en_US/book.xml @@ -8974,7 +8974,8 @@ cfg.setTemplateLoader(mtl);</programlisting> </section> <section> - <title>Customizing the behavior regarding TemplateException-s</title> + <title>Customizing the behavior regarding + TemplateException-s</title> <para><literal>TemplateException</literal>-s thrown during the template processing are handled by the @@ -12271,14 +12272,6 @@ grant codeBase "file:/path/to/freemarker.jar" </tr> <tr> - <td><literal>_cname</literal></td> - - <td>the canonical names of current nodes (namespace URI + - local name), one string per node (non-recursive). Applicable - to elements and attributes</td> - </tr> - - <tr> <td><literal>_content</literal></td> <td>the complete content of current nodes, including children @@ -29414,6 +29407,41 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting> <appendix xml:id="app_versions"> <title>Version history</title> + <section xml:id="versions_2_3_32"> + <title>2.3.32</title> + + <para>Release date: TODO</para> + + <section> + <title>Changes on the FTL side</title> + + <itemizedlist> + <listitem> + <para>TODO</para> + </listitem> + </itemizedlist> + </section> + + <section> + <title>Changes on the Java side</title> + + <itemizedlist> + <listitem> + <para><link + xlink:href="https://issues.apache.org/jira/browse/FREEMARKER-190";>FREEMARKER-190</link>: + 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.</para> + </listitem> + </itemizedlist> + </section> + </section> + <section xml:id="versions_2_3_31"> <title>2.3.31</title>
