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 17696bc3 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 add dc592821 Manual: Adjusted version history, and some typo add e5fa45f4 Improved StringUtil.jsStringEnc to support both quotation marks and apostrophe. Added a mode that is both compatible with JSON and JavaScript, without decreasing safety when used in JavaScript. add 77adbf2f Added "JavaScript or JSON" CFormat, and made that the default. Some CFormat-related JavaDoc improvements/fixes. add 14f651f5 Further javadoc fixes/improvements related to CFormat-s/?c/?cn. add 21022a6c CFormat: Further API and javadoc cleanup add 9e14cb0b CFormat: Replace two Default23*CFormat classes with a single LegacyCFormat. add ea1c5eaf Mostly CFormat-related code cleanup (things spotted during forward porting into FM3) add 956067cb (Minor typos) add c4244bcc Deleted long unmaintained Chinese translation of the Manual add b65c56ef Fixed outdated try.freemarker link. add f6cd05d9 Manual: Random minor improvements add 9f120dfe (Missing list of predefined values in output_format JavaDoc) new c96660e6 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: .../freemarker/core/AbstractJSONLikeFormat.java | 9 +- .../freemarker/core/AbstractLegacyCFormat.java | 105 - .../java/freemarker/core/ArithmeticEngine.java | 2 +- src/main/java/freemarker/core/CFormat.java | 18 +- .../freemarker/core/CTemplateNumberFormat.java | 6 +- src/main/java/freemarker/core/Configurable.java | 121 +- .../java/freemarker/core/Default230CFormat.java | 73 - .../java/freemarker/core/Default2321CFormat.java | 72 - src/main/java/freemarker/core/Environment.java | 58 +- .../core/ExtendedDecimalFormatParser.java | 4 +- src/main/java/freemarker/core/JSONCFormat.java | 18 +- src/main/java/freemarker/core/JavaCFormat.java | 10 +- .../java/freemarker/core/JavaScriptCFormat.java | 13 +- ...ONCFormat.java => JavaScriptOrJSONCFormat.java} | 28 +- src/main/java/freemarker/core/LegacyCFormat.java | 173 + .../java/freemarker/core/MarkupOutputFormat.java | 2 +- ...andardCLanguages.java => StandardCFormats.java} | 20 +- src/main/java/freemarker/core/XSCFormat.java | 18 +- .../java/freemarker/ext/beans/BeansWrapper.java | 6 +- .../ext/beans/BeansWrapperConfiguration.java | 2 +- .../java/freemarker/ext/jsp/JspTagModelBase.java | 2 +- .../java/freemarker/template/Configuration.java | 48 +- .../java/freemarker/template/_TemplateAPI.java | 2 +- .../template/utility/CollectionUtils.java | 2 + .../freemarker/template/utility/StringUtil.java | 144 +- src/manual/en_US/book.xml | 232 +- src/manual/zh_CN/book.xml | 31353 ------------------- src/manual/zh_CN/docgen-help/README | 2 - src/manual/zh_CN/docgen-misc/googleAnalytics.html | 14 - src/manual/zh_CN/docgen-originals/figures/README | 2 - src/manual/zh_CN/docgen.cjson | 132 - src/manual/zh_CN/favicon.png | Bin 1291 -> 0 bytes src/manual/zh_CN/figures/model2sketch.png | Bin 21425 -> 0 bytes src/manual/zh_CN/figures/overview.png | Bin 11837 -> 0 bytes src/manual/zh_CN/figures/tree.png | Bin 4699 -> 0 bytes src/manual/zh_CN/logo.png | Bin 10134 -> 0 bytes .../core/BooleanFormatEnvironmentCachingTest.java | 5 +- .../java/freemarker/core/CAndCnBuiltInTest.java | 18 +- .../java/freemarker/core/CFormatTemplateTest.java | 6 + .../freemarker/core/CTemplateNumberFormatTest.java | 2 +- src/test/java/freemarker/core/CustomCFormat.java | 8 +- src/test/java/freemarker/core/NumberBiTest.java | 4 - .../freemarker/template/ConfigurationTest.java | 46 +- .../template/utility/StringUtilTest.java | 77 +- 44 files changed, 778 insertions(+), 32079 deletions(-) delete mode 100644 src/main/java/freemarker/core/AbstractLegacyCFormat.java delete mode 100644 src/main/java/freemarker/core/Default230CFormat.java delete mode 100644 src/main/java/freemarker/core/Default2321CFormat.java copy src/main/java/freemarker/core/{JSONCFormat.java => JavaScriptOrJSONCFormat.java} (55%) create mode 100644 src/main/java/freemarker/core/LegacyCFormat.java rename src/main/java/freemarker/core/{_StandardCLanguages.java => StandardCFormats.java} (61%) delete mode 100644 src/manual/zh_CN/book.xml delete mode 100644 src/manual/zh_CN/docgen-help/README delete mode 100644 src/manual/zh_CN/docgen-misc/googleAnalytics.html delete mode 100644 src/manual/zh_CN/docgen-originals/figures/README delete mode 100644 src/manual/zh_CN/docgen.cjson delete mode 100644 src/manual/zh_CN/favicon.png delete mode 100644 src/manual/zh_CN/figures/model2sketch.png delete mode 100644 src/manual/zh_CN/figures/overview.png delete mode 100644 src/manual/zh_CN/figures/tree.png delete mode 100644 src/manual/zh_CN/logo.png