You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2026/08/28 21:19:44 UTC

(freemarker-site) branch asf-site updated: Updates site with 2.3.35

This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/freemarker-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new 8eb193a2 Updates site with 2.3.35
8eb193a2 is described below

commit 8eb193a262e89929d3c14290a12b5d92e860afac
Author: ddekany <dd...@apache.org>
AuthorDate: Fri Aug 28 23:19:35 2026 +0200

    Updates site with 2.3.35
---
 committer-howto.html                               |    8 +-
 contribute.html                                    |   10 +-
 docs/alphaidx.html                                 |   63 +-
 docs/api/allclasses-index.html                     |  571 +++++-----
 docs/api/allpackages-index.html                    |   15 +-
 docs/api/constant-values.html                      | 1119 +++++++++-----------
 docs/api/deprecated-list.html                      |  181 ++--
 docs/api/element-list                              |    2 -
 docs/api/freemarker/cache/AndMatcher.html          |    2 +-
 .../freemarker/cache/ByteArrayTemplateLoader.html  |   87 +-
 docs/api/freemarker/cache/CacheStorage.html        |   10 +-
 .../freemarker/cache/CacheStorageWithGetSize.html  |    2 +-
 docs/api/freemarker/cache/ClassTemplateLoader.html |   51 +-
 .../freemarker/cache/ConcurrentCacheStorage.html   |   18 +-
 .../ConditionalTemplateConfigurationFactory.html   |   21 +-
 .../api/freemarker/cache/FileExtensionMatcher.html |   10 +-
 docs/api/freemarker/cache/FileNameGlobMatcher.html |    6 +-
 docs/api/freemarker/cache/FileTemplateLoader.html  |  120 +--
 .../FirstMatchTemplateConfigurationFactory.html    |   25 +-
 .../cache/MergingTemplateConfigurationFactory.html |   21 +-
 docs/api/freemarker/cache/MruCacheStorage.html     |    2 +-
 docs/api/freemarker/cache/MultiTemplateLoader.html |   91 +-
 docs/api/freemarker/cache/NotMatcher.html          |    2 +-
 docs/api/freemarker/cache/NullCacheStorage.html    |   14 +-
 docs/api/freemarker/cache/OrMatcher.html           |    2 +-
 docs/api/freemarker/cache/PathGlobMatcher.html     |    2 +-
 docs/api/freemarker/cache/PathRegexMatcher.html    |    2 +-
 docs/api/freemarker/cache/SoftCacheStorage.html    |    6 +-
 .../freemarker/cache/StatefulTemplateLoader.html   |    2 +-
 .../api/freemarker/cache/StringTemplateLoader.html |   87 +-
 docs/api/freemarker/cache/StrongCacheStorage.html  |    6 +-
 .../cache/TemplateCache.MaybeMissingTemplate.html  |    4 +-
 docs/api/freemarker/cache/TemplateCache.html       |  103 +-
 .../cache/TemplateConfigurationFactory.html        |   23 +-
 .../TemplateConfigurationFactoryException.html     |    2 +-
 docs/api/freemarker/cache/TemplateLoader.html      |  122 ++-
 docs/api/freemarker/cache/TemplateLoaderUtils.html |    2 +-
 .../freemarker/cache/TemplateLookupContext.html    |   21 +-
 .../api/freemarker/cache/TemplateLookupResult.html |    2 +-
 .../freemarker/cache/TemplateLookupStrategy.html   |   74 +-
 docs/api/freemarker/cache/TemplateNameFormat.html  |   27 +-
 .../freemarker/cache/TemplateSourceMatcher.html    |    2 +-
 docs/api/freemarker/cache/URLTemplateLoader.html   |  120 ++-
 docs/api/freemarker/cache/URLTemplateSource.html   |    2 +-
 .../api/freemarker/cache/WebappTemplateLoader.html |  111 +-
 docs/api/freemarker/cache/package-summary.html     |   17 +-
 docs/api/freemarker/cache/package-tree.html        |    2 +-
 .../freemarker/core/AbstractJSONLikeFormat.html    |    2 +-
 .../core/AliasTemplateDateFormatFactory.html       |   16 +-
 .../core/AliasTemplateNumberFormatFactory.html     |   16 +-
 .../core/ArithmeticEngine.BigDecimalEngine.html    |    4 +-
 .../core/ArithmeticEngine.ConservativeEngine.html  |   16 +-
 docs/api/freemarker/core/ArithmeticEngine.html     |   75 +-
 docs/api/freemarker/core/BugException.html         |    2 +-
 docs/api/freemarker/core/BuiltInForNodeEx.html     |   56 +-
 docs/api/freemarker/core/CFormat.html              |    2 +-
 docs/api/freemarker/core/CSSOutputFormat.html      |    2 +-
 ...CallPlaceCustomDataInitializationException.html |    2 +-
 .../core/CombinedMarkupOutputFormat.html           |    2 +-
 docs/api/freemarker/core/CommandLine.html          |  173 ---
 .../freemarker/core/CommonMarkupOutputFormat.html  |    2 +-
 .../core/CommonTemplateMarkupOutputModel.html      |    2 +-
 ...nfigurable.SettingValueAssignmentException.html |    2 +-
 .../core/Configurable.UnknownSettingException.html |    2 +-
 docs/api/freemarker/core/Configurable.html         |    2 +-
 docs/api/freemarker/core/CustomAttribute.html      |    2 +-
 .../core/DefaultTruncateBuiltinAlgorithm.html      |    2 +-
 docs/api/freemarker/core/DirectiveCallPlace.html   |    2 +-
 .../api/freemarker/core/Environment.Namespace.html |    2 +-
 docs/api/freemarker/core/Environment.html          |    2 +-
 docs/api/freemarker/core/FreeMarkerTree.html       |    2 +-
 docs/api/freemarker/core/HTMLOutputFormat.html     |    2 +-
 .../core/InvalidFormatParametersException.html     |    2 +-
 .../core/InvalidFormatStringException.html         |    2 +-
 .../freemarker/core/InvalidReferenceException.html |    2 +-
 docs/api/freemarker/core/JSONCFormat.html          |    2 +-
 docs/api/freemarker/core/JSONOutputFormat.html     |    2 +-
 docs/api/freemarker/core/JavaCFormat.html          |    2 +-
 docs/api/freemarker/core/JavaScriptCFormat.html    |    2 +-
 .../freemarker/core/JavaScriptOrJSONCFormat.html   |    2 +-
 .../freemarker/core/JavaScriptOutputFormat.html    |    2 +-
 docs/api/freemarker/core/LegacyCFormat.html        |    2 +-
 docs/api/freemarker/core/MarkupOutputFormat.html   |    2 +-
 docs/api/freemarker/core/NonBooleanException.html  |    2 +-
 docs/api/freemarker/core/NonDateException.html     |    2 +-
 .../freemarker/core/NonExtendedHashException.html  |    2 +-
 .../freemarker/core/NonExtendedNodeException.html  |    2 +-
 docs/api/freemarker/core/NonHashException.html     |    2 +-
 .../freemarker/core/NonMarkupOutputException.html  |    2 +-
 docs/api/freemarker/core/NonMethodException.html   |    2 +-
 docs/api/freemarker/core/NonNodeException.html     |    2 +-
 .../api/freemarker/core/NonNumericalException.html |    2 +-
 docs/api/freemarker/core/NonSequenceException.html |    2 +-
 .../core/NonSequenceOrCollectionException.html     |    2 +-
 docs/api/freemarker/core/NonStringException.html   |    2 +-
 .../core/NonStringOrTemplateOutputException.html   |    2 +-
 .../core/OptInTemplateClassResolver.html           |   49 +-
 docs/api/freemarker/core/OutputFormat.html         |    2 +-
 docs/api/freemarker/core/ParseException.html       |  201 ++--
 docs/api/freemarker/core/ParserConfiguration.html  |    2 +-
 .../core/ParsingNotSupportedException.html         |    2 +-
 .../api/freemarker/core/PlainTextOutputFormat.html |    2 +-
 docs/api/freemarker/core/RTFOutputFormat.html      |    2 +-
 docs/api/freemarker/core/StopException.html        |    2 +-
 .../api/freemarker/core/TemplateClassResolver.html |    2 +-
 .../core/TemplateCombinedMarkupOutputModel.html    |    2 +-
 .../api/freemarker/core/TemplateConfiguration.html |    2 +-
 docs/api/freemarker/core/TemplateDateFormat.html   |    2 +-
 .../freemarker/core/TemplateDateFormatFactory.html |    2 +-
 docs/api/freemarker/core/TemplateFormatUtil.html   |    2 +-
 .../freemarker/core/TemplateHTMLOutputModel.html   |    2 +-
 .../freemarker/core/TemplateMarkupOutputModel.html |    2 +-
 docs/api/freemarker/core/TemplateNumberFormat.html |    2 +-
 .../core/TemplateNumberFormatFactory.html          |    2 +-
 .../TemplateProcessingTracer.TracedElement.html    |    2 +-
 .../freemarker/core/TemplateProcessingTracer.html  |    2 +-
 .../freemarker/core/TemplateRTFOutputModel.html    |    2 +-
 docs/api/freemarker/core/TemplateValueFormat.html  |    2 +-
 .../core/TemplateValueFormatException.html         |    2 +-
 .../core/TemplateValueFormatFactory.html           |    2 +-
 .../freemarker/core/TemplateXHTMLOutputModel.html  |    2 +-
 .../freemarker/core/TemplateXMLOutputModel.html    |    2 +-
 .../freemarker/core/TruncateBuiltinAlgorithm.html  |    2 +-
 .../core/UndefinedCustomFormatException.html       |    2 +-
 .../api/freemarker/core/UndefinedOutputFormat.html |    2 +-
 .../freemarker/core/UnexpectedTypeException.html   |    2 +-
 .../core/UnformattableValueException.html          |    2 +-
 ...nownDateTypeFormattingUnsupportedException.html |    2 +-
 ...UnknownDateTypeParsingUnsupportedException.html |    2 +-
 .../freemarker/core/UnparsableValueException.html  |    2 +-
 .../core/UnregisteredOutputFormatException.html    |    2 +-
 docs/api/freemarker/core/XHTMLOutputFormat.html    |    2 +-
 docs/api/freemarker/core/XMLOutputFormat.html      |    2 +-
 docs/api/freemarker/core/XSCFormat.html            |    2 +-
 docs/api/freemarker/core/package-summary.html      |  165 ++-
 docs/api/freemarker/core/package-tree.html         |    3 +-
 docs/api/freemarker/debug/Breakpoint.html          |  247 -----
 docs/api/freemarker/debug/DebugModel.html          |  546 ----------
 docs/api/freemarker/debug/DebuggedEnvironment.html |  202 ----
 docs/api/freemarker/debug/Debugger.html            |  325 ------
 docs/api/freemarker/debug/DebuggerClient.html      |  163 ---
 docs/api/freemarker/debug/DebuggerListener.html    |  147 ---
 .../debug/EnvironmentSuspendedEvent.html           |  234 ----
 .../api/freemarker/debug/impl/DebuggerService.html |  200 ----
 .../debug/impl/RmiDebuggerListenerImpl.html        |  226 ----
 .../api/freemarker/debug/impl/package-summary.html |   81 --
 docs/api/freemarker/debug/impl/package-tree.html   |   87 --
 docs/api/freemarker/debug/package-summary.html     |  116 --
 docs/api/freemarker/debug/package-tree.html        |  101 --
 docs/api/freemarker/ext/ant/FreemarkerXmlTask.html |    2 +-
 docs/api/freemarker/ext/ant/JythonAntTask.html     |    2 +-
 .../ext/ant/UnlinkedJythonOperationsImpl.html      |    2 +-
 docs/api/freemarker/ext/ant/package-summary.html   |    2 +-
 docs/api/freemarker/ext/ant/package-tree.html      |    2 +-
 docs/api/freemarker/ext/beans/ArrayModel.html      |    2 +-
 docs/api/freemarker/ext/beans/BeanModel.html       |    2 +-
 docs/api/freemarker/ext/beans/BeansModelCache.html |    2 +-
 .../BeansWrapper.MethodAppearanceDecision.html     |    2 +-
 ...BeansWrapper.MethodAppearanceDecisionInput.html |    2 +-
 docs/api/freemarker/ext/beans/BeansWrapper.html    |   10 +-
 .../freemarker/ext/beans/BeansWrapperBuilder.html  |    2 +-
 .../ext/beans/BeansWrapperConfiguration.html       |    2 +-
 .../ext/beans/BlacklistMemberAccessPolicy.html     |    2 +-
 docs/api/freemarker/ext/beans/BooleanModel.html    |    2 +-
 .../ext/beans/ClassMemberAccessPolicy.html         |    2 +-
 docs/api/freemarker/ext/beans/CollectionModel.html |    2 +-
 docs/api/freemarker/ext/beans/DateModel.html       |    2 +-
 .../ext/beans/DefaultMemberAccessPolicy.html       |    2 +-
 .../api/freemarker/ext/beans/EnumerationModel.html |    2 +-
 .../freemarker/ext/beans/GenericObjectModel.html   |    2 +-
 docs/api/freemarker/ext/beans/HashAdapter.html     |    2 +-
 .../ext/beans/InvalidPropertyException.html        |    2 +-
 docs/api/freemarker/ext/beans/IteratorModel.html   |    2 +-
 .../ext/beans/LegacyDefaultMemberAccessPolicy.html |    2 +-
 docs/api/freemarker/ext/beans/MapModel.html        |    2 +-
 .../freemarker/ext/beans/MemberAccessPolicy.html   |    2 +-
 ...ectorListMemberAccessPolicy.MemberSelector.html |    2 +-
 .../MemberSelectorListMemberAccessPolicy.html      |    2 +-
 .../ext/beans/MethodAppearanceFineTuner.html       |    2 +-
 docs/api/freemarker/ext/beans/NumberModel.html     |    2 +-
 .../ext/beans/OverloadedMethodsModel.html          |    2 +-
 .../freemarker/ext/beans/ResourceBundleModel.html  |    2 +-
 docs/api/freemarker/ext/beans/SimpleMapModel.html  |    2 +-
 .../freemarker/ext/beans/SimpleMethodModel.html    |    2 +-
 .../freemarker/ext/beans/SingletonCustomizer.html  |    2 +-
 docs/api/freemarker/ext/beans/StringModel.html     |    2 +-
 .../freemarker/ext/beans/TemplateAccessible.html   |    2 +-
 .../ext/beans/WhitelistMemberAccessPolicy.html     |    2 +-
 .../ext/beans/ZeroArgumentNonVoidMethodPolicy.html |    2 +-
 docs/api/freemarker/ext/beans/package-summary.html |    2 +-
 docs/api/freemarker/ext/beans/package-tree.html    |    2 +-
 docs/api/freemarker/ext/dom/NodeModel.html         |  167 +--
 docs/api/freemarker/ext/dom/Transform.html         |  147 ---
 docs/api/freemarker/ext/dom/XPathSupport.html      |    2 +-
 docs/api/freemarker/ext/dom/package-summary.html   |    6 +-
 docs/api/freemarker/ext/dom/package-tree.html      |    3 +-
 .../ext/jakarta/jsp/EventForwarding.html           |    7 +-
 .../freemarker/ext/jakarta/jsp/FreemarkerTag.html  |    2 +-
 .../TaglibFactory.ClasspathMetaInfTldSource.html   |   10 +-
 .../jsp/TaglibFactory.ClearMetaInfTldSource.html   |    2 +-
 .../jsp/TaglibFactory.MetaInfTldSource.html        |    2 +-
 ...libFactory.WebInfPerLibJarMetaInfTldSource.html |    8 +-
 .../freemarker/ext/jakarta/jsp/TaglibFactory.html  |   55 +-
 .../ext/jakarta/jsp/package-summary.html           |   13 +-
 .../freemarker/ext/jakarta/jsp/package-tree.html   |    2 +-
 .../jakarta/servlet/AllHttpScopesHashModel.html    |   11 +-
 .../ext/jakarta/servlet/FreemarkerServlet.html     |    7 +-
 .../ext/jakarta/servlet/HttpRequestHashModel.html  |    7 +-
 .../servlet/HttpRequestParametersHashModel.html    |    7 +-
 .../ext/jakarta/servlet/HttpSessionHashModel.html  |    7 +-
 .../ext/jakarta/servlet/IncludePage.html           |    9 +-
 .../jakarta/servlet/ServletContextHashModel.html   |    7 +-
 .../ext/jakarta/servlet/WebappTemplateLoader.html  |  111 +-
 .../ext/jakarta/servlet/package-summary.html       |   10 +-
 .../ext/jakarta/servlet/package-tree.html          |    2 +-
 docs/api/freemarker/ext/jdom/NodeListModel.html    |   42 +-
 docs/api/freemarker/ext/jdom/package-summary.html  |    2 +-
 docs/api/freemarker/ext/jdom/package-tree.html     |    2 +-
 docs/api/freemarker/ext/jsp/EventForwarding.html   |    7 +-
 docs/api/freemarker/ext/jsp/FreemarkerTag.html     |    2 +-
 .../TaglibFactory.ClasspathMetaInfTldSource.html   |   10 +-
 .../jsp/TaglibFactory.ClearMetaInfTldSource.html   |    2 +-
 .../ext/jsp/TaglibFactory.MetaInfTldSource.html    |    2 +-
 ...libFactory.WebInfPerLibJarMetaInfTldSource.html |    8 +-
 docs/api/freemarker/ext/jsp/TaglibFactory.html     |   55 +-
 docs/api/freemarker/ext/jsp/package-summary.html   |   13 +-
 docs/api/freemarker/ext/jsp/package-tree.html      |    2 +-
 .../api/freemarker/ext/jython/JythonHashModel.html |    2 +-
 docs/api/freemarker/ext/jython/JythonModel.html    |    2 +-
 .../freemarker/ext/jython/JythonNumberModel.html   |    2 +-
 .../freemarker/ext/jython/JythonSequenceModel.html |    2 +-
 .../ext/jython/JythonVersionAdapter.html           |    2 +-
 docs/api/freemarker/ext/jython/JythonWrapper.html  |    2 +-
 .../api/freemarker/ext/jython/package-summary.html |    2 +-
 docs/api/freemarker/ext/jython/package-tree.html   |    2 +-
 .../freemarker/ext/rhino/RhinoFunctionModel.html   |    2 +-
 .../freemarker/ext/rhino/RhinoScriptableModel.html |    2 +-
 docs/api/freemarker/ext/rhino/RhinoWrapper.html    |    2 +-
 docs/api/freemarker/ext/rhino/package-summary.html |    2 +-
 docs/api/freemarker/ext/rhino/package-tree.html    |    2 +-
 .../ext/servlet/AllHttpScopesHashModel.html        |   11 +-
 .../freemarker/ext/servlet/FreemarkerServlet.html  |    7 +-
 .../ext/servlet/HttpRequestHashModel.html          |    7 +-
 .../servlet/HttpRequestParametersHashModel.html    |    7 +-
 .../ext/servlet/HttpSessionHashModel.html          |    7 +-
 docs/api/freemarker/ext/servlet/IncludePage.html   |    9 +-
 .../ext/servlet/ServletContextHashModel.html       |    7 +-
 .../freemarker/ext/servlet/package-summary.html    |   10 +-
 docs/api/freemarker/ext/servlet/package-tree.html  |    2 +-
 docs/api/freemarker/ext/util/IdentityHashMap.html  |    2 +-
 docs/api/freemarker/ext/util/ModelCache.html       |    2 +-
 docs/api/freemarker/ext/util/ModelFactory.html     |    2 +-
 .../freemarker/ext/util/WrapperTemplateModel.html  |    2 +-
 docs/api/freemarker/ext/util/package-summary.html  |    2 +-
 docs/api/freemarker/ext/util/package-tree.html     |    2 +-
 docs/api/freemarker/ext/xml/NodeListModel.html     |    2 +-
 docs/api/freemarker/ext/xml/package-summary.html   |    2 +-
 docs/api/freemarker/ext/xml/package-tree.html      |    2 +-
 docs/api/freemarker/log/Logger.html                |   33 +-
 docs/api/freemarker/log/package-summary.html       |    5 +-
 docs/api/freemarker/log/package-tree.html          |    2 +-
 .../freemarker/template/AdapterTemplateModel.html  |    2 +-
 .../template/AttemptExceptionReporter.html         |    2 +-
 docs/api/freemarker/template/Configuration.html    |   49 +-
 .../freemarker/template/DefaultArrayAdapter.html   |    2 +-
 .../template/DefaultEnumerationAdapter.html        |    2 +-
 .../template/DefaultIterableAdapter.html           |    2 +-
 .../template/DefaultIteratorAdapter.html           |    2 +-
 .../freemarker/template/DefaultListAdapter.html    |    2 +-
 .../api/freemarker/template/DefaultMapAdapter.html |    2 +-
 .../template/DefaultNonListCollectionAdapter.html  |    2 +-
 .../freemarker/template/DefaultObjectWrapper.html  |    2 +-
 .../template/DefaultObjectWrapperBuilder.html      |    2 +-
 .../DefaultObjectWrapperConfiguration.html         |    2 +-
 docs/api/freemarker/template/LocalizedString.html  |    2 +-
 .../template/MalformedTemplateNameException.html   |   15 +-
 .../template/MapKeyValuePairIterator.html          |    2 +-
 ...eHashModel.ShouldNotBeGetAsMethodException.html |    2 +-
 .../template/MethodCallAwareTemplateHashModel.html |    2 +-
 docs/api/freemarker/template/ObjectWrapper.html    |    2 +-
 .../template/ObjectWrapperAndUnwrapper.html        |    2 +-
 .../template/ResourceBundleLocalizedString.html    |    2 +-
 docs/api/freemarker/template/SimpleCollection.html |    2 +-
 docs/api/freemarker/template/SimpleDate.html       |    2 +-
 docs/api/freemarker/template/SimpleHash.html       |    2 +-
 docs/api/freemarker/template/SimpleList.html       |    2 +-
 docs/api/freemarker/template/SimpleNumber.html     |    2 +-
 .../freemarker/template/SimpleObjectWrapper.html   |    2 +-
 docs/api/freemarker/template/SimpleScalar.html     |    2 +-
 docs/api/freemarker/template/SimpleSequence.html   |    2 +-
 .../template/Template.WrongEncodingException.html  |  185 ++--
 docs/api/freemarker/template/Template.html         |    2 +-
 .../freemarker/template/TemplateBooleanModel.html  |    2 +-
 .../template/TemplateCollectionModel.html          |    2 +-
 .../template/TemplateCollectionModelEx.html        |    2 +-
 .../api/freemarker/template/TemplateDateModel.html |    2 +-
 .../freemarker/template/TemplateDirectiveBody.html |    2 +-
 .../template/TemplateDirectiveModel.html           |    2 +-
 .../api/freemarker/template/TemplateException.html |    2 +-
 .../template/TemplateExceptionHandler.html         |    2 +-
 .../api/freemarker/template/TemplateHashModel.html |    2 +-
 .../freemarker/template/TemplateHashModelEx.html   |    2 +-
 .../TemplateHashModelEx2.KeyValuePair.html         |    2 +-
 .../TemplateHashModelEx2.KeyValuePairIterator.html |    2 +-
 .../freemarker/template/TemplateHashModelEx2.html  |    2 +-
 .../freemarker/template/TemplateMethodModel.html   |    2 +-
 .../freemarker/template/TemplateMethodModelEx.html |    2 +-
 docs/api/freemarker/template/TemplateModel.html    |    2 +-
 .../freemarker/template/TemplateModelAdapter.html  |    2 +-
 .../template/TemplateModelException.html           |    2 +-
 .../freemarker/template/TemplateModelIterator.html |    2 +-
 .../template/TemplateModelListSequence.html        |    2 +-
 .../template/TemplateModelWithAPISupport.html      |    2 +-
 .../api/freemarker/template/TemplateNodeModel.html |    2 +-
 .../freemarker/template/TemplateNodeModelEx.html   |    2 +-
 .../template/TemplateNotFoundException.html        |    2 +-
 .../freemarker/template/TemplateNumberModel.html   |    2 +-
 .../freemarker/template/TemplateScalarModel.html   |    2 +-
 .../freemarker/template/TemplateSequenceModel.html |    2 +-
 .../template/TemplateTransformModel.html           |    2 +-
 docs/api/freemarker/template/TransformControl.html |    2 +-
 docs/api/freemarker/template/Version.html          |    2 +-
 .../freemarker/template/WrappingTemplateModel.html |    2 +-
 docs/api/freemarker/template/package-summary.html  |    2 +-
 docs/api/freemarker/template/package-tree.html     |    2 +-
 .../freemarker/template/utility/CaptureOutput.html |    2 +-
 .../api/freemarker/template/utility/ClassUtil.html |    2 +-
 .../template/utility/CollectionUtils.html          |    2 +-
 .../freemarker/template/utility/Collections12.html |    2 +-
 .../api/freemarker/template/utility/Constants.html |    2 +-
 .../freemarker/template/utility/DOMNodeModel.html  |    2 +-
 .../DateUtil.CalendarFieldsToDateConverter.html    |    2 +-
 .../utility/DateUtil.DateParseException.html       |    2 +-
 .../DateUtil.DateToISO8601CalendarFactory.html     |    2 +-
 ...eUtil.TrivialCalendarFieldsToDateConverter.html |    2 +-
 ...teUtil.TrivialDateToISO8601CalendarFactory.html |    2 +-
 docs/api/freemarker/template/utility/DateUtil.html |    2 +-
 .../freemarker/template/utility/DeepUnwrap.html    |    2 +-
 docs/api/freemarker/template/utility/Execute.html  |    2 +-
 .../freemarker/template/utility/HtmlEscape.html    |    2 +-
 .../freemarker/template/utility/JythonRuntime.html |    2 +-
 .../template/utility/NormalizeNewlines.html        |    2 +-
 .../template/utility/NullArgumentException.html    |    2 +-
 .../freemarker/template/utility/NullWriter.html    |    2 +-
 .../freemarker/template/utility/NumberUtil.html    |    2 +-
 .../template/utility/ObjectConstructor.html        |    2 +-
 .../freemarker/template/utility/ObjectFactory.html |    2 +-
 .../utility/ObjectWrapperWithAPISupport.html       |    2 +-
 .../freemarker/template/utility/OptimizerUtil.html |    2 +-
 .../template/utility/RichObjectWrapper.html        |    2 +-
 .../template/utility/SecurityUtilities.html        |    2 +-
 .../template/utility/StandardCompress.html         |    2 +-
 .../StringUtil.JsStringEncCompatibility.html       |    2 +-
 .../utility/StringUtil.JsStringEncQuotation.html   |    2 +-
 .../freemarker/template/utility/StringUtil.html    |    2 +-
 .../template/utility/TemplateModelUtils.html       |    2 +-
 .../freemarker/template/utility/ToCanonical.html   |  177 ----
 .../utility/UndeclaredThrowableException.html      |    2 +-
 .../utility/UnrecognizedTimeZoneException.html     |    2 +-
 .../utility/UnsupportedNumberClassException.html   |    2 +-
 .../template/utility/WriteProtectable.html         |    2 +-
 .../api/freemarker/template/utility/XmlEscape.html |    2 +-
 .../template/utility/package-summary.html          |   10 +-
 .../freemarker/template/utility/package-tree.html  |    3 +-
 docs/api/help-doc.html                             |    2 +-
 docs/api/index-all.html                            |  430 ++------
 docs/api/index.html                                |   17 +-
 docs/api/member-search-index.js                    |    2 +-
 docs/api/overview-summary.html                     |    2 +-
 docs/api/overview-tree.html                        |   44 +-
 docs/api/package-search-index.js                   |    2 +-
 docs/api/serialized-form.html                      |   94 +-
 docs/api/type-search-index.js                      |    2 +-
 docs/app.html                                      |   18 +-
 docs/app_eccn.html                                 |   16 +-
 docs/app_faq.html                                  |   16 +-
 docs/app_install.html                              |   16 +-
 docs/app_legal.html                                |   16 +-
 docs/app_license.html                              |   16 +-
 docs/app_versions.html                             |   20 +-
 docs/detailed-toc.html                             |   72 +-
 docs/dgui.html                                     |   16 +-
 docs/dgui_datamodel.html                           |   16 +-
 docs/dgui_datamodel_basics.html                    |   16 +-
 docs/dgui_datamodel_types.html                     |   16 +-
 docs/dgui_misc.html                                |   16 +-
 docs/dgui_misc_alternativesyntax.html              |   16 +-
 docs/dgui_misc_autoescaping.html                   |   16 +-
 docs/dgui_misc_computer_vs_human_format.html       |   16 +-
 docs/dgui_misc_namespace.html                      |   16 +-
 docs/dgui_misc_userdefdir.html                     |   16 +-
 docs/dgui_misc_var.html                            |   16 +-
 docs/dgui_misc_whitespace.html                     |   16 +-
 docs/dgui_quickstart.html                          |   16 +-
 docs/dgui_quickstart_basics.html                   |   16 +-
 docs/dgui_quickstart_datamodel.html                |   16 +-
 docs/dgui_quickstart_template.html                 |   16 +-
 docs/dgui_template.html                            |   16 +-
 docs/dgui_template_directives.html                 |   16 +-
 docs/dgui_template_exp.html                        |   35 +-
 docs/dgui_template_overallstructure.html           |   16 +-
 docs/dgui_template_valueinsertion.html             |   16 +-
 docs/eclipse-toc.xml                               |    8 +
 docs/gloss.html                                    |   24 +-
 docs/index.html                                    |   20 +-
 docs/pagefind/fragment/en_06ec16c.pf_fragment      |  Bin 15069 -> 0 bytes
 docs/pagefind/fragment/en_10c0cc2.pf_fragment      |  Bin 405 -> 0 bytes
 docs/pagefind/fragment/en_1197f5c.pf_fragment      |  Bin 0 -> 7904 bytes
 docs/pagefind/fragment/en_12c5a82.pf_fragment      |  Bin 174 -> 0 bytes
 docs/pagefind/fragment/en_12ec1b1.pf_fragment      |  Bin 0 -> 770 bytes
 docs/pagefind/fragment/en_1423a3c.pf_fragment      |  Bin 723 -> 0 bytes
 docs/pagefind/fragment/en_15b2703.pf_fragment      |  Bin 677 -> 0 bytes
 docs/pagefind/fragment/en_17e3ed2.pf_fragment      |  Bin 2640 -> 0 bytes
 docs/pagefind/fragment/en_184cd39.pf_fragment      |  Bin 967 -> 0 bytes
 docs/pagefind/fragment/en_18de389.pf_fragment      |  Bin 0 -> 653 bytes
 docs/pagefind/fragment/en_1a85a45.pf_fragment      |  Bin 0 -> 379 bytes
 docs/pagefind/fragment/en_1b541d3.pf_fragment      |  Bin 0 -> 2164 bytes
 docs/pagefind/fragment/en_1cdeb52.pf_fragment      |  Bin 807 -> 0 bytes
 docs/pagefind/fragment/en_1d5fd4a.pf_fragment      |  Bin 895 -> 0 bytes
 docs/pagefind/fragment/en_1dc7813.pf_fragment      |  Bin 0 -> 2600 bytes
 docs/pagefind/fragment/en_1df4af1.pf_fragment      |  Bin 0 -> 1420 bytes
 docs/pagefind/fragment/en_2064f14.pf_fragment      |  Bin 0 -> 4747 bytes
 docs/pagefind/fragment/en_20a7bb6.pf_fragment      |  Bin 7207 -> 0 bytes
 docs/pagefind/fragment/en_21e21dd.pf_fragment      |  Bin 0 -> 807 bytes
 docs/pagefind/fragment/en_22cedb8.pf_fragment      |  Bin 1651 -> 0 bytes
 docs/pagefind/fragment/en_23a1e90.pf_fragment      |  Bin 0 -> 1029 bytes
 docs/pagefind/fragment/en_23e218c.pf_fragment      |  Bin 0 -> 1729 bytes
 docs/pagefind/fragment/en_281f30d.pf_fragment      |  Bin 0 -> 1652 bytes
 docs/pagefind/fragment/en_28d25ed.pf_fragment      |  Bin 843 -> 0 bytes
 docs/pagefind/fragment/en_294a9ee.pf_fragment      |  Bin 0 -> 929 bytes
 docs/pagefind/fragment/en_29f8251.pf_fragment      |  Bin 753 -> 0 bytes
 docs/pagefind/fragment/en_2a27dc3.pf_fragment      |  Bin 0 -> 7017 bytes
 docs/pagefind/fragment/en_2b22a77.pf_fragment      |  Bin 7015 -> 0 bytes
 docs/pagefind/fragment/en_2b6a12d.pf_fragment      |  Bin 688 -> 0 bytes
 docs/pagefind/fragment/en_2bb2d41.pf_fragment      |  Bin 1137 -> 0 bytes
 docs/pagefind/fragment/en_2cb5983.pf_fragment      |  Bin 0 -> 2395 bytes
 docs/pagefind/fragment/en_2ef4614.pf_fragment      |  Bin 0 -> 2127 bytes
 docs/pagefind/fragment/en_322fde8.pf_fragment      |  Bin 681 -> 0 bytes
 docs/pagefind/fragment/en_32c2bb7.pf_fragment      |  Bin 0 -> 966 bytes
 docs/pagefind/fragment/en_35d0dbc.pf_fragment      |  Bin 14982 -> 0 bytes
 docs/pagefind/fragment/en_3767db7.pf_fragment      |  Bin 0 -> 892 bytes
 docs/pagefind/fragment/en_38bfb03.pf_fragment      |  Bin 0 -> 942 bytes
 docs/pagefind/fragment/en_3a2c8b8.pf_fragment      |  Bin 791 -> 0 bytes
 docs/pagefind/fragment/en_3a5badc.pf_fragment      |  Bin 0 -> 722 bytes
 docs/pagefind/fragment/en_3b93304.pf_fragment      |  Bin 0 -> 5192 bytes
 docs/pagefind/fragment/en_3e11ad2.pf_fragment      |  Bin 0 -> 794 bytes
 docs/pagefind/fragment/en_404825f.pf_fragment      |  Bin 0 -> 1509 bytes
 docs/pagefind/fragment/en_431f6e6.pf_fragment      |  Bin 0 -> 515 bytes
 docs/pagefind/fragment/en_435615f.pf_fragment      |  Bin 406 -> 0 bytes
 docs/pagefind/fragment/en_44dadbd.pf_fragment      |  Bin 0 -> 3975 bytes
 ..._7d90bff.pf_fragment => en_45978a5.pf_fragment} |  Bin 1311 -> 1312 bytes
 docs/pagefind/fragment/en_45f4d43.pf_fragment      |  Bin 3087 -> 0 bytes
 docs/pagefind/fragment/en_463acbe.pf_fragment      |  Bin 184 -> 0 bytes
 docs/pagefind/fragment/en_48b9838.pf_fragment      |  Bin 2614 -> 0 bytes
 docs/pagefind/fragment/en_4ef1e52.pf_fragment      |  Bin 0 -> 401 bytes
 docs/pagefind/fragment/en_4f21ffa.pf_fragment      |  Bin 2164 -> 0 bytes
 docs/pagefind/fragment/en_5061108.pf_fragment      |  Bin 0 -> 959 bytes
 docs/pagefind/fragment/en_5075624.pf_fragment      |  Bin 0 -> 739 bytes
 docs/pagefind/fragment/en_511eea4.pf_fragment      |  Bin 0 -> 559 bytes
 docs/pagefind/fragment/en_5233f4a.pf_fragment      |  Bin 558 -> 0 bytes
 docs/pagefind/fragment/en_52685a7.pf_fragment      |  Bin 0 -> 3088 bytes
 docs/pagefind/fragment/en_553fe2c.pf_fragment      |  Bin 5228 -> 0 bytes
 docs/pagefind/fragment/en_55d35c5.pf_fragment      |  Bin 0 -> 11470 bytes
 ..._462271c.pf_fragment => en_59c8946.pf_fragment} |  Bin 3457 -> 3457 bytes
 docs/pagefind/fragment/en_5abae4a.pf_fragment      |  Bin 0 -> 1878 bytes
 docs/pagefind/fragment/en_5af71bf.pf_fragment      |  Bin 626 -> 0 bytes
 docs/pagefind/fragment/en_5b522e5.pf_fragment      |  Bin 928 -> 0 bytes
 docs/pagefind/fragment/en_5e624bd.pf_fragment      |  Bin 2127 -> 0 bytes
 docs/pagefind/fragment/en_60aa16e.pf_fragment      |  Bin 2097 -> 0 bytes
 docs/pagefind/fragment/en_6113f6d.pf_fragment      |  Bin 6316 -> 0 bytes
 docs/pagefind/fragment/en_618ef17.pf_fragment      |  Bin 0 -> 1691 bytes
 docs/pagefind/fragment/en_654b7ad.pf_fragment      |  Bin 401 -> 0 bytes
 docs/pagefind/fragment/en_65cf9cd.pf_fragment      |  Bin 0 -> 3287 bytes
 docs/pagefind/fragment/en_66c04c4.pf_fragment      |  Bin 0 -> 588 bytes
 docs/pagefind/fragment/en_6818c48.pf_fragment      |  Bin 0 -> 2611 bytes
 docs/pagefind/fragment/en_6a3c363.pf_fragment      |  Bin 0 -> 719 bytes
 docs/pagefind/fragment/en_6dba763.pf_fragment      |  Bin 378 -> 0 bytes
 docs/pagefind/fragment/en_723f681.pf_fragment      |  Bin 0 -> 892 bytes
 docs/pagefind/fragment/en_7335385.pf_fragment      |  Bin 566 -> 0 bytes
 docs/pagefind/fragment/en_73e55f9.pf_fragment      |  Bin 3774 -> 0 bytes
 docs/pagefind/fragment/en_77aeef4.pf_fragment      |  Bin 1728 -> 0 bytes
 docs/pagefind/fragment/en_7d20f97.pf_fragment      |  Bin 0 -> 753 bytes
 docs/pagefind/fragment/en_7dbcfdc.pf_fragment      |  Bin 0 -> 7219 bytes
 docs/pagefind/fragment/en_7dbfbc2.pf_fragment      |  Bin 0 -> 676 bytes
 docs/pagefind/fragment/en_81f6016.pf_fragment      |  Bin 0 -> 3423 bytes
 docs/pagefind/fragment/en_828646c.pf_fragment      |  Bin 772 -> 0 bytes
 docs/pagefind/fragment/en_82a5aca.pf_fragment      |  Bin 949 -> 0 bytes
 docs/pagefind/fragment/en_8521c16.pf_fragment      |  Bin 0 -> 772 bytes
 ..._d510fa9.pf_fragment => en_854227d.pf_fragment} |  Bin 9752 -> 9752 bytes
 docs/pagefind/fragment/en_86cd133.pf_fragment      |  Bin 0 -> 2610 bytes
 docs/pagefind/fragment/en_88807a2.pf_fragment      |  Bin 13794 -> 0 bytes
 docs/pagefind/fragment/en_88c2974.pf_fragment      |  Bin 1028 -> 0 bytes
 docs/pagefind/fragment/en_8a32d8c.pf_fragment      |  Bin 0 -> 497 bytes
 ..._41817f8.pf_fragment => en_8b3cb21.pf_fragment} |  Bin 5000 -> 5001 bytes
 docs/pagefind/fragment/en_8b9e6be.pf_fragment      |  Bin 0 -> 1754 bytes
 docs/pagefind/fragment/en_8cb7375.pf_fragment      |  Bin 0 -> 903 bytes
 docs/pagefind/fragment/en_8d5b67f.pf_fragment      |  Bin 4908 -> 0 bytes
 docs/pagefind/fragment/en_8d6193a.pf_fragment      |  Bin 0 -> 2920 bytes
 docs/pagefind/fragment/en_8dae74a.pf_fragment      |  Bin 0 -> 3820 bytes
 docs/pagefind/fragment/en_8e34eba.pf_fragment      |  Bin 0 -> 2096 bytes
 ..._c318374.pf_fragment => en_8ecb437.pf_fragment} |  Bin 433 -> 433 bytes
 docs/pagefind/fragment/en_90ef977.pf_fragment      |  Bin 1420 -> 0 bytes
 docs/pagefind/fragment/en_924044e.pf_fragment      |  Bin 0 -> 566 bytes
 docs/pagefind/fragment/en_94cbdd8.pf_fragment      |  Bin 0 -> 17464 bytes
 docs/pagefind/fragment/en_94d2d03.pf_fragment      |  Bin 0 -> 2907 bytes
 docs/pagefind/fragment/en_9559134.pf_fragment      |  Bin 891 -> 0 bytes
 docs/pagefind/fragment/en_989c306.pf_fragment      |  Bin 0 -> 1136 bytes
 docs/pagefind/fragment/en_99b7feb.pf_fragment      |  Bin 0 -> 625 bytes
 docs/pagefind/fragment/en_99f3485.pf_fragment      |  Bin 515 -> 0 bytes
 docs/pagefind/fragment/en_9d693a4.pf_fragment      |  Bin 4747 -> 0 bytes
 docs/pagefind/fragment/en_9d9f54e.pf_fragment      |  Bin 0 -> 1242 bytes
 docs/pagefind/fragment/en_9e7be4c.pf_fragment      |  Bin 0 -> 4162 bytes
 docs/pagefind/fragment/en_9f8223b.pf_fragment      |  Bin 1242 -> 0 bytes
 docs/pagefind/fragment/en_a027e73.pf_fragment      |  Bin 0 -> 887 bytes
 ..._28f92cd.pf_fragment => en_a0c51ed.pf_fragment} |  Bin 676 -> 676 bytes
 docs/pagefind/fragment/en_a0e4b65.pf_fragment      |  Bin 7904 -> 0 bytes
 docs/pagefind/fragment/en_a1d44a7.pf_fragment      |  Bin 3974 -> 0 bytes
 ..._39bbf97.pf_fragment => en_a1ea809.pf_fragment} |  Bin 995 -> 995 bytes
 docs/pagefind/fragment/en_a2c9138.pf_fragment      |  Bin 4161 -> 0 bytes
 docs/pagefind/fragment/en_a545138.pf_fragment      |  Bin 1855 -> 0 bytes
 docs/pagefind/fragment/en_a626433.pf_fragment      |  Bin 0 -> 340 bytes
 docs/pagefind/fragment/en_a9593ae.pf_fragment      |  Bin 0 -> 1466 bytes
 docs/pagefind/fragment/en_aa6ff38.pf_fragment      |  Bin 0 -> 680 bytes
 docs/pagefind/fragment/en_aaf8d74.pf_fragment      |  Bin 3286 -> 0 bytes
 docs/pagefind/fragment/en_ac0cd9c.pf_fragment      |  Bin 1732 -> 0 bytes
 docs/pagefind/fragment/en_ac51e5d.pf_fragment      |  Bin 771 -> 0 bytes
 docs/pagefind/fragment/en_ac716e9.pf_fragment      |  Bin 0 -> 845 bytes
 docs/pagefind/fragment/en_ad3919d.pf_fragment      |  Bin 2906 -> 0 bytes
 docs/pagefind/fragment/en_ae3839a.pf_fragment      |  Bin 0 -> 1152 bytes
 docs/pagefind/fragment/en_ae6e4a1.pf_fragment      |  Bin 0 -> 1408 bytes
 docs/pagefind/fragment/en_aeb5ef5.pf_fragment      |  Bin 0 -> 4948 bytes
 docs/pagefind/fragment/en_b072d5b.pf_fragment      |  Bin 0 -> 687 bytes
 ..._969dc6f.pf_fragment => en_b09ae67.pf_fragment} |  Bin 6024 -> 6024 bytes
 docs/pagefind/fragment/en_b121db5.pf_fragment      |  Bin 0 -> 1854 bytes
 docs/pagefind/fragment/en_b49a2e3.pf_fragment      |  Bin 0 -> 2075 bytes
 ..._fa852cd.pf_fragment => en_b5eae9d.pf_fragment} |  Bin 1537 -> 1537 bytes
 docs/pagefind/fragment/en_b5fa8a8.pf_fragment      |  Bin 586 -> 0 bytes
 docs/pagefind/fragment/en_b623a21.pf_fragment      |  Bin 5191 -> 0 bytes
 docs/pagefind/fragment/en_b7c3736.pf_fragment      |  Bin 0 -> 2641 bytes
 docs/pagefind/fragment/en_bdf4514.pf_fragment      |  Bin 719 -> 0 bytes
 docs/pagefind/fragment/en_be532b3.pf_fragment      |  Bin 2601 -> 0 bytes
 docs/pagefind/fragment/en_bf5f779.pf_fragment      |  Bin 1153 -> 0 bytes
 docs/pagefind/fragment/en_bfa631f.pf_fragment      |  Bin 4098 -> 0 bytes
 docs/pagefind/fragment/en_c0fa71e.pf_fragment      |  Bin 2074 -> 0 bytes
 docs/pagefind/fragment/en_c289cbf.pf_fragment      |  Bin 0 -> 13795 bytes
 docs/pagefind/fragment/en_c2c1e18.pf_fragment      |  Bin 900 -> 0 bytes
 docs/pagefind/fragment/en_c35f578.pf_fragment      |  Bin 0 -> 3772 bytes
 ..._93f3c35.pf_fragment => en_c414b7d.pf_fragment} |  Bin 2735 -> 2735 bytes
 docs/pagefind/fragment/en_c5e91dc.pf_fragment      |  Bin 2611 -> 0 bytes
 ..._95fdb01.pf_fragment => en_c628a1e.pf_fragment} |  Bin 435 -> 435 bytes
 docs/pagefind/fragment/en_c71a7b6.pf_fragment      |  Bin 1465 -> 0 bytes
 docs/pagefind/fragment/en_c80c4f3.pf_fragment      |  Bin 0 -> 1762 bytes
 docs/pagefind/fragment/en_cb975fc.pf_fragment      |  Bin 1692 -> 0 bytes
 docs/pagefind/fragment/en_cf35dd6.pf_fragment      |  Bin 0 -> 1898 bytes
 docs/pagefind/fragment/en_d11dee1.pf_fragment      |  Bin 0 -> 580 bytes
 docs/pagefind/fragment/en_d1f4ee9.pf_fragment      |  Bin 0 -> 184 bytes
 docs/pagefind/fragment/en_d21ba28.pf_fragment      |  Bin 0 -> 15299 bytes
 docs/pagefind/fragment/en_d2f3d54.pf_fragment      |  Bin 0 -> 1087 bytes
 docs/pagefind/fragment/en_d51cf06.pf_fragment      |  Bin 2397 -> 0 bytes
 docs/pagefind/fragment/en_d549252.pf_fragment      |  Bin 3423 -> 0 bytes
 docs/pagefind/fragment/en_d622852.pf_fragment      |  Bin 0 -> 174 bytes
 ..._18809e2.pf_fragment => en_d7c116f.pf_fragment} |  Bin 2437 -> 2436 bytes
 docs/pagefind/fragment/en_da8ff2e.pf_fragment      |  Bin 497 -> 0 bytes
 docs/pagefind/fragment/en_daa93a4.pf_fragment      |  Bin 11473 -> 0 bytes
 docs/pagefind/fragment/en_dd138be.pf_fragment      |  Bin 0 -> 6314 bytes
 docs/pagefind/fragment/en_dd91757.pf_fragment      |  Bin 339 -> 0 bytes
 docs/pagefind/fragment/en_dfaae9e.pf_fragment      |  Bin 0 -> 5227 bytes
 docs/pagefind/fragment/en_dfd7b1d.pf_fragment      |  Bin 1408 -> 0 bytes
 docs/pagefind/fragment/en_e1c6b31.pf_fragment      |  Bin 387 -> 0 bytes
 docs/pagefind/fragment/en_e5895cb.pf_fragment      |  Bin 0 -> 949 bytes
 docs/pagefind/fragment/en_e96ab6c.pf_fragment      |  Bin 0 -> 1871 bytes
 docs/pagefind/fragment/en_eaef33c.pf_fragment      |  Bin 960 -> 0 bytes
 docs/pagefind/fragment/en_ebf1f5b.pf_fragment      |  Bin 738 -> 0 bytes
 docs/pagefind/fragment/en_ec26ee7.pf_fragment      |  Bin 889 -> 0 bytes
 docs/pagefind/fragment/en_edc1df1.pf_fragment      |  Bin 1074 -> 0 bytes
 docs/pagefind/fragment/en_ee5b93d.pf_fragment      |  Bin 2920 -> 0 bytes
 docs/pagefind/fragment/en_f03c665.pf_fragment      |  Bin 580 -> 0 bytes
 docs/pagefind/fragment/en_f1a88b2.pf_fragment      |  Bin 652 -> 0 bytes
 docs/pagefind/fragment/en_f1ef72e.pf_fragment      |  Bin 3820 -> 0 bytes
 docs/pagefind/fragment/en_f22ae36.pf_fragment      |  Bin 0 -> 405 bytes
 docs/pagefind/fragment/en_f408bf9.pf_fragment      |  Bin 1753 -> 0 bytes
 docs/pagefind/fragment/en_f47f1bf.pf_fragment      |  Bin 0 -> 1732 bytes
 docs/pagefind/fragment/en_f823093.pf_fragment      |  Bin 0 -> 385 bytes
 docs/pagefind/fragment/en_f98d892.pf_fragment      |  Bin 1761 -> 0 bytes
 docs/pagefind/fragment/en_fa14bd9.pf_fragment      |  Bin 0 -> 4098 bytes
 docs/pagefind/fragment/en_fbb84d1.pf_fragment      |  Bin 0 -> 404 bytes
 docs/pagefind/fragment/en_fc13c3a.pf_fragment      |  Bin 944 -> 0 bytes
 docs/pagefind/fragment/en_fd76b62.pf_fragment      |  Bin 1900 -> 0 bytes
 docs/pagefind/index/en_137cc7f.pf_index            |  Bin 39365 -> 0 bytes
 docs/pagefind/index/en_13bd9b7.pf_index            |  Bin 0 -> 7799 bytes
 docs/pagefind/index/en_16d09f7.pf_index            |  Bin 38531 -> 0 bytes
 docs/pagefind/index/en_1cf891c.pf_index            |  Bin 0 -> 37960 bytes
 docs/pagefind/index/en_2155387.pf_index            |  Bin 0 -> 38977 bytes
 docs/pagefind/index/en_243e5d1.pf_index            |  Bin 0 -> 38541 bytes
 docs/pagefind/index/en_30c23a6.pf_index            |  Bin 38323 -> 0 bytes
 docs/pagefind/index/en_32eda93.pf_index            |  Bin 35219 -> 0 bytes
 docs/pagefind/index/en_3364a7e.pf_index            |  Bin 0 -> 38791 bytes
 docs/pagefind/index/en_34649b9.pf_index            |  Bin 0 -> 37252 bytes
 docs/pagefind/index/en_3a9c221.pf_index            |  Bin 0 -> 38868 bytes
 docs/pagefind/index/en_40286c3.pf_index            |  Bin 38379 -> 0 bytes
 docs/pagefind/index/en_43a36d3.pf_index            |  Bin 0 -> 38868 bytes
 docs/pagefind/index/en_46c51cc.pf_index            |  Bin 38306 -> 0 bytes
 docs/pagefind/index/en_511f372.pf_index            |  Bin 39132 -> 0 bytes
 docs/pagefind/index/en_5ee4218.pf_index            |  Bin 37947 -> 0 bytes
 docs/pagefind/index/en_6865c78.pf_index            |  Bin 0 -> 38541 bytes
 docs/pagefind/index/en_6ab21e3.pf_index            |  Bin 43949 -> 0 bytes
 docs/pagefind/index/en_77bccac.pf_index            |  Bin 0 -> 40080 bytes
 docs/pagefind/index/en_78c998f.pf_index            |  Bin 0 -> 37963 bytes
 docs/pagefind/index/en_79fb8ac.pf_index            |  Bin 0 -> 38620 bytes
 docs/pagefind/index/en_7c7a252.pf_index            |  Bin 0 -> 39206 bytes
 docs/pagefind/index/en_837aad7.pf_index            |  Bin 0 -> 38405 bytes
 docs/pagefind/index/en_919bade.pf_index            |  Bin 0 -> 37255 bytes
 docs/pagefind/index/en_91f2d13.pf_index            |  Bin 0 -> 7799 bytes
 docs/pagefind/index/en_9c866e5.pf_index            |  Bin 38710 -> 0 bytes
 docs/pagefind/index/en_9c9436f.pf_index            |  Bin 0 -> 38792 bytes
 docs/pagefind/index/en_a55949c.pf_index            |  Bin 38575 -> 0 bytes
 docs/pagefind/index/en_a672afe.pf_index            |  Bin 0 -> 38405 bytes
 docs/pagefind/index/en_af292f4.pf_index            |  Bin 0 -> 39714 bytes
 docs/pagefind/index/en_b1b29c6.pf_index            |  Bin 38720 -> 0 bytes
 docs/pagefind/index/en_b45cf46.pf_index            |  Bin 0 -> 38727 bytes
 docs/pagefind/index/en_c282681.pf_index            |  Bin 0 -> 38481 bytes
 docs/pagefind/index/en_c7cf126.pf_index            |  Bin 0 -> 38535 bytes
 docs/pagefind/index/en_cc67104.pf_index            |  Bin 0 -> 38626 bytes
 docs/pagefind/index/en_ce28b25.pf_index            |  Bin 0 -> 38982 bytes
 docs/pagefind/index/en_cf8ea5d.pf_index            |  Bin 0 -> 38539 bytes
 docs/pagefind/index/en_d27aa3e.pf_index            |  Bin 38372 -> 0 bytes
 docs/pagefind/index/en_ddc91b9.pf_index            |  Bin 0 -> 38472 bytes
 docs/pagefind/index/en_e2eb1c3.pf_index            |  Bin 37112 -> 0 bytes
 docs/pagefind/index/en_e73e284.pf_index            |  Bin 0 -> 39202 bytes
 docs/pagefind/index/en_eb8769b.pf_index            |  Bin 0 -> 40080 bytes
 docs/pagefind/index/en_f77057f.pf_index            |  Bin 0 -> 38732 bytes
 docs/pagefind/index/en_fa90781.pf_index            |  Bin 0 -> 39713 bytes
 docs/pagefind/pagefind-entry.json                  |    2 +-
 docs/pagefind/pagefind.en_25972db774.pf_meta       |  Bin 0 -> 1723 bytes
 docs/pagefind/pagefind.en_8433ea3c42.pf_meta       |  Bin 0 -> 1725 bytes
 docs/pagefind/pagefind.en_d92da49bba.pf_meta       |  Bin 1706 -> 0 bytes
 docs/pgui.html                                     |   18 +-
 docs/pgui_config.html                              |   16 +-
 docs/pgui_config_basics.html                       |   16 +-
 docs/pgui_config_custom_formats.html               |   16 +-
 docs/pgui_config_errorhandling.html                |   16 +-
 docs/pgui_config_incompatible_improvements.html    |   24 +-
 docs/pgui_config_outputformatsautoesc.html         |   16 +-
 docs/pgui_config_settings.html                     |   16 +-
 docs/pgui_config_sharedvariables.html              |   16 +-
 docs/pgui_config_templateconfigurations.html       |   16 +-
 docs/pgui_config_templateloading.html              |   16 +-
 docs/pgui_datamodel.html                           |   16 +-
 docs/pgui_datamodel_basics.html                    |   16 +-
 docs/pgui_datamodel_directive.html                 |   16 +-
 docs/pgui_datamodel_method.html                    |   16 +-
 docs/pgui_datamodel_node.html                      |   16 +-
 docs/pgui_datamodel_objectWrapper.html             |   16 +-
 docs/pgui_datamodel_parent.html                    |   16 +-
 docs/pgui_datamodel_scalar.html                    |   16 +-
 docs/pgui_misc.html                                |   18 +-
 docs/pgui_misc_ant.html                            |   16 +-
 docs/pgui_misc_beanwrapper.html                    |   20 +-
 docs/pgui_misc_charset.html                        |   16 +-
 ...ecureenv.html => pgui_misc_graalvm_native.html} |  169 ++-
 docs/pgui_misc_jythonwrapper.html                  |   16 +-
 docs/pgui_misc_logging.html                        |   20 +-
 docs/pgui_misc_multithreading.html                 |   16 +-
 docs/pgui_misc_secureenv.html                      |   16 +-
 docs/pgui_misc_servlet.html                        |   26 +-
 docs/pgui_misc_var.html                            |   16 +-
 docs/pgui_misc_xml_legacy.html                     |   16 +-
 docs/pgui_quickstart.html                          |   16 +-
 docs/pgui_quickstart_all.html                      |   16 +-
 docs/pgui_quickstart_createconfiguration.html      |   20 +-
 docs/pgui_quickstart_createdatamodel.html          |   16 +-
 docs/pgui_quickstart_gettemplate.html              |   16 +-
 docs/pgui_quickstart_merge.html                    |   16 +-
 docs/ref.html                                      |   16 +-
 docs/ref_builtins.html                             |   16 +-
 docs/ref_builtins_alphaidx.html                    |   32 +-
 docs/ref_builtins_boolean.html                     |   16 +-
 docs/ref_builtins_date.html                        |   16 +-
 docs/ref_builtins_expert.html                      |   16 +-
 docs/ref_builtins_hash.html                        |   16 +-
 docs/ref_builtins_loop_var.html                    |   16 +-
 docs/ref_builtins_node.html                        |   16 +-
 docs/ref_builtins_number.html                      |   16 +-
 docs/ref_builtins_sequence.html                    |   16 +-
 docs/ref_builtins_string.html                      |  511 ++++++++-
 docs/ref_builtins_type_independent.html            |   16 +-
 docs/ref_depr_builtin.html                         |   16 +-
 docs/ref_depr_directive.html                       |   16 +-
 docs/ref_depr_numerical_interpolation.html         |   22 +-
 docs/ref_depr_oldmacro.html                        |   22 +-
 docs/ref_depr_oldsyntax.html                       |   16 +-
 docs/ref_depr_transform.html                       |   22 +-
 docs/ref_deprecated.html                           |   16 +-
 docs/ref_directive_alphaidx.html                   |   16 +-
 docs/ref_directive_assign.html                     |   22 +-
 docs/ref_directive_attempt.html                    |   22 +-
 docs/ref_directive_autoesc.html                    |   22 +-
 docs/ref_directive_compress.html                   |   22 +-
 docs/ref_directive_escape.html                     |   22 +-
 docs/ref_directive_flush.html                      |   22 +-
 docs/ref_directive_ftl.html                        |   22 +-
 docs/ref_directive_function.html                   |   22 +-
 docs/ref_directive_global.html                     |   22 +-
 docs/ref_directive_if.html                         |   22 +-
 docs/ref_directive_import.html                     |   22 +-
 docs/ref_directive_include.html                    |   22 +-
 docs/ref_directive_list.html                       |   26 +-
 docs/ref_directive_local.html                      |   22 +-
 docs/ref_directive_macro.html                      |   26 +-
 docs/ref_directive_noautoesc.html                  |   22 +-
 docs/ref_directive_noparse.html                    |   22 +-
 docs/ref_directive_nt.html                         |   22 +-
 docs/ref_directive_outputformat.html               |   22 +-
 docs/ref_directive_setting.html                    |   22 +-
 docs/ref_directive_stop.html                       |   22 +-
 docs/ref_directive_switch.html                     |   22 +-
 docs/ref_directive_t.html                          |   22 +-
 docs/ref_directive_userDefined.html                |   22 +-
 docs/ref_directive_visit.html                      |   28 +-
 docs/ref_directives.html                           |   16 +-
 docs/ref_reservednames.html                        |   16 +-
 docs/ref_specvar.html                              |   16 +-
 docs/search-results.html                           |   66 --
 docs/sitemap.xml                                   |    6 +
 docs/toc.js                                        |  533 ++++++----
 docs/versions_2_0.html                             |   26 +-
 docs/versions_2_01.html                            |   16 +-
 docs/versions_2_0RC1.html                          |   26 +-
 docs/versions_2_0RC2.html                          |   22 +-
 docs/versions_2_0RC3.html                          |   24 +-
 docs/versions_2_1.html                             |   26 +-
 docs/versions_2_1_1.html                           |   22 +-
 docs/versions_2_1_2.html                           |   22 +-
 docs/versions_2_1_3.html                           |   22 +-
 docs/versions_2_1_4.html                           |   18 +-
 docs/versions_2_1_5.html                           |   18 +-
 docs/versions_2_2.html                             |   36 +-
 docs/versions_2_2_1.html                           |   22 +-
 docs/versions_2_2_2.html                           |   18 +-
 docs/versions_2_2_3.html                           |   22 +-
 docs/versions_2_2_4.html                           |   22 +-
 docs/versions_2_2_5.html                           |   18 +-
 docs/versions_2_2_6.html                           |   24 +-
 docs/versions_2_2_7.html                           |   18 +-
 docs/versions_2_2_8.html                           |   24 +-
 docs/versions_2_3.html                             |  106 +-
 docs/versions_2_3_1.html                           |   30 +-
 docs/versions_2_3_10.html                          |   22 +-
 docs/versions_2_3_11.html                          |   24 +-
 docs/versions_2_3_12.html                          |   18 +-
 docs/versions_2_3_13.html                          |   22 +-
 docs/versions_2_3_14.html                          |   22 +-
 docs/versions_2_3_15.html                          |   22 +-
 docs/versions_2_3_16.html                          |   22 +-
 docs/versions_2_3_17.html                          |   24 +-
 docs/versions_2_3_18.html                          |   22 +-
 docs/versions_2_3_19.html                          |   22 +-
 docs/versions_2_3_2.html                           |   18 +-
 docs/versions_2_3_20.html                          |   24 +-
 docs/versions_2_3_21.html                          |   24 +-
 docs/versions_2_3_22.html                          |   24 +-
 docs/versions_2_3_23.html                          |   26 +-
 docs/versions_2_3_24.html                          |   26 +-
 docs/versions_2_3_25.html                          |   22 +-
 docs/versions_2_3_26.html                          |   24 +-
 docs/versions_2_3_27.html                          |   22 +-
 docs/versions_2_3_28.html                          |   24 +-
 docs/versions_2_3_29.html                          |   22 +-
 docs/versions_2_3_3.html                           |   24 +-
 docs/versions_2_3_30.html                          |   22 +-
 docs/versions_2_3_31.html                          |   22 +-
 docs/versions_2_3_32.html                          |   22 +-
 docs/versions_2_3_33.html                          |   20 +-
 docs/versions_2_3_34.html                          |   26 +-
 docs/versions_2_3_35.html                          |  219 ++++
 docs/versions_2_3_4.html                           |   24 +-
 docs/versions_2_3_5.html                           |   22 +-
 docs/versions_2_3_6.html                           |   18 +-
 docs/versions_2_3_7.html                           |   22 +-
 docs/versions_2_3_7rc1.html                        |   22 +-
 docs/versions_2_3_8.html                           |   18 +-
 docs/versions_2_3_9.html                           |   18 +-
 docs/xgui.html                                     |   16 +-
 docs/xgui_declarative.html                         |   16 +-
 docs/xgui_declarative_basics.html                  |   16 +-
 docs/xgui_declarative_details.html                 |   24 +-
 docs/xgui_expose.html                              |   16 +-
 docs/xgui_expose_dom.html                          |   16 +-
 docs/xgui_expose_put.html                          |   16 +-
 docs/xgui_imperative.html                          |   16 +-
 docs/xgui_imperative_formal.html                   |   18 +-
 docs/xgui_imperative_learn.html                    |   28 +-
 docs/xgui_preface.html                             |   16 +-
 editors.html                                       |   10 +-
 file-to-file-transformer-tools.html                |   10 +-
 freemarkerdownload.html                            |   44 +-
 history.html                                       |   10 +-
 index.html                                         |   10 +-
 mailing-lists.html                                 |   10 +-
 poweredBy.html                                     |   10 +-
 report-security-vulnerabilities.html               |   10 +-
 sourcecode.html                                    |   10 +-
 802 files changed, 5832 insertions(+), 8526 deletions(-)

diff --git a/committer-howto.html b/committer-howto.html
index 445be16b..2571bb9d 100644
--- a/committer-howto.html
+++ b/committer-howto.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/committer-howto.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto:500,700,400,300|Droid+Sans+Mono">
-<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1750604253653">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1787951628644">
 <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/cookie-bar/cookiebar-latest.min.js"></script>
 </head>
 <body itemscope itemtype="https://schema.org/Code">
@@ -34,8 +34,8 @@
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left" data-pagefind-ignore="all">
       <script>var breadcrumb = ["Apache FreeMarker®","Community","Committer how-to"];</script>
-      <script src="toc.js?1750604253653"></script>
-      <script src="docgen-resources/main.min.js?1750604253653"></script>
+      <script src="toc.js?1787951628644"></script>
+      <script src="docgen-resources/main.min.js?1787951628644"></script>
       <div class="side-toc-logos">
           <div class="side-toc-logo">
             <a href="https://www.apache.org/events/current-event.html" target="_blank"><img src="https://www.apache.org/events/current-event-234x60.png" alt="Apache Incubator" /></a>
@@ -726,7 +726,7 @@
     </div>
 <div class="site-footer" data-pagefind-ignore="all"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="index.html">What is FreeMarker?</a></li><li><a href="freemarkerdownload.html">Download</a></li><li><a href="docs/app_versions.html">Version history</a></li><li><a href="docs/app_faq.html">FAQ</a></li><li><a itemprop="license" href="docs/app_license.html">License</a></li><li><a href="ht [...]
 Last generated:
-<time itemprop="dateModified" datetime="2026-08-27T07:58:05Z" title="Thursday, August 27, 2026, 7:58:05 AM Greenwich Mean Time">2026-08-27 07:58:05 GMT</time> </p>
+<time itemprop="dateModified" datetime="2026-08-28T21:13:48Z" title="Friday, August 28, 2026, 9:13:48 PM Greenwich Mean Time">2026-08-28 21:13:48 GMT</time> </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2026
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache, the Apache feather logo, and the Apache FreeMarker project logo are trademarks or registered trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/contribute.html b/contribute.html
index 329d53b8..06c49e69 100644
--- a/contribute.html
+++ b/contribute.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/contribute.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto:500,700,400,300|Droid+Sans+Mono">
-<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1750604253653">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1787951628644">
 <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/cookie-bar/cookiebar-latest.min.js"></script>
 </head>
 <body itemscope itemtype="https://schema.org/Code">
@@ -34,8 +34,8 @@
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left" data-pagefind-ignore="all">
       <script>var breadcrumb = ["Apache FreeMarker®","Community","Contributors wanted!"];</script>
-      <script src="toc.js?1750604253653"></script>
-      <script src="docgen-resources/main.min.js?1750604253653"></script>
+      <script src="toc.js?1787951628644"></script>
+      <script src="docgen-resources/main.min.js?1787951628644"></script>
       <div class="side-toc-logos">
           <div class="side-toc-logo">
             <a href="https://www.apache.org/events/current-event.html" target="_blank"><img src="https://www.apache.org/events/current-event-234x60.png" alt="Apache Incubator" /></a>
@@ -229,9 +229,9 @@
     </div>
 <div class="site-footer" data-pagefind-ignore="all"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="index.html">What is FreeMarker?</a></li><li><a href="freemarkerdownload.html">Download</a></li><li><a href="docs/app_versions.html">Version history</a></li><li><a href="docs/app_faq.html">FAQ</a></li><li><a itemprop="license" href="docs/app_license.html">License</a></li><li><a href="ht [...]
 Last generated:
-<time itemprop="dateModified" datetime="2025-06-22T14:57:33Z" title="Sunday, June 22, 2025 at 2:57:33 PM Greenwich Mean Time">2025-06-22 14:57:33 GMT</time> </p>
+<time itemprop="dateModified" datetime="2026-08-28T21:13:48Z" title="Friday, August 28, 2026, 9:13:48 PM Greenwich Mean Time">2026-08-28 21:13:48 GMT</time> </p>
 <p class="copyright">
-© <span itemprop="copyrightYear">1999</span>–2025
+© <span itemprop="copyrightYear">1999</span>–2026
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache, the Apache feather logo, and the Apache FreeMarker project logo are trademarks or registered trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
 </div></div></div></body>
 </html>
diff --git a/docs/alphaidx.html b/docs/alphaidx.html
index 5faccf98..f883d3ad 100644
--- a/docs/alphaidx.html
+++ b/docs/alphaidx.html
@@ -15,10 +15,10 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/alphaidx.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto:500,700,400,300|Droid+Sans+Mono">
-<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1750604679962">
-<link href="pagefind/pagefind-ui.css?1750604679962" rel="stylesheet">
-<script src="pagefind/pagefind-ui.js?1750604679962"></script>
-<script src="docgen-resources/js/pagefind.js?1750604679962"></script>
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1787950671176">
+<link href="pagefind/pagefind-ui.css?1787950671176" rel="stylesheet">
+<script src="pagefind/pagefind-ui.js?1787950671176"></script>
+<script src="docgen-resources/js/pagefind.js?1787950671176"></script>
 </head>
 <body itemscope itemtype="https://schema.org/Code">
     <meta itemprop="url" content="https://freemarker.apache.org/docs/">
@@ -46,8 +46,8 @@
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left" data-pagefind-ignore="all">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Alphabetical Index"];</script>
-      <script src="toc.js?1750604679962"></script>
-      <script src="docgen-resources/main.min.js?1750604679962"></script>
+      <script src="toc.js?1787950671176"></script>
+      <script src="docgen-resources/main.min.js?1787950671176"></script>
   </div>
 <div class="col-right"><div class="page-content" data-pagefind-body data-pagefind-weight="0.25"><div class="page-title"><div class="pagers top" data-pagefind-ignore="all"><a class="paging-arrow previous" href="gloss.html"><span>Previous</span></a><span class="paging-arrow disabled next"><span>Next</span></span></div><div class="title-wrapper">
 <h1 class="content-header header-part" id="alphaidx" itemprop="headline">Alphabetical Index</h1>
@@ -192,7 +192,7 @@
         <dt>the FTL value type, <a href="dgui_datamodel_types.html#dgui_datamodel_scalar">Scalars</a></dt>
       </dl></dd>
     <dt>
-      boolean_format,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_121">setting</a>
+      boolean_format,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_124">setting</a>
     </dt>
     <dt>
       boolean built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_boolean">boolean</a>
@@ -215,7 +215,7 @@
 <h2 class="indexLabel">C</h2>
 <dl>
     <dt>
-      c_format,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_121">setting</a>
+      c_format,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_124">setting</a>
     </dt>
     <dt>
       c_lower_case built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_c_lower_case">c_lower_case</a>
@@ -242,7 +242,7 @@
       case directive,&nbsp;&nbsp;<a href="ref_directive_switch.html">switch, on, case, default, break</a>
     </dt>
     <dt>
-      catch-all parameter,&nbsp;&nbsp;<a href="ref_directive_macro.html#autoid_108">macro, nested, return</a>
+      catch-all parameter,&nbsp;&nbsp;<a href="ref_directive_macro.html#autoid_111">macro, nested, return</a>
     </dt>
     <dt>
       c built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_c_string">c (for string value)</a>,
@@ -269,7 +269,7 @@
       chunk built-in,&nbsp;&nbsp;<a href="ref_builtins_sequence.html#ref_builtin_chunk">chunk</a>
     </dt>
     <dt>
-      classic_compatible,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_121">setting</a>
+      classic_compatible,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_124">setting</a>
     </dt>
     <dt>
       cn built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_cn_string">cn (for string value)</a>,
@@ -436,6 +436,9 @@
     <dt>
       date to string,&nbsp;&nbsp;<a href="ref_builtins_date.html#ref_builtin_string_for_date">string (when used with a date/time/date-time value)</a>
     </dt>
+    <dt>
+      dedent built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_dedent">dedent</a>
+    </dt>
     <dt>
       default built-in,&nbsp;&nbsp;<a href="ref_depr_builtin.html">List of deprecated built-ins</a>
     </dt>
@@ -597,7 +600,7 @@
     <dt>
       format    </dt>
       <dd><dl>
-        <dt>boolean, <a href="ref_builtins_boolean.html#ref_builtin_c_boolean">c (for boolean value)</a>, <a href="ref_builtins_boolean.html#ref_builtin_cn_boolean">cn (for boolean value)</a>, <a href="ref_builtins_boolean.html#ref_builtin_string_for_boolean">string (when used with a boolean value)</a>, <a href="ref_directive_setting.html#autoid_121">setting</a></dt>
+        <dt>boolean, <a href="ref_builtins_boolean.html#ref_builtin_c_boolean">c (for boolean value)</a>, <a href="ref_builtins_boolean.html#ref_builtin_cn_boolean">cn (for boolean value)</a>, <a href="ref_builtins_boolean.html#ref_builtin_string_for_boolean">string (when used with a boolean value)</a>, <a href="ref_directive_setting.html#autoid_124">setting</a></dt>
         <dt>date, <a href="ref_builtins_date.html#ref_builtin_string_for_date">string (when used with a date/time/date-time value)</a>, <a href="ref_directive_setting.html#topic_date_format_settings">setting</a></dt>
         <dt>date-time, <a href="ref_builtins_date.html#ref_builtin_string_for_date">string (when used with a date/time/date-time value)</a></dt>
         <dt>number, <a href="ref_builtins_number.html#ref_builtin_c">c (for numbers)</a>, <a href="ref_builtins_number.html#ref_builtin_cn">cn (for numbers)</a>, <a href="ref_builtins_number.html#ref_builtin_string_for_number">string (when used with a numerical value)</a>, <a href="ref_directive_setting.html#ref.setting.number_format">setting</a></dt>
@@ -726,6 +729,13 @@
     <dt>
       incomplatible_improvements,&nbsp;&nbsp;<a href="ref_specvar.html">Special Variable Reference</a>
     </dt>
+    <dt>
+      indentation,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_dedent">dedent</a>,
+<a href="ref_builtins_string.html#ref_builtin_indent">indent</a>
+    </dt>
+    <dt>
+      indent built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_indent">indent</a>
+    </dt>
     <dt>
       index_of built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_index_of">index_of</a>
     </dt>
@@ -821,7 +831,7 @@
       Jakarta,&nbsp;&nbsp;<a href="pgui_misc_servlet.html">Using FreeMarker with servlets</a>
     </dt>
     <dt>
-      JDBC time zone,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_121">setting</a>
+      JDBC time zone,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_124">setting</a>
     </dt>
     <dt>
       join built-in,&nbsp;&nbsp;<a href="ref_builtins_sequence.html#ref_builtin_join">join</a>
@@ -910,6 +920,9 @@
     <dt>
       license,&nbsp;&nbsp;<a href="app_license.html">License</a>
     </dt>
+    <dt>
+      lines built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_lines">lines</a>
+    </dt>
     <dt>
       list directive,&nbsp;&nbsp;<a href="ref_directive_list.html">list, else, items, sep, break, continue</a>
     </dt>
@@ -930,7 +943,7 @@
       local directive,&nbsp;&nbsp;<a href="ref_directive_local.html">local</a>
     </dt>
     <dt>
-      locale,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_121">setting</a>,
+      locale,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_124">setting</a>,
 <a href="ref_specvar.html">Special Variable Reference</a>
     </dt>
     <dt>
@@ -1181,7 +1194,7 @@
         <dt>generate with Java, <a href="pgui_quickstart_merge.html">Merging the template with the data-model</a></dt>
       </dl></dd>
     <dt>
-      output_encoding,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_121">setting</a>
+      output_encoding,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_124">setting</a>
     </dt>
     <dt>
       output_format,&nbsp;&nbsp;<a href="ref_specvar.html">Special Variable Reference</a>
@@ -1569,8 +1582,8 @@
       time_format,&nbsp;&nbsp;<a href="ref_directive_setting.html#topic_date_format_settings">setting</a>
     </dt>
     <dt>
-      time_zone,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_121">setting</a>,
-<a href="ref_directive_setting.html#autoid_121">setting</a>,
+      time_zone,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_124">setting</a>,
+<a href="ref_directive_setting.html#autoid_124">setting</a>,
 <a href="ref_specvar.html">Special Variable Reference</a>
     </dt>
     <dt>
@@ -1669,7 +1682,7 @@
     </dt>
     <dt>
       url_escaping_charset,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_url">url</a>,
-<a href="ref_directive_setting.html#autoid_121">setting</a>
+<a href="ref_directive_setting.html#autoid_124">setting</a>
     </dt>
     <dt>
       url_path built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_url_path">url_path</a>
@@ -1711,7 +1724,7 @@
       variable,&nbsp;&nbsp;<a href="dgui_misc_var.html">Defining variables in the template</a>
     </dt>
     <dt>
-      variable number of parameters,&nbsp;&nbsp;<a href="ref_directive_macro.html#autoid_108">macro, nested, return</a>
+      variable number of parameters,&nbsp;&nbsp;<a href="ref_directive_macro.html#autoid_111">macro, nested, return</a>
     </dt>
     <dt>
       variables,&nbsp;&nbsp;<a href="pgui_misc_var.html">Variables, scopes</a>
@@ -1753,6 +1766,12 @@
     <dt>
       word_list built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_word_list">word_list</a>
     </dt>
+    <dt>
+      word wrapping,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_wrap">wrap</a>
+    </dt>
+    <dt>
+      wrap built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_wrap">wrap</a>
+    </dt>
     <dt>
       wrapper,&nbsp;&nbsp;<a href="pgui_datamodel_basics.html">Basics</a>,
 <a href="pgui_datamodel_objectWrapper.html">Object wrappers</a>
@@ -1791,12 +1810,12 @@
     <dt>
       XML namespace    </dt>
       <dd><dl>
-        <dt>in imperative processing, <a href="xgui_imperative_learn.html#autoid_144">Basics</a></dt>
+        <dt>in imperative processing, <a href="xgui_imperative_learn.html#autoid_147">Basics</a></dt>
       </dl></dd>
     <dt>
       XML namespaces    </dt>
       <dd><dl>
-        <dt>in declarative processing, <a href="xgui_declarative_details.html#autoid_149">Details</a></dt>
+        <dt>in declarative processing, <a href="xgui_declarative_details.html#autoid_152">Details</a></dt>
       </dl></dd>
     <dt>
       XML Schema date parsing,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_string_date">date, time, datetime</a>
@@ -1821,9 +1840,9 @@
     </div>
 <div class="site-footer" data-pagefind-ignore="all"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="app_faq.html">FAQ</a></li><li><a itemprop="license" href="app_license.ht [...]
 Last generated:
-<time itemprop="dateModified" datetime="2025-06-22T15:04:39Z" title="Sunday, June 22, 2025 at 3:04:39 PM Greenwich Mean Time">2025-06-22 15:04:39 GMT</time>, for Freemarker 2.3.34 </p>
+<time itemprop="dateModified" datetime="2026-08-28T20:57:51Z" title="Friday, August 28, 2026 at 8:57:51 PM Greenwich Mean Time">2026-08-28 20:57:51 GMT</time>, for Freemarker 2.3.35 </p>
 <p class="copyright">
-© <span itemprop="copyrightYear">1999</span>–2025
+© <span itemprop="copyrightYear">1999</span>–2026
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache, the Apache feather logo, and the Apache FreeMarker project logo are trademarks or registered trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
 </div></div></div></body>
 </html>
diff --git a/docs/api/allclasses-index.html b/docs/api/allclasses-index.html
index 2e45c181..ce91c597 100644
--- a/docs/api/allclasses-index.html
+++ b/docs/api/allclasses-index.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>All Classes (FreeMarker 2.3.34 API)</title>
+<title>All Classes (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="class index">
@@ -161,73 +161,65 @@ loadScripts(document, 'script');</script>
 <div class="block">A class that will wrap instances of <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link"><code>Boolean</code></a> into a
  <a href="freemarker/template/TemplateBooleanModel.html" title="interface in freemarker.template"><code>TemplateBooleanModel</code></a>.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/debug/Breakpoint.html" title="class in freemarker.debug">Breakpoint</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
-<div class="block">Represents a breakpoint location consisting of a template name and a line number.</div>
-</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/BugException.html" title="class in freemarker.core">BugException</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/BugException.html" title="class in freemarker.core">BugException</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
 <div class="block">An unexpected state was reached that is certainly caused by a bug in FreeMarker.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/BuiltInForNodeEx.html" title="class in freemarker.core">BuiltInForNodeEx</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">&nbsp;</div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/ByteArrayTemplateLoader.html" title="class in freemarker.cache">ByteArrayTemplateLoader</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/BuiltInForNodeEx.html" title="class in freemarker.core">BuiltInForNodeEx</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">&nbsp;</div>
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/ByteArrayTemplateLoader.html" title="class in freemarker.cache">ByteArrayTemplateLoader</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">A <a href="freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> that uses a <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link"><code>Map</code></a> with <code>byte[]</code> as its source of templates.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/cache/CacheStorage.html" title="interface in freemarker.cache">CacheStorage</a></div>
-<div class="col-last odd-row-color all-classes-table-tab1 all-classes-table">
-<div class="block">Cache storage abstracts away the storage aspects of a cache - associating
- an object with a key, retrieval and removal via the key.</div>
-</div>
-<div class="col-first even-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/cache/CacheStorageWithGetSize.html" title="interface in freemarker.cache">CacheStorageWithGetSize</a></div>
+<div class="col-first even-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/cache/CacheStorage.html" title="interface in freemarker.cache">CacheStorage</a></div>
 <div class="col-last even-row-color all-classes-table-tab1 all-classes-table">
+<div class="block">Cache storage abstracts away the storage aspects of a cache - associating an object with a key, retrieval and removal
+ via the key.</div>
+</div>
+<div class="col-first odd-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/cache/CacheStorageWithGetSize.html" title="interface in freemarker.cache">CacheStorageWithGetSize</a></div>
+<div class="col-last odd-row-color all-classes-table-tab1 all-classes-table">
 <div class="block">A cache storage that has a <code>getSize()</code> method for returning the current number of cache entries.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/CallPlaceCustomDataInitializationException.html" title="class in freemarker.core">CallPlaceCustomDataInitializationException</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/CallPlaceCustomDataInitializationException.html" title="class in freemarker.core">CallPlaceCustomDataInitializationException</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
 <div class="block">Thrown by <a href="freemarker/core/DirectiveCallPlace.html#getOrCreateCustomData(java.lang.Object,freemarker.template.utility.ObjectFactory)"><code>DirectiveCallPlace.getOrCreateCustomData(Object, freemarker.template.utility.ObjectFactory)</code></a></div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/CaptureOutput.html" title="class in freemarker.template.utility">CaptureOutput</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">Deprecated.
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/CaptureOutput.html" title="class in freemarker.template.utility">CaptureOutput</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">Deprecated.
 <div class="deprecation-comment">Use block-assignments instead, like <code>&lt;assign x&gt;...&lt;/assign&gt;</code>.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/CFormat.html" title="class in freemarker.core">CFormat</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/CFormat.html" title="class in freemarker.core">CFormat</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Defines a format (usually a computer language) that's used by the <code>c</code>, <code>cn</code> built-ins, and for the
  <code>"c"</code> and <code>"computer"</code> <a href="freemarker/core/Configurable.html#setNumberFormat(java.lang.String)"><code>number_format</code></a>, and
  the <code>"c"</code> <a href="freemarker/core/Configurable.html#setBooleanFormat(java.lang.String)"><code>boolean_format</code></a>.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/ext/beans/ClassMemberAccessPolicy.html" title="interface in freemarker.ext.beans">ClassMemberAccessPolicy</a></div>
-<div class="col-last even-row-color all-classes-table-tab1 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/ext/beans/ClassMemberAccessPolicy.html" title="interface in freemarker.ext.beans">ClassMemberAccessPolicy</a></div>
+<div class="col-last odd-row-color all-classes-table-tab1 all-classes-table">
 <div class="block">Returned by <a href="freemarker/ext/beans/MemberAccessPolicy.html#forClass(java.lang.Class)"><code>MemberAccessPolicy.forClass(Class)</code></a>.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/ClassTemplateLoader.html" title="class in freemarker.cache">ClassTemplateLoader</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/ClassTemplateLoader.html" title="class in freemarker.cache">ClassTemplateLoader</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">A <a href="freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> that can load templates from the "classpath".</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/ClassUtil.html" title="class in freemarker.template.utility">ClassUtil</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">&nbsp;</div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/beans/CollectionModel.html" title="class in freemarker.ext.beans">CollectionModel</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/ClassUtil.html" title="class in freemarker.template.utility">ClassUtil</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">&nbsp;</div>
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/beans/CollectionModel.html" title="class in freemarker.ext.beans">CollectionModel</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">A special case of <a href="freemarker/ext/beans/BeanModel.html" title="class in freemarker.ext.beans"><code>BeanModel</code></a> that can wrap Java collections
  and that implements the <a href="freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template"><code>TemplateCollectionModel</code></a> in order to be usable 
  in a <code>&lt;#list&gt;</code> block.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/Collections12.html" title="class in freemarker.template.utility">Collections12</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">Deprecated.
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/Collections12.html" title="class in freemarker.template.utility">Collections12</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">Deprecated.
 <div class="deprecation-comment">Not needed anymore, as FreeMarker now requires higher than Java 1.3</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/CollectionUtils.html" title="class in freemarker.template.utility">CollectionUtils</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">&nbsp;</div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core">CombinedMarkupOutputFormat</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/CollectionUtils.html" title="class in freemarker.template.utility">CollectionUtils</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">&nbsp;</div>
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core">CombinedMarkupOutputFormat</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Represents two markup formats nested into each other.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/CommandLine.html" title="class in freemarker.core">CommandLine</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">Deprecated.
-<div class="deprecation-comment">Will be removed (main method in a library, often classified as CWE-489 "Leftover Debug Code").</div>
-</div>
 <div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;<a href="freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a> extends <a href="freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&gt;</div>
 <div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Common superclass for implementing <a href="freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core"><code>MarkupOutputFormat</code></a>-s that use a <a href="freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a>
@@ -240,8 +232,8 @@ loadScripts(document, 'script');</script>
 </div>
 <div class="col-first even-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/cache/ConcurrentCacheStorage.html" title="interface in freemarker.cache">ConcurrentCacheStorage</a></div>
 <div class="col-last even-row-color all-classes-table-tab1 all-classes-table">
-<div class="block">An optional interface for cache storage that knows whether it can be 
- concurrently accessible without synchronization.</div>
+<div class="block">An optional interface for cache storage that knows whether it can be concurrently accessible without
+ synchronization.</div>
 </div>
 <div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/ConditionalTemplateConfigurationFactory.html" title="class in freemarker.cache">ConditionalTemplateConfigurationFactory</a></div>
 <div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
@@ -307,33 +299,6 @@ loadScripts(document, 'script');</script>
 <div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Non-thread-safe factory that hard-references a calendar internally.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/debug/DebuggedEnvironment.html" title="interface in freemarker.debug">DebuggedEnvironment</a></div>
-<div class="col-last even-row-color all-classes-table-tab1 all-classes-table">
-<div class="block">Represents the debugger-side mirror of a debugged 
- <a href="freemarker/core/Environment.html" title="class in freemarker.core"><code>Environment</code></a> object in the remote VM.</div>
-</div>
-<div class="col-first odd-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/debug/Debugger.html" title="interface in freemarker.debug">Debugger</a></div>
-<div class="col-last odd-row-color all-classes-table-tab1 all-classes-table">
-<div class="block">The main debugger interface.</div>
-</div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/debug/DebuggerClient.html" title="class in freemarker.debug">DebuggerClient</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
-<div class="block">A utility class that allows you to connect to the FreeMarker debugger service
- running on a specific host and port.</div>
-</div>
-<div class="col-first odd-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/debug/DebuggerListener.html" title="interface in freemarker.debug">DebuggerListener</a></div>
-<div class="col-last odd-row-color all-classes-table-tab1 all-classes-table">
-<div class="block">An interface for components that wish to receive debugging events.</div>
-</div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/debug/impl/DebuggerService.html" title="class in freemarker.debug.impl">DebuggerService</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
-<div class="block">This class provides debugging hooks for the core FreeMarker engine.</div>
-</div>
-<div class="col-first odd-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/debug/DebugModel.html" title="interface in freemarker.debug">DebugModel</a></div>
-<div class="col-last odd-row-color all-classes-table-tab1 all-classes-table">
-<div class="block">Represents the debugger-side mirror of a TemplateModel object, a Template
- object, or a Configuration object.</div>
-</div>
 <div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/DeepUnwrap.html" title="class in freemarker.template.utility">DeepUnwrap</a></div>
 <div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Utility methods for unwrapping <a href="freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a>-s.</div>
@@ -415,482 +380,473 @@ loadScripts(document, 'script');</script>
 <div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Object that represents the runtime environment during template processing.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/debug/EnvironmentSuspendedEvent.html" title="class in freemarker.debug">EnvironmentSuspendedEvent</a></div>
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jakarta/jsp/EventForwarding.html" title="class in freemarker.ext.jakarta.jsp">EventForwarding</a></div>
 <div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
-<div class="block">Event describing a suspension of an environment (ie because it hit a
- breakpoint).</div>
-</div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jakarta/jsp/EventForwarding.html" title="class in freemarker.ext.jakarta.jsp">EventForwarding</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">An instance of this class should be registered as a <code>&lt;listener&gt;</code> in
  the <code>web.xml</code> descriptor in order to correctly dispatch events to
  event listeners that are specified in TLD files.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jsp/EventForwarding.html" title="class in freemarker.ext.jsp">EventForwarding</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jsp/EventForwarding.html" title="class in freemarker.ext.jsp">EventForwarding</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">An instance of this class should be registered as a <code>&lt;listener&gt;</code> in
  the <code>web.xml</code> descriptor in order to correctly dispatch events to
  event listeners that are specified in TLD files.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/Execute.html" title="class in freemarker.template.utility">Execute</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/Execute.html" title="class in freemarker.template.utility">Execute</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Gives FreeMarker the the ability to execute external commands.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/FileExtensionMatcher.html" title="class in freemarker.cache">FileExtensionMatcher</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/FileExtensionMatcher.html" title="class in freemarker.cache">FileExtensionMatcher</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Matches the file extension; unlike other matchers, by default case <em>insensitive</em>.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/FileNameGlobMatcher.html" title="class in freemarker.cache">FileNameGlobMatcher</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/FileNameGlobMatcher.html" title="class in freemarker.cache">FileNameGlobMatcher</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">As opposed to <a href="freemarker/cache/PathGlobMatcher.html" title="class in freemarker.cache"><code>PathGlobMatcher</code></a>, it only compares the "file name" part (the part after the last <code>/</code>) of
  the source name with the given glob.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/FileTemplateLoader.html" title="class in freemarker.cache">FileTemplateLoader</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
-<div class="block">A <a href="freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> that uses files inside a specified directory as the source of templates.</div>
-</div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache">FirstMatchTemplateConfigurationFactory</a></div>
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/FileTemplateLoader.html" title="class in freemarker.cache">FileTemplateLoader</a></div>
 <div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
-<div class="block">Returns the first non-<code>null</code> result of the child factories, ignoring all further child factories.</div>
+<div class="block">A <a href="freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> that uses files inside a specified directory as the source of templates.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jakarta/servlet/FreemarkerServlet.html" title="class in freemarker.ext.jakarta.servlet">FreemarkerServlet</a></div>
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache">FirstMatchTemplateConfigurationFactory</a></div>
 <div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
-<div class="block">FreeMarker MVC View servlet that can be used similarly to JSP views.</div>
+<div class="block">Returns the first non-<code>null</code> result of the child factories, ignoring all further child factories.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/servlet/FreemarkerServlet.html" title="class in freemarker.ext.servlet">FreemarkerServlet</a></div>
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jakarta/servlet/FreemarkerServlet.html" title="class in freemarker.ext.jakarta.servlet">FreemarkerServlet</a></div>
 <div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">FreeMarker MVC View servlet that can be used similarly to JSP views.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jakarta/jsp/FreemarkerTag.html" title="class in freemarker.ext.jakarta.jsp">FreemarkerTag</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">Deprecated.
-<div class="deprecation-comment">This feature is not supported anymore, also, it uses the deprecated default <a href="freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/servlet/FreemarkerServlet.html" title="class in freemarker.ext.servlet">FreemarkerServlet</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="block">FreeMarker MVC View servlet that can be used similarly to JSP views.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jsp/FreemarkerTag.html" title="class in freemarker.ext.jsp">FreemarkerTag</a></div>
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jakarta/jsp/FreemarkerTag.html" title="class in freemarker.ext.jakarta.jsp">FreemarkerTag</a></div>
 <div class="col-last even-row-color all-classes-table-tab2 all-classes-table">Deprecated.
 <div class="deprecation-comment">This feature is not supported anymore, also, it uses the deprecated default <a href="freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/FreeMarkerTree.html" title="class in freemarker.core">FreeMarkerTree</a></div>
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jsp/FreemarkerTag.html" title="class in freemarker.ext.jsp">FreemarkerTag</a></div>
 <div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">Deprecated.
-<div class="deprecation-comment">Will be removed, as Swing classes aren't accessible on Google App Engine.</div>
+<div class="deprecation-comment">This feature is not supported anymore, also, it uses the deprecated default <a href="freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/ant/FreemarkerXmlTask.html" title="class in freemarker.ext.ant">FreemarkerXmlTask</a></div>
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/FreeMarkerTree.html" title="class in freemarker.core">FreeMarkerTree</a></div>
 <div class="col-last even-row-color all-classes-table-tab2 all-classes-table">Deprecated.
+<div class="deprecation-comment">Will be removed, as Swing classes aren't accessible on Google App Engine.</div>
+</div>
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/ant/FreemarkerXmlTask.html" title="class in freemarker.ext.ant">FreemarkerXmlTask</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">Deprecated.
 <div class="deprecation-comment"><a href="http://fmpp.sourceforge.net">FMPP</a> is a more complete solution.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/beans/GenericObjectModel.html" title="class in freemarker.ext.beans">GenericObjectModel</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/beans/GenericObjectModel.html" title="class in freemarker.ext.beans">GenericObjectModel</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">This is used for wrapping objects that has no special treatment (unlike <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link"><code>Map</code></a>-s, <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/Collection.html" title="class or interface in java.util" class="external-link"><code>Collection</code></a>-s,
  <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link"><code>Number</code></a>-s, <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link"><code>Boolean</code></a>-s, and some more, which have), hence they are just "generic" Java
  objects.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/beans/HashAdapter.html" title="class in freemarker.ext.beans">HashAdapter</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">&nbsp;</div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/HtmlEscape.html" title="class in freemarker.template.utility">HtmlEscape</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
-<div class="block">Performs an HTML escape of a given template fragment.</div>
-</div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core">HTMLOutputFormat</a></div>
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/beans/HashAdapter.html" title="class in freemarker.ext.beans">HashAdapter</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">&nbsp;</div>
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/HtmlEscape.html" title="class in freemarker.template.utility">HtmlEscape</a></div>
 <div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
-<div class="block">Represents the HTML output format (MIME type "text/html", name "HTML").</div>
+<div class="block">Performs an HTML escape of a given template fragment.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jakarta/servlet/HttpRequestHashModel.html" title="class in freemarker.ext.jakarta.servlet">HttpRequestHashModel</a></div>
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core">HTMLOutputFormat</a></div>
 <div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
-<div class="block">TemplateHashModel wrapper for a HttpServletRequest attributes.</div>
+<div class="block">Represents the HTML output format (MIME type "text/html", name "HTML").</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/servlet/HttpRequestHashModel.html" title="class in freemarker.ext.servlet">HttpRequestHashModel</a></div>
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jakarta/servlet/HttpRequestHashModel.html" title="class in freemarker.ext.jakarta.servlet">HttpRequestHashModel</a></div>
 <div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">TemplateHashModel wrapper for a HttpServletRequest attributes.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jakarta/servlet/HttpRequestParametersHashModel.html" title="class in freemarker.ext.jakarta.servlet">HttpRequestParametersHashModel</a></div>
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/servlet/HttpRequestHashModel.html" title="class in freemarker.ext.servlet">HttpRequestHashModel</a></div>
 <div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
-<div class="block">TemplateHashModel wrapper for a HttpServletRequest parameters.</div>
+<div class="block">TemplateHashModel wrapper for a HttpServletRequest attributes.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/servlet/HttpRequestParametersHashModel.html" title="class in freemarker.ext.servlet">HttpRequestParametersHashModel</a></div>
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jakarta/servlet/HttpRequestParametersHashModel.html" title="class in freemarker.ext.jakarta.servlet">HttpRequestParametersHashModel</a></div>
 <div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">TemplateHashModel wrapper for a HttpServletRequest parameters.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jakarta/servlet/HttpSessionHashModel.html" title="class in freemarker.ext.jakarta.servlet">HttpSessionHashModel</a></div>
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/servlet/HttpRequestParametersHashModel.html" title="class in freemarker.ext.servlet">HttpRequestParametersHashModel</a></div>
 <div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
-<div class="block">TemplateHashModel wrapper for a HttpSession attributes.</div>
+<div class="block">TemplateHashModel wrapper for a HttpServletRequest parameters.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/servlet/HttpSessionHashModel.html" title="class in freemarker.ext.servlet">HttpSessionHashModel</a></div>
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jakarta/servlet/HttpSessionHashModel.html" title="class in freemarker.ext.jakarta.servlet">HttpSessionHashModel</a></div>
 <div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">TemplateHashModel wrapper for a HttpSession attributes.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/util/IdentityHashMap.html" title="class in freemarker.ext.util">IdentityHashMap</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">Deprecated.
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/servlet/HttpSessionHashModel.html" title="class in freemarker.ext.servlet">HttpSessionHashModel</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="block">TemplateHashModel wrapper for a HttpSession attributes.</div>
+</div>
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/util/IdentityHashMap.html" title="class in freemarker.ext.util">IdentityHashMap</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">Deprecated.
 <div class="deprecation-comment">Use <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/IdentityHashMap.html" title="class or interface in java.util" class="external-link"><code>IdentityHashMap</code></a> instead.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jakarta/servlet/IncludePage.html" title="class in freemarker.ext.jakarta.servlet">IncludePage</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jakarta/servlet/IncludePage.html" title="class in freemarker.ext.jakarta.servlet">IncludePage</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">A model that when invoked with a 'path' parameter will perform a servlet 
  include.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/servlet/IncludePage.html" title="class in freemarker.ext.servlet">IncludePage</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/servlet/IncludePage.html" title="class in freemarker.ext.servlet">IncludePage</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">A model that when invoked with a 'path' parameter will perform a servlet 
  include.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/InvalidFormatParametersException.html" title="class in freemarker.core">InvalidFormatParametersException</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/InvalidFormatParametersException.html" title="class in freemarker.core">InvalidFormatParametersException</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
 <div class="block">Used when creating <a href="freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a>-s and <a href="freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>-s to indicate that the parameters
  part of the format string (like some kind of pattern) is malformed.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/InvalidFormatStringException.html" title="class in freemarker.core">InvalidFormatStringException</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/InvalidFormatStringException.html" title="class in freemarker.core">InvalidFormatStringException</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
 <div class="block">Used when creating <a href="freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a>-s and <a href="freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>-s to indicate that the format
  string (like the value of the <code>dateFormat</code> setting) is malformed.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/ext/beans/InvalidPropertyException.html" title="class in freemarker.ext.beans">InvalidPropertyException</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/ext/beans/InvalidPropertyException.html" title="class in freemarker.ext.beans">InvalidPropertyException</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
 <div class="block">An exception thrown when there is an attempt to access
  an invalid bean property when we are in a "strict bean" mode</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/InvalidReferenceException.html" title="class in freemarker.core">InvalidReferenceException</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/InvalidReferenceException.html" title="class in freemarker.core">InvalidReferenceException</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
 <div class="block">A subclass of <a href="freemarker/template/TemplateException.html" title="class in freemarker.template"><code>TemplateException</code></a> that says that an FTL expression has evaluated to <code>null</code> or it refers
  to something that doesn't exist.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/beans/IteratorModel.html" title="class in freemarker.ext.beans">IteratorModel</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/beans/IteratorModel.html" title="class in freemarker.ext.beans">IteratorModel</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">A class that adds <a href="freemarker/template/TemplateModelIterator.html" title="interface in freemarker.template"><code>TemplateModelIterator</code></a> functionality to the
  <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/Iterator.html" title="class or interface in java.util" class="external-link"><code>Iterator</code></a> interface implementers.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/JavaCFormat.html" title="class in freemarker.core">JavaCFormat</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/JavaCFormat.html" title="class in freemarker.core">JavaCFormat</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block"><a href="freemarker/core/JavaCFormat.html#NAME">"Java"</a> <a href="freemarker/core/CFormat.html" title="class in freemarker.core"><code>CFormat</code></a>.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/JavaScriptCFormat.html" title="class in freemarker.core">JavaScriptCFormat</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/JavaScriptCFormat.html" title="class in freemarker.core">JavaScriptCFormat</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block"><a href="freemarker/core/JavaScriptCFormat.html#NAME">"JavaScript"</a> <a href="freemarker/core/CFormat.html" title="class in freemarker.core"><code>CFormat</code></a>, to be used when generating JavaScript (and not JSON), except, in most cases
  <a href="freemarker/core/JavaScriptOrJSONCFormat.html" title="class in freemarker.core"><code>JavaScriptOrJSONCFormat</code></a> is recommended over this.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/JavaScriptOrJSONCFormat.html" title="class in freemarker.core">JavaScriptOrJSONCFormat</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/JavaScriptOrJSONCFormat.html" title="class in freemarker.core">JavaScriptOrJSONCFormat</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block"><a href="freemarker/core/JavaScriptOrJSONCFormat.html#NAME">"JavaScript or JSON"</a> <a href="freemarker/core/CFormat.html" title="class in freemarker.core"><code>CFormat</code></a>; for generating output that's compatible with both JSON and JavaScript.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/JavaScriptOutputFormat.html" title="class in freemarker.core">JavaScriptOutputFormat</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/JavaScriptOutputFormat.html" title="class in freemarker.core">JavaScriptOutputFormat</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Represents the JavaScript output format (MIME type "application/javascript", name "JavaScript").</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/JSONCFormat.html" title="class in freemarker.core">JSONCFormat</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/JSONCFormat.html" title="class in freemarker.core">JSONCFormat</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block"><a href="freemarker/core/JSONCFormat.html#NAME">"JSON"</a> <a href="freemarker/core/CFormat.html" title="class in freemarker.core"><code>CFormat</code></a>; to be used when generating JSON (and not JavaScript), except, in most cases
  <a href="freemarker/core/JavaScriptOrJSONCFormat.html" title="class in freemarker.core"><code>JavaScriptOrJSONCFormat</code></a> is recommended over this.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/JSONOutputFormat.html" title="class in freemarker.core">JSONOutputFormat</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/JSONOutputFormat.html" title="class in freemarker.core">JSONOutputFormat</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Represents the JSON output format (MIME type "application/json", name "JSON").</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/ant/JythonAntTask.html" title="class in freemarker.ext.ant">JythonAntTask</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/ant/JythonAntTask.html" title="class in freemarker.ext.ant">JythonAntTask</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Used internally, public for technical reasons only.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jython/JythonHashModel.html" title="class in freemarker.ext.jython">JythonHashModel</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jython/JythonHashModel.html" title="class in freemarker.ext.jython">JythonHashModel</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Model for Jython dictionaries (<code>PyDictionary</code>
  and <code>PyStringMap</code>).</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jython/JythonModel.html" title="class in freemarker.ext.jython">JythonModel</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jython/JythonModel.html" title="class in freemarker.ext.jython">JythonModel</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Generic model for arbitrary Jython objects.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jython/JythonNumberModel.html" title="class in freemarker.ext.jython">JythonNumberModel</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jython/JythonNumberModel.html" title="class in freemarker.ext.jython">JythonNumberModel</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Model for Jython numeric objects (<code>PyInteger</code>, <code>PyLong</code>,
  <code>PyFloat</code>).</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/JythonRuntime.html" title="class in freemarker.template.utility">JythonRuntime</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/JythonRuntime.html" title="class in freemarker.template.utility">JythonRuntime</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">A crude first pass at an embeddable Jython interpreter</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jython/JythonSequenceModel.html" title="class in freemarker.ext.jython">JythonSequenceModel</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jython/JythonSequenceModel.html" title="class in freemarker.ext.jython">JythonSequenceModel</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Model for Jython sequence objects (<code>PySequence</code> descendants).</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jython/JythonVersionAdapter.html" title="class in freemarker.ext.jython">JythonVersionAdapter</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jython/JythonVersionAdapter.html" title="class in freemarker.ext.jython">JythonVersionAdapter</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Functions that has a different implementation depending on the Jython version
  used.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jython/JythonWrapper.html" title="class in freemarker.ext.jython">JythonWrapper</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jython/JythonWrapper.html" title="class in freemarker.ext.jython">JythonWrapper</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">An object wrapper that wraps Jython objects into FreeMarker template models
  and vice versa.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/LegacyCFormat.html" title="class in freemarker.core">LegacyCFormat</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/LegacyCFormat.html" title="class in freemarker.core">LegacyCFormat</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Corresponds to the behavior of <code>?c</code> before <a href="freemarker/template/Configuration.html#VERSION_2_3_32">2.3.32</a> (when there
  were no <a href="freemarker/core/CFormat.html" title="class in freemarker.core"><code>CFormat</code></a>-s yet).</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/beans/LegacyDefaultMemberAccessPolicy.html" title="class in freemarker.ext.beans">LegacyDefaultMemberAccessPolicy</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/beans/LegacyDefaultMemberAccessPolicy.html" title="class in freemarker.ext.beans">LegacyDefaultMemberAccessPolicy</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Legacy blacklist based member access policy, used only to keep old behavior, as it can't provide meaningful safety.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/LocalizedString.html" title="class in freemarker.template">LocalizedString</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/LocalizedString.html" title="class in freemarker.template">LocalizedString</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">An abstract base class for scalars that vary by locale.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/log/Logger.html" title="class in freemarker.log">Logger</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
-<div class="block">Delegates logger creation to an actual logging library.</div>
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/log/Logger.html" title="class in freemarker.log">Logger</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="block">Delegates logger creation to an actual logging library (this was written before SLF4J, or even Apache Commons Logging
+ was widespread).</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/template/MalformedTemplateNameException.html" title="class in freemarker.template">MalformedTemplateNameException</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/template/MalformedTemplateNameException.html" title="class in freemarker.template">MalformedTemplateNameException</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
 <div class="block">Indicates that the template name given was malformed according the <a href="freemarker/cache/TemplateNameFormat.html" title="class in freemarker.cache"><code>TemplateNameFormat</code></a> in use.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/MapKeyValuePairIterator.html" title="class in freemarker.template">MapKeyValuePairIterator</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/MapKeyValuePairIterator.html" title="class in freemarker.template">MapKeyValuePairIterator</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Implementation of <a href="freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template"><code>TemplateHashModelEx2.KeyValuePairIterator</code></a> for a <a href="freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template"><code>TemplateHashModelEx2</code></a> that wraps or otherwise uses a
   <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link"><code>Map</code></a> internally.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/beans/MapModel.html" title="class in freemarker.ext.beans">MapModel</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/beans/MapModel.html" title="class in freemarker.ext.beans">MapModel</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">A special case of <a href="freemarker/ext/beans/BeanModel.html" title="class in freemarker.ext.beans"><code>BeanModel</code></a> that adds implementation
  for <a href="freemarker/template/TemplateMethodModelEx.html" title="interface in freemarker.template"><code>TemplateMethodModelEx</code></a> on map objects that is a shortcut for the
  <code>Map.get()</code> method.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a href="freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a> extends <a href="freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&gt;</div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a href="freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a> extends <a href="freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&gt;</div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Superclass of <a href="freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>-s that represent a "markup" format, which is any format where certain character
  sequences have special meaning, and thus may need escaping.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/ext/beans/MemberAccessPolicy.html" title="interface in freemarker.ext.beans">MemberAccessPolicy</a></div>
-<div class="col-last odd-row-color all-classes-table-tab1 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/ext/beans/MemberAccessPolicy.html" title="interface in freemarker.ext.beans">MemberAccessPolicy</a></div>
+<div class="col-last even-row-color all-classes-table-tab1 all-classes-table">
 <div class="block">Implement this to restrict what class members (methods, fields, constructors) are accessible from templates.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/beans/MemberSelectorListMemberAccessPolicy.html" title="class in freemarker.ext.beans">MemberSelectorListMemberAccessPolicy</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/beans/MemberSelectorListMemberAccessPolicy.html" title="class in freemarker.ext.beans">MemberSelectorListMemberAccessPolicy</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Superclass for member-selector-list-based member access policies, like <a href="freemarker/ext/beans/WhitelistMemberAccessPolicy.html" title="class in freemarker.ext.beans"><code>WhitelistMemberAccessPolicy</code></a>.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/beans/MemberSelectorListMemberAccessPolicy.MemberSelector.html" title="class in freemarker.ext.beans">MemberSelectorListMemberAccessPolicy.MemberSelector</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/beans/MemberSelectorListMemberAccessPolicy.MemberSelector.html" title="class in freemarker.ext.beans">MemberSelectorListMemberAccessPolicy.MemberSelector</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">A condition that matches some type members.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/MergingTemplateConfigurationFactory.html" title="class in freemarker.cache">MergingTemplateConfigurationFactory</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/MergingTemplateConfigurationFactory.html" title="class in freemarker.cache">MergingTemplateConfigurationFactory</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Returns the merged results of all the child factories.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/ext/beans/MethodAppearanceFineTuner.html" title="interface in freemarker.ext.beans">MethodAppearanceFineTuner</a></div>
-<div class="col-last odd-row-color all-classes-table-tab1 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/ext/beans/MethodAppearanceFineTuner.html" title="interface in freemarker.ext.beans">MethodAppearanceFineTuner</a></div>
+<div class="col-last even-row-color all-classes-table-tab1 all-classes-table">
 <div class="block">Used for customizing how the Java methods are visible from templates, via
  <a href="freemarker/ext/beans/BeansWrapper.html#setMethodAppearanceFineTuner(freemarker.ext.beans.MethodAppearanceFineTuner)"><code>BeansWrapper.setMethodAppearanceFineTuner(MethodAppearanceFineTuner)</code></a>.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/template/MethodCallAwareTemplateHashModel.html" title="interface in freemarker.template">MethodCallAwareTemplateHashModel</a></div>
-<div class="col-last even-row-color all-classes-table-tab1 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/template/MethodCallAwareTemplateHashModel.html" title="interface in freemarker.template">MethodCallAwareTemplateHashModel</a></div>
+<div class="col-last odd-row-color all-classes-table-tab1 all-classes-table">
 <div class="block">Adds an extra getter method to <a href="freemarker/template/TemplateHashModel.html" title="interface in freemarker.template"><code>TemplateHashModel</code></a> that can return different result than <a href="freemarker/template/TemplateHashModel.html#get(java.lang.String)"><code>TemplateHashModel.get(String)</code></a>,
  knowing that the result of it will be called as a method.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/template/MethodCallAwareTemplateHashModel.ShouldNotBeGetAsMethodException.html" title="class in freemarker.template">MethodCallAwareTemplateHashModel.ShouldNotBeGetAsMethodException</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/template/MethodCallAwareTemplateHashModel.ShouldNotBeGetAsMethodException.html" title="class in freemarker.template">MethodCallAwareTemplateHashModel.ShouldNotBeGetAsMethodException</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
 <div class="block">Thrown by <a href="freemarker/template/MethodCallAwareTemplateHashModel.html#getBeforeMethodCall(java.lang.String)"><code>MethodCallAwareTemplateHashModel.getBeforeMethodCall(String)</code></a>; see there.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/util/ModelCache.html" title="class in freemarker.ext.util">ModelCache</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/util/ModelCache.html" title="class in freemarker.ext.util">ModelCache</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Internally used by various wrapper implementations to implement model
  caching.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/ext/util/ModelFactory.html" title="interface in freemarker.ext.util">ModelFactory</a></div>
-<div class="col-last odd-row-color all-classes-table-tab1 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/ext/util/ModelFactory.html" title="interface in freemarker.ext.util">ModelFactory</a></div>
+<div class="col-last even-row-color all-classes-table-tab1 all-classes-table">
 <div class="block">Interface used to create various wrapper models in the <a href="freemarker/ext/util/ModelCache.html" title="class in freemarker.ext.util"><code>ModelCache</code></a>.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/MruCacheStorage.html" title="class in freemarker.cache">MruCacheStorage</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/MruCacheStorage.html" title="class in freemarker.cache">MruCacheStorage</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">A cache storage that implements a two-level Most Recently Used cache.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/MultiTemplateLoader.html" title="class in freemarker.cache">MultiTemplateLoader</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/MultiTemplateLoader.html" title="class in freemarker.cache">MultiTemplateLoader</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">A <a href="freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> that uses a set of other loaders to load the templates.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jdom/NodeListModel.html" title="class in freemarker.ext.jdom">NodeListModel</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">Deprecated.
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jdom/NodeListModel.html" title="class in freemarker.ext.jdom">NodeListModel</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">Deprecated.
 <div class="deprecation-comment">Use <a href="freemarker/ext/dom/NodeModel.html" title="class in freemarker.ext.dom"><code>NodeModel</code></a> instead.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/xml/NodeListModel.html" title="class in freemarker.ext.xml">NodeListModel</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">Deprecated.
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/xml/NodeListModel.html" title="class in freemarker.ext.xml">NodeListModel</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">Deprecated.
 <div class="deprecation-comment">Use <a href="freemarker/ext/dom/NodeModel.html" title="class in freemarker.ext.dom"><code>NodeModel</code></a> instead.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/dom/NodeModel.html" title="class in freemarker.ext.dom">NodeModel</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/dom/NodeModel.html" title="class in freemarker.ext.dom">NodeModel</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">A base class for wrapping a single W3C DOM Node as a FreeMarker template model.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonBooleanException.html" title="class in freemarker.core">NonBooleanException</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonBooleanException.html" title="class in freemarker.core">NonBooleanException</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
 <div class="block">Indicates that a <a href="freemarker/template/TemplateBooleanModel.html" title="interface in freemarker.template"><code>TemplateBooleanModel</code></a> value was expected, but the value had a different type.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonDateException.html" title="class in freemarker.core">NonDateException</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonDateException.html" title="class in freemarker.core">NonDateException</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
 <div class="block">Indicates that a <a href="freemarker/template/TemplateDateModel.html" title="interface in freemarker.template"><code>TemplateDateModel</code></a> value was expected, but the value had a different type.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonExtendedHashException.html" title="class in freemarker.core">NonExtendedHashException</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonExtendedHashException.html" title="class in freemarker.core">NonExtendedHashException</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
 <div class="block">Indicates that a <a href="freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template"><code>TemplateHashModelEx</code></a> value was expected, but the value had a different type.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonExtendedNodeException.html" title="class in freemarker.core">NonExtendedNodeException</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonExtendedNodeException.html" title="class in freemarker.core">NonExtendedNodeException</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
 <div class="block">Indicates that a <a href="freemarker/template/TemplateNodeModelEx.html" title="interface in freemarker.template"><code>TemplateNodeModelEx</code></a> value was expected, but the value had a different type.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonHashException.html" title="class in freemarker.core">NonHashException</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonHashException.html" title="class in freemarker.core">NonHashException</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
 <div class="block">Indicates that a <a href="freemarker/template/TemplateHashModel.html" title="interface in freemarker.template"><code>TemplateHashModel</code></a> value was expected, but the value had a different type.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonMarkupOutputException.html" title="class in freemarker.core">NonMarkupOutputException</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonMarkupOutputException.html" title="class in freemarker.core">NonMarkupOutputException</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
 <div class="block">Indicates that a <a href="freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> value was expected, but the value had a different type.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonMethodException.html" title="class in freemarker.core">NonMethodException</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonMethodException.html" title="class in freemarker.core">NonMethodException</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
 <div class="block">Indicates that a <a href="freemarker/template/TemplateMethodModel.html" title="interface in freemarker.template"><code>TemplateMethodModel</code></a> value was expected, but the value had a different type.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonNodeException.html" title="class in freemarker.core">NonNodeException</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonNodeException.html" title="class in freemarker.core">NonNodeException</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
 <div class="block">Indicates that a <a href="freemarker/template/TemplateNodeModel.html" title="interface in freemarker.template"><code>TemplateNodeModel</code></a> value was expected, but the value had a different type.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonNumericalException.html" title="class in freemarker.core">NonNumericalException</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonNumericalException.html" title="class in freemarker.core">NonNumericalException</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
 <div class="block">Indicates that a <a href="freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template"><code>TemplateNumberModel</code></a> value was expected, but the value had a different type.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonSequenceException.html" title="class in freemarker.core">NonSequenceException</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonSequenceException.html" title="class in freemarker.core">NonSequenceException</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
 <div class="block">Indicates that a <a href="freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template"><code>TemplateSequenceModel</code></a> value was expected, but the value had a different type.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonSequenceOrCollectionException.html" title="class in freemarker.core">NonSequenceOrCollectionException</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonSequenceOrCollectionException.html" title="class in freemarker.core">NonSequenceOrCollectionException</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
 <div class="block">Indicates that a <a href="freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template"><code>TemplateSequenceModel</code></a> or <a href="freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template"><code>TemplateCollectionModel</code></a> value was expected, but the value
  had a different type.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonStringException.html" title="class in freemarker.core">NonStringException</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonStringException.html" title="class in freemarker.core">NonStringException</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
 <div class="block">Indicates that a <a href="freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template"><code>TemplateScalarModel</code></a> value was expected (or maybe something that can be automatically coerced
  to that), but the value had a different type.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonStringOrTemplateOutputException.html" title="class in freemarker.core">NonStringOrTemplateOutputException</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/NonStringOrTemplateOutputException.html" title="class in freemarker.core">NonStringOrTemplateOutputException</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
 <div class="block">Indicates that a <a href="freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template"><code>TemplateScalarModel</code></a> (or maybe something that can be automatically coerced
  to that) or <a href="freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> value was expected, but the value had a different type.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/NormalizeNewlines.html" title="class in freemarker.template.utility">NormalizeNewlines</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/NormalizeNewlines.html" title="class in freemarker.template.utility">NormalizeNewlines</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Transformer that supports FreeMarker legacy behavior: all newlines appearing
  within the transformed area will be transformed into the platform's default
  newline.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/NotMatcher.html" title="class in freemarker.cache">NotMatcher</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/NotMatcher.html" title="class in freemarker.cache">NotMatcher</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Logical "not" operation on the given matcher.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/template/utility/NullArgumentException.html" title="class in freemarker.template.utility">NullArgumentException</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/template/utility/NullArgumentException.html" title="class in freemarker.template.utility">NullArgumentException</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
 <div class="block">Indicates that an argument that must be non-<code>null</code> was <code>null</code>.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/NullCacheStorage.html" title="class in freemarker.cache">NullCacheStorage</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/NullCacheStorage.html" title="class in freemarker.cache">NullCacheStorage</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">A cache storage that doesn't store anything.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/NullWriter.html" title="class in freemarker.template.utility">NullWriter</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/NullWriter.html" title="class in freemarker.template.utility">NullWriter</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">A <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Writer.html" title="class or interface in java.io" class="external-link"><code>Writer</code></a> that simply drops what it gets.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/beans/NumberModel.html" title="class in freemarker.ext.beans">NumberModel</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/beans/NumberModel.html" title="class in freemarker.ext.beans">NumberModel</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Wraps arbitrary subclass of <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link"><code>Number</code></a> into a reflective model.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/NumberUtil.html" title="class in freemarker.template.utility">NumberUtil</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/NumberUtil.html" title="class in freemarker.template.utility">NumberUtil</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Number- and math-related utilities.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/ObjectConstructor.html" title="class in freemarker.template.utility">ObjectConstructor</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/ObjectConstructor.html" title="class in freemarker.template.utility">ObjectConstructor</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">An object that you can make available in a template
  to instantiate arbitrary beans-wrapped objects in a template.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/template/utility/ObjectFactory.html" title="interface in freemarker.template.utility">ObjectFactory</a>&lt;<a href="freemarker/template/utility/ObjectFactory.html" title="type parameter in ObjectFactory">T</a>&gt;</div>
-<div class="col-last even-row-color all-classes-table-tab1 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/template/utility/ObjectFactory.html" title="interface in freemarker.template.utility">ObjectFactory</a>&lt;<a href="freemarker/template/utility/ObjectFactory.html" title="type parameter in ObjectFactory">T</a>&gt;</div>
+<div class="col-last odd-row-color all-classes-table-tab1 all-classes-table">
 <div class="block">Used for the trivial cases of the factory pattern.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/template/ObjectWrapper.html" title="interface in freemarker.template">ObjectWrapper</a></div>
-<div class="col-last odd-row-color all-classes-table-tab1 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/template/ObjectWrapper.html" title="interface in freemarker.template">ObjectWrapper</a></div>
+<div class="col-last even-row-color all-classes-table-tab1 all-classes-table">
 <div class="block">Maps Java objects to the type-system of FreeMarker Template Language (see the <a href="freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a>
  interfaces).</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/template/ObjectWrapperAndUnwrapper.html" title="interface in freemarker.template">ObjectWrapperAndUnwrapper</a></div>
-<div class="col-last even-row-color all-classes-table-tab1 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/template/ObjectWrapperAndUnwrapper.html" title="interface in freemarker.template">ObjectWrapperAndUnwrapper</a></div>
+<div class="col-last odd-row-color all-classes-table-tab1 all-classes-table">
 <div class="block"><b>Experimental - subject to change:</b> Adds functionality to <a href="freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a> that creates a plain Java object
  from a <a href="freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a>.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/template/utility/ObjectWrapperWithAPISupport.html" title="interface in freemarker.template.utility">ObjectWrapperWithAPISupport</a></div>
-<div class="col-last odd-row-color all-classes-table-tab1 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/template/utility/ObjectWrapperWithAPISupport.html" title="interface in freemarker.template.utility">ObjectWrapperWithAPISupport</a></div>
+<div class="col-last even-row-color all-classes-table-tab1 all-classes-table">
 <div class="block"><b>Experimental - subject to change:</b> Implemented by <a href="freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a>-s to help <a href="freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a>-s to
  implement the <code>someValue?api</code> operation.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/OptimizerUtil.html" title="class in freemarker.template.utility">OptimizerUtil</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">&nbsp;</div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/OptInTemplateClassResolver.html" title="class in freemarker.core">OptInTemplateClassResolver</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
-<div class="block">A <a href="freemarker/core/TemplateClassResolver.html" title="interface in freemarker.core"><code>TemplateClassResolver</code></a> that resolves only the classes whose name 
- was specified in the constructor.</div>
-</div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/OrMatcher.html" title="class in freemarker.cache">OrMatcher</a></div>
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/OptimizerUtil.html" title="class in freemarker.template.utility">OptimizerUtil</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">&nbsp;</div>
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/OptInTemplateClassResolver.html" title="class in freemarker.core">OptInTemplateClassResolver</a></div>
 <div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
-<div class="block">Logical "or" operation among the given matchers.</div>
+<div class="block">A <a href="freemarker/core/TemplateClassResolver.html" title="interface in freemarker.core"><code>TemplateClassResolver</code></a> that resolves only the classes whose name was specified in the constructor.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></div>
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/OrMatcher.html" title="class in freemarker.cache">OrMatcher</a></div>
 <div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
-<div class="block">Represents an output format.</div>
+<div class="block">Logical "or" operation among the given matchers.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/beans/OverloadedMethodsModel.html" title="class in freemarker.ext.beans">OverloadedMethodsModel</a></div>
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></div>
 <div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="block">Represents an output format.</div>
+</div>
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/beans/OverloadedMethodsModel.html" title="class in freemarker.ext.beans">OverloadedMethodsModel</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Wraps a set of same-name overloaded methods behind <a href="freemarker/template/TemplateMethodModel.html" title="interface in freemarker.template"><code>TemplateMethodModel</code></a> interface,
  like if it was a single method, chooses among them behind the scenes on call-time based on the argument values.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/ParseException.html" title="class in freemarker.core">ParseException</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/ParseException.html" title="class in freemarker.core">ParseException</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
 <div class="block">Parsing-time exception in a template (as opposed to a runtime exception, a <a href="freemarker/template/TemplateException.html" title="class in freemarker.template"><code>TemplateException</code></a>).</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a></div>
-<div class="col-last even-row-color all-classes-table-tab1 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a></div>
+<div class="col-last odd-row-color all-classes-table-tab1 all-classes-table">
 <div class="block"><b>Don't implement this interface yourself</b>; use the existing implementation(s).</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/ParsingNotSupportedException.html" title="class in freemarker.core">ParsingNotSupportedException</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="freemarker/core/ParsingNotSupportedException.html" title="class in freemarker.core">ParsingNotSupportedException</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
 <div class="block">Thrown when the <a href="freemarker/core/TemplateValueFormat.html" title="class in freemarker.core"><code>TemplateValueFormat</code></a> doesn't support parsing, and parsing was invoked.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/PathGlobMatcher.html" title="class in freemarker.cache">PathGlobMatcher</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/PathGlobMatcher.html" title="class in freemarker.cache">PathGlobMatcher</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Matches the whole template source name (also known as template source path) with the given glob.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/PathRegexMatcher.html" title="class in freemarker.cache">PathRegexMatcher</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/PathRegexMatcher.html" title="class in freemarker.cache">PathRegexMatcher</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Matches the whole template source name (also known as template source path) with the given regular expression.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/PlainTextOutputFormat.html" title="class in freemarker.core">PlainTextOutputFormat</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/PlainTextOutputFormat.html" title="class in freemarker.core">PlainTextOutputFormat</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Represents the plain text output format (MIME type "text/plain", name "plainText").</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/ResourceBundleLocalizedString.html" title="class in freemarker.template">ResourceBundleLocalizedString</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/ResourceBundleLocalizedString.html" title="class in freemarker.template">ResourceBundleLocalizedString</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">A concrete implementation of <a href="freemarker/template/LocalizedString.html" title="class in freemarker.template"><code>LocalizedString</code></a> that gets 
  a localized string from a <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/ResourceBundle.html" title="class or interface in java.util" class="external-link"><code>ResourceBundle</code></a></div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/beans/ResourceBundleModel.html" title="class in freemarker.ext.beans">ResourceBundleModel</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/beans/ResourceBundleModel.html" title="class in freemarker.ext.beans">ResourceBundleModel</a></div>
+<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">A hash model that wraps a resource bundle.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/rhino/RhinoFunctionModel.html" title="class in freemarker.ext.rhino">RhinoFunctionModel</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">&nbsp;</div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/rhino/RhinoScriptableModel.html" title="class in freemarker.ext.rhino">RhinoScriptableModel</a></div>
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/rhino/RhinoFunctionModel.html" title="class in freemarker.ext.rhino">RhinoFunctionModel</a></div>
 <div class="col-last even-row-color all-classes-table-tab2 all-classes-table">&nbsp;</div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/rhino/RhinoWrapper.html" title="class in freemarker.ext.rhino">RhinoWrapper</a></div>
+<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/rhino/RhinoScriptableModel.html" title="class in freemarker.ext.rhino">RhinoScriptableModel</a></div>
 <div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">&nbsp;</div>
-<div class="col-first even-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/template/utility/RichObjectWrapper.html" title="interface in freemarker.template.utility">RichObjectWrapper</a></div>
-<div class="col-last even-row-color all-classes-table-tab1 all-classes-table">
+<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/rhino/RhinoWrapper.html" title="class in freemarker.ext.rhino">RhinoWrapper</a></div>
+<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">&nbsp;</div>
+<div class="col-first odd-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/template/utility/RichObjectWrapper.html" title="interface in freemarker.template.utility">RichObjectWrapper</a></div>
+<div class="col-last odd-row-color all-classes-table-tab1 all-classes-table">
 <div class="block"><b>Experimental - subject to change:</b> Union of the interfaces that a typical feature rich <a href="freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a> is
  expected to implement.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/debug/impl/RmiDebuggerListenerImpl.html" title="class in freemarker.debug.impl">RmiDebuggerListenerImpl</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
-<div class="block">Used by the <a href="freemarker/debug/DebuggerClient.html" title="class in freemarker.debug"><code>DebuggerClient</code></a> to create local</div>
-</div>
 <div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/core/RTFOutputFormat.html" title="class in freemarker.core">RTFOutputFormat</a></div>
 <div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Represents the Rich Text Format output format (MIME type "application/rtf", name "RTF").</div>
@@ -1040,13 +996,13 @@ loadScripts(document, 'script');</script>
 </div>
 <div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jakarta/jsp/TaglibFactory.WebInfPerLibJarMetaInfTldSource.html" title="class in freemarker.ext.jakarta.jsp">TaglibFactory.WebInfPerLibJarMetaInfTldSource</a></div>
 <div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
-<div class="block">To search TLD-s under <code>sevletContext:/WEB-INF/lib/*.{jar,zip}/META-INF/**</code><code>/*.tld</code>, as requested by
- the JSP specification.</div>
+<div class="block">To search TLD-s under <code>sevletContext:/WEB-INF/lib/*.{jar,zip}/META-INF/**</code><code>/*.tld</code>, as requested
+ by the JSP specification.</div>
 </div>
 <div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/jsp/TaglibFactory.WebInfPerLibJarMetaInfTldSource.html" title="class in freemarker.ext.jsp">TaglibFactory.WebInfPerLibJarMetaInfTldSource</a></div>
 <div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
-<div class="block">To search TLD-s under <code>sevletContext:/WEB-INF/lib/*.{jar,zip}/META-INF/**</code><code>/*.tld</code>, as requested by
- the JSP specification.</div>
+<div class="block">To search TLD-s under <code>sevletContext:/WEB-INF/lib/*.{jar,zip}/META-INF/**</code><code>/*.tld</code>, as requested
+ by the JSP specification.</div>
 </div>
 <div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/Template.html" title="class in freemarker.template">Template</a></div>
 <div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
@@ -1073,7 +1029,7 @@ loadScripts(document, 'script');</script>
 </div>
 <div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/TemplateCache.MaybeMissingTemplate.html" title="class in freemarker.cache">TemplateCache.MaybeMissingTemplate</a></div>
 <div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
-<div class="block">Used for the return value of <a href="freemarker/cache/TemplateCache.html#getTemplate(java.lang.String,java.util.Locale,java.lang.Object,java.lang.String,boolean)"><code>TemplateCache.getTemplate(String, Locale, Object, String, boolean)</code></a>.</div>
+<div class="block">Return value of <a href="freemarker/cache/TemplateCache.html#getTemplate(java.lang.String,java.util.Locale,java.lang.Object,java.lang.String,boolean)"><code>TemplateCache.getTemplate(String, Locale, Object, String, boolean)</code></a>.</div>
 </div>
 <div class="col-first odd-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/core/TemplateClassResolver.html" title="interface in freemarker.core">TemplateClassResolver</a></div>
 <div class="col-last odd-row-color all-classes-table-tab1 all-classes-table">
@@ -1169,9 +1125,8 @@ loadScripts(document, 'script');</script>
 </div>
 <div class="col-first even-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></div>
 <div class="col-last even-row-color all-classes-table-tab1 all-classes-table">
-<div class="block">FreeMarker loads template "files" through objects that implement this interface,
- thus the templates need not be real files, and can come from any kind of data source
- (like classpath, servlet context, database, etc).</div>
+<div class="block">FreeMarker loads template "files" through objects that implement this interface, thus the templates need not be real
+ files, and can come from any kind of data source (like classpath, servlet context, database, etc).</div>
 </div>
 <div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/cache/TemplateLoaderUtils.html" title="class in freemarker.cache">TemplateLoaderUtils</a></div>
 <div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">&nbsp;</div>
@@ -1311,14 +1266,6 @@ loadScripts(document, 'script');</script>
 <div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">
 <div class="block">Stores XML markup to be printed; used with <a href="freemarker/core/XMLOutputFormat.html" title="class in freemarker.core"><code>XMLOutputFormat</code></a>.</div>
 </div>
-<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/template/utility/ToCanonical.html" title="class in freemarker.template.utility">ToCanonical</a></div>
-<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">Deprecated.
-<div class="deprecation-comment">Will be removed (main method in a library, often classified as CWE-489 "Leftover Debug Code").</div>
-</div>
-<div class="col-first odd-row-color all-classes-table-tab2 all-classes-table"><a href="freemarker/ext/dom/Transform.html" title="class in freemarker.ext.dom">Transform</a></div>
-<div class="col-last odd-row-color all-classes-table-tab2 all-classes-table">Deprecated.
-<div class="deprecation-comment">Will be removed (main method in a library, often classified as CWE-489 "Leftover Debug Code").</div>
-</div>
 <div class="col-first even-row-color all-classes-table-tab1 all-classes-table"><a href="freemarker/template/TransformControl.html" title="interface in freemarker.template">TransformControl</a></div>
 <div class="col-last even-row-color all-classes-table-tab1 all-classes-table">
 <div class="block">An interface that can be implemented by writers returned from
diff --git a/docs/api/allpackages-index.html b/docs/api/allpackages-index.html
index 48285080..244f65d6 100644
--- a/docs/api/allpackages-index.html
+++ b/docs/api/allpackages-index.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>All Packages (FreeMarker 2.3.34 API)</title>
+<title>All Packages (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="package index">
@@ -65,13 +65,6 @@ loadScripts(document, 'script');</script>
 <div class="col-last odd-row-color">
 <div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
 </div>
-<div class="col-first even-row-color"><a href="freemarker/debug/package-summary.html">freemarker.debug</a></div>
-<div class="col-last even-row-color">
-<div class="block">Debugging API; experimental status, might change!
- This is to support debugging in IDE-s.</div>
-</div>
-<div class="col-first odd-row-color"><a href="freemarker/debug/impl/package-summary.html">freemarker.debug.impl</a></div>
-<div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><a href="freemarker/ext/ant/package-summary.html">freemarker.ext.ant</a></div>
 <div class="col-last even-row-color">
 <div class="block"><a href="http://jakarta.apache.org/ant" target="_blank">Ant task</a> to transform XML files
@@ -93,8 +86,7 @@ loadScripts(document, 'script');</script>
 </div>
 <div class="col-first even-row-color"><a href="freemarker/ext/jakarta/servlet/package-summary.html">freemarker.ext.jakarta.servlet</a></div>
 <div class="col-last even-row-color">
-<div class="block">Servlet for legacy "Model 2" frameworks that allows using FreeMarker
- templates instead of JSP as the MVC View (see <a href="https://freemarker.apache.org/docs/pgui_misc_servlet.html" target="_blank">in the Manual</a>).</div>
+<div class="block">Servlet for legacy "Model 2" frameworks that allows using FreeMarker templates instead of JSP as the MVC View (see <a href="https://freemarker.apache.org/docs/pgui_misc_servlet.html" target="_blank">in the Manual</a>).</div>
 </div>
 <div class="col-first odd-row-color"><a href="freemarker/ext/jdom/package-summary.html">freemarker.ext.jdom</a></div>
 <div class="col-last odd-row-color">
@@ -115,8 +107,7 @@ loadScripts(document, 'script');</script>
 </div>
 <div class="col-first odd-row-color"><a href="freemarker/ext/servlet/package-summary.html">freemarker.ext.servlet</a></div>
 <div class="col-last odd-row-color">
-<div class="block">Servlet for legacy "Model 2" frameworks that allows using FreeMarker
- templates instead of JSP as the MVC View (see <a href="https://freemarker.apache.org/docs/pgui_misc_servlet.html" target="_blank">in the Manual</a>).</div>
+<div class="block">Servlet for legacy "Model 2" frameworks that allows using FreeMarker templates instead of JSP as the MVC View (see <a href="https://freemarker.apache.org/docs/pgui_misc_servlet.html" target="_blank">in the Manual</a>).</div>
 </div>
 <div class="col-first even-row-color"><a href="freemarker/ext/util/package-summary.html">freemarker.ext.util</a></div>
 <div class="col-last even-row-color">
diff --git a/docs/api/constant-values.html b/docs/api/constant-values.html
index fd7f0935..52f95f99 100644
--- a/docs/api/constant-values.html
+++ b/docs/api/constant-values.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>Constant Field Values (FreeMarker 2.3.34 API)</title>
+<title>Constant Field Values (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="summary of constants">
@@ -57,7 +57,6 @@ loadScripts(document, 'script');</script>
 <ul>
 <li><a href="#freemarker.cache">freemarker.cache.*</a></li>
 <li><a href="#freemarker.core">freemarker.core.*</a></li>
-<li><a href="#freemarker.debug">freemarker.debug.*</a></li>
 <li><a href="#freemarker.ext">freemarker.ext.*</a></li>
 <li><a href="#freemarker.log">freemarker.log.*</a></li>
 <li><a href="#freemarker.template">freemarker.template.*</a></li>
@@ -464,13 +463,13 @@ loadScripts(document, 'script');</script>
 <div class="col-last even-row-color"><code>20</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.core.ParseException.AND">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>AND</code></div>
-<div class="col-last odd-row-color"><code>128</code></div>
+<div class="col-last odd-row-color"><code>129</code></div>
 <div class="col-first even-row-color"><code id="freemarker.core.ParseException.AS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>AS</code></div>
-<div class="col-last even-row-color"><code>141</code></div>
+<div class="col-last even-row-color"><code>142</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.core.ParseException.ASCII_DIGIT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>ASCII_DIGIT</code></div>
-<div class="col-last odd-row-color"><code>148</code></div>
+<div class="col-last odd-row-color"><code>149</code></div>
 <div class="col-first even-row-color"><code id="freemarker.core.ParseException.ASSIGN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>ASSIGN</code></div>
 <div class="col-last even-row-color"><code>17</code></div>
@@ -488,7 +487,7 @@ loadScripts(document, 'script');</script>
 <div class="col-last even-row-color"><code>56</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.core.ParseException.BUILT_IN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>BUILT_IN</code></div>
-<div class="col-last odd-row-color"><code>104</code></div>
+<div class="col-last odd-row-color"><code>105</code></div>
 <div class="col-first even-row-color"><code id="freemarker.core.ParseException.CALL">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>CALL</code></div>
 <div class="col-last even-row-color"><code>28</code></div>
@@ -497,10 +496,10 @@ loadScripts(document, 'script');</script>
 <div class="col-last odd-row-color"><code>15</code></div>
 <div class="col-first even-row-color"><code id="freemarker.core.ParseException.CLOSE_BRACKET">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>CLOSE_BRACKET</code></div>
-<div class="col-last even-row-color"><code>135</code></div>
+<div class="col-last even-row-color"><code>136</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.core.ParseException.CLOSE_PAREN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>CLOSE_PAREN</code></div>
-<div class="col-last odd-row-color"><code>137</code></div>
+<div class="col-last odd-row-color"><code>138</code></div>
 <div class="col-first even-row-color"><code id="freemarker.core.ParseException.CLOSE_TAG1">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>CLOSE_TAG1</code></div>
 <div class="col-last even-row-color"><code>4</code></div>
@@ -509,13 +508,13 @@ loadScripts(document, 'script');</script>
 <div class="col-last odd-row-color"><code>5</code></div>
 <div class="col-first even-row-color"><code id="freemarker.core.ParseException.CLOSING_CURLY_BRACKET">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>CLOSING_CURLY_BRACKET</code></div>
-<div class="col-last even-row-color"><code>139</code></div>
+<div class="col-last even-row-color"><code>140</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.core.ParseException.COLON">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>COLON</code></div>
-<div class="col-last odd-row-color"><code>133</code></div>
+<div class="col-last odd-row-color"><code>134</code></div>
 <div class="col-first even-row-color"><code id="freemarker.core.ParseException.COMMA">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>COMMA</code></div>
-<div class="col-last even-row-color"><code>131</code></div>
+<div class="col-last even-row-color"><code>132</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.core.ParseException.COMMENT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>COMMENT</code></div>
 <div class="col-last odd-row-color"><code>34</code></div>
@@ -536,37 +535,37 @@ loadScripts(document, 'script');</script>
 <div class="col-last even-row-color"><code>0</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.core.ParseException.DIRECTIVE_END">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>DIRECTIVE_END</code></div>
-<div class="col-last odd-row-color"><code>149</code></div>
+<div class="col-last odd-row-color"><code>150</code></div>
 <div class="col-first even-row-color"><code id="freemarker.core.ParseException.DIV_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>DIV_EQUALS</code></div>
-<div class="col-last even-row-color"><code>112</code></div>
+<div class="col-last even-row-color"><code>113</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.core.ParseException.DIVIDE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>DIVIDE</code></div>
-<div class="col-last odd-row-color"><code>126</code></div>
+<div class="col-last odd-row-color"><code>127</code></div>
 <div class="col-first even-row-color"><code id="freemarker.core.ParseException.DOLLAR_INTERPOLATION_OPENING">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>DOLLAR_INTERPOLATION_OPENING</code></div>
 <div class="col-last even-row-color"><code>83</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.core.ParseException.DOT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>DOT</code></div>
-<div class="col-last odd-row-color"><code>100</code></div>
+<div class="col-last odd-row-color"><code>101</code></div>
 <div class="col-first even-row-color"><code id="freemarker.core.ParseException.DOT_DOT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>DOT_DOT</code></div>
-<div class="col-last even-row-color"><code>101</code></div>
+<div class="col-last even-row-color"><code>102</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.core.ParseException.DOT_DOT_ASTERISK">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>DOT_DOT_ASTERISK</code></div>
-<div class="col-last odd-row-color"><code>103</code></div>
+<div class="col-last odd-row-color"><code>104</code></div>
 <div class="col-first even-row-color"><code id="freemarker.core.ParseException.DOT_DOT_LESS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>DOT_DOT_LESS</code></div>
-<div class="col-last even-row-color"><code>102</code></div>
+<div class="col-last even-row-color"><code>103</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.core.ParseException.DOUBLE_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>DOUBLE_EQUALS</code></div>
-<div class="col-last odd-row-color"><code>107</code></div>
+<div class="col-last odd-row-color"><code>108</code></div>
 <div class="col-first even-row-color"><code id="freemarker.core.ParseException.DOUBLE_STAR">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>DOUBLE_STAR</code></div>
-<div class="col-last even-row-color"><code>124</code></div>
+<div class="col-last even-row-color"><code>125</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.core.ParseException.ELLIPSIS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>ELLIPSIS</code></div>
-<div class="col-last odd-row-color"><code>125</code></div>
+<div class="col-last odd-row-color"><code>126</code></div>
 <div class="col-first even-row-color"><code id="freemarker.core.ParseException.ELSE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>ELSE</code></div>
 <div class="col-last even-row-color"><code>55</code></div>
@@ -575,7 +574,7 @@ loadScripts(document, 'script');</script>
 <div class="col-last odd-row-color"><code>9</code></div>
 <div class="col-first even-row-color"><code id="freemarker.core.ParseException.EMPTY_DIRECTIVE_END">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>EMPTY_DIRECTIVE_END</code></div>
-<div class="col-last even-row-color"><code>150</code></div>
+<div class="col-last even-row-color"><code>151</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.core.ParseException.END_ASSIGN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>END_ASSIGN</code></div>
 <div class="col-last odd-row-color"><code>46</code></div>
@@ -644,7 +643,7 @@ loadScripts(document, 'script');</script>
 <div class="col-last even-row-color"><code>0</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.core.ParseException.EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>EQUALS</code></div>
-<div class="col-last odd-row-color"><code>106</code></div>
+<div class="col-last odd-row-color"><code>107</code></div>
 <div class="col-first even-row-color"><code id="freemarker.core.ParseException.ESCAPE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>ESCAPE</code></div>
 <div class="col-last even-row-color"><code>71</code></div>
@@ -653,19 +652,19 @@ loadScripts(document, 'script');</script>
 <div class="col-last odd-row-color"><code>93</code></div>
 <div class="col-first even-row-color"><code id="freemarker.core.ParseException.ESCAPED_GT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>ESCAPED_GT</code></div>
-<div class="col-last even-row-color"><code>118</code></div>
+<div class="col-last even-row-color"><code>119</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.core.ParseException.ESCAPED_GTE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>ESCAPED_GTE</code></div>
-<div class="col-last odd-row-color"><code>119</code></div>
+<div class="col-last odd-row-color"><code>120</code></div>
 <div class="col-first even-row-color"><code id="freemarker.core.ParseException.ESCAPED_ID_CHAR">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>ESCAPED_ID_CHAR</code></div>
-<div class="col-last even-row-color"><code>146</code></div>
+<div class="col-last even-row-color"><code>147</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.core.ParseException.EXCLAM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>EXCLAM</code></div>
-<div class="col-last odd-row-color"><code>130</code></div>
+<div class="col-last odd-row-color"><code>131</code></div>
 <div class="col-first even-row-color"><code id="freemarker.core.ParseException.EXISTS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>EXISTS</code></div>
-<div class="col-last even-row-color"><code>105</code></div>
+<div class="col-last even-row-color"><code>106</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.core.ParseException.EXPRESSION_COMMENT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>EXPRESSION_COMMENT</code></div>
 <div class="col-last odd-row-color"><code>5</code></div>
@@ -699,246 +698,249 @@ loadScripts(document, 'script');</script>
 <div class="col-first odd-row-color"><code id="freemarker.core.ParseException.HASH_INTERPOLATION_OPENING">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>HASH_INTERPOLATION_OPENING</code></div>
 <div class="col-last odd-row-color"><code>84</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.ID">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>ID</code></div>
-<div class="col-last even-row-color"><code>143</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.ID_START_CHAR">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>ID_START_CHAR</code></div>
-<div class="col-last odd-row-color"><code>147</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.IF">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>IF</code></div>
-<div class="col-last even-row-color"><code>8</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.IMPORT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>IMPORT</code></div>
-<div class="col-last odd-row-color"><code>21</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.IN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>IN</code></div>
-<div class="col-last even-row-color"><code>140</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.IN_PAREN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>IN_PAREN</code></div>
-<div class="col-last odd-row-color"><code>3</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.INTEGER">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>INTEGER</code></div>
-<div class="col-last even-row-color"><code>98</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.ITEMS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>ITEMS</code></div>
-<div class="col-last odd-row-color"><code>11</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.KEEP_GOING">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>KEEP_GOING</code></div>
-<div class="col-last even-row-color"><code>157</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.LAMBDA_ARROW">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>LAMBDA_ARROW</code></div>
-<div class="col-last odd-row-color"><code>120</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.LESS_THAN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>LESS_THAN</code></div>
-<div class="col-last even-row-color"><code>116</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.LESS_THAN_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>LESS_THAN_EQUALS</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.HEX_INTEGER">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>HEX_INTEGER</code></div>
+<div class="col-last even-row-color"><code>100</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.ID">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>ID</code></div>
+<div class="col-last odd-row-color"><code>144</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.ID_START_CHAR">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>ID_START_CHAR</code></div>
+<div class="col-last even-row-color"><code>148</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.IF">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>IF</code></div>
+<div class="col-last odd-row-color"><code>8</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.IMPORT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>IMPORT</code></div>
+<div class="col-last even-row-color"><code>21</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.IN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>IN</code></div>
+<div class="col-last odd-row-color"><code>141</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.IN_PAREN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>IN_PAREN</code></div>
+<div class="col-last even-row-color"><code>3</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.INTEGER">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>INTEGER</code></div>
+<div class="col-last odd-row-color"><code>98</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.ITEMS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>ITEMS</code></div>
+<div class="col-last even-row-color"><code>11</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.KEEP_GOING">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>KEEP_GOING</code></div>
+<div class="col-last odd-row-color"><code>158</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.LAMBDA_ARROW">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>LAMBDA_ARROW</code></div>
+<div class="col-last even-row-color"><code>121</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.LESS_THAN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>LESS_THAN</code></div>
 <div class="col-last odd-row-color"><code>117</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.LIST">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>LIST</code></div>
-<div class="col-last even-row-color"><code>10</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.LOCALASSIGN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>LOCALASSIGN</code></div>
-<div class="col-last odd-row-color"><code>19</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.LONE_LESS_THAN_OR_DASH">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>LONE_LESS_THAN_OR_DASH</code></div>
-<div class="col-last even-row-color"><code>158</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.LTRIM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>LTRIM</code></div>
-<div class="col-last odd-row-color"><code>62</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.MACRO">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>MACRO</code></div>
-<div class="col-last even-row-color"><code>23</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.MAYBE_END">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>MAYBE_END</code></div>
-<div class="col-last odd-row-color"><code>156</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.MINUS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>MINUS</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.LESS_THAN_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>LESS_THAN_EQUALS</code></div>
+<div class="col-last even-row-color"><code>118</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.LIST">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>LIST</code></div>
+<div class="col-last odd-row-color"><code>10</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.LOCALASSIGN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>LOCALASSIGN</code></div>
+<div class="col-last even-row-color"><code>19</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.LONE_LESS_THAN_OR_DASH">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>LONE_LESS_THAN_OR_DASH</code></div>
+<div class="col-last odd-row-color"><code>159</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.LTRIM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>LTRIM</code></div>
+<div class="col-last even-row-color"><code>62</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.MACRO">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>MACRO</code></div>
+<div class="col-last odd-row-color"><code>23</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.MAYBE_END">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>MAYBE_END</code></div>
+<div class="col-last even-row-color"><code>157</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.MINUS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>MINUS</code></div>
+<div class="col-last odd-row-color"><code>123</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.MINUS_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>MINUS_EQUALS</code></div>
+<div class="col-last even-row-color"><code>111</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.MINUS_MINUS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>MINUS_MINUS</code></div>
+<div class="col-last odd-row-color"><code>116</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.MOD_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>MOD_EQUALS</code></div>
+<div class="col-last even-row-color"><code>114</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.NAMED_PARAMETER_EXPRESSION">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>NAMED_PARAMETER_EXPRESSION</code></div>
+<div class="col-last odd-row-color"><code>4</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.NATURAL_GT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>NATURAL_GT</code></div>
+<div class="col-last even-row-color"><code>152</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.NATURAL_GTE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>NATURAL_GTE</code></div>
+<div class="col-last odd-row-color"><code>153</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.NESTED">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>NESTED</code></div>
+<div class="col-last even-row-color"><code>67</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.NO_DIRECTIVE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>NO_DIRECTIVE</code></div>
+<div class="col-last odd-row-color"><code>1</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.NO_PARSE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>NO_PARSE</code></div>
+<div class="col-last even-row-color"><code>7</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.NO_SPACE_EXPRESSION">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>NO_SPACE_EXPRESSION</code></div>
+<div class="col-last odd-row-color"><code>6</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.NOAUTOESC">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>NOAUTOESC</code></div>
+<div class="col-last even-row-color"><code>32</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.NOESCAPE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>NOESCAPE</code></div>
+<div class="col-last odd-row-color"><code>73</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.NON_ESCAPED_ID_START_CHAR">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>NON_ESCAPED_ID_START_CHAR</code></div>
+<div class="col-last even-row-color"><code>146</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.NOPARSE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>NOPARSE</code></div>
+<div class="col-last odd-row-color"><code>36</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.NOT_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>NOT_EQUALS</code></div>
+<div class="col-last even-row-color"><code>109</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.NOTRIM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>NOTRIM</code></div>
+<div class="col-last odd-row-color"><code>64</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.ON">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>ON</code></div>
+<div class="col-last even-row-color"><code>16</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.OPEN_BRACKET">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>OPEN_BRACKET</code></div>
+<div class="col-last odd-row-color"><code>135</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.OPEN_MISPLACED_INTERPOLATION">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>OPEN_MISPLACED_INTERPOLATION</code></div>
+<div class="col-last even-row-color"><code>145</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.OPEN_PAREN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>OPEN_PAREN</code></div>
+<div class="col-last odd-row-color"><code>137</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.OPENING_CURLY_BRACKET">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>OPENING_CURLY_BRACKET</code></div>
+<div class="col-last even-row-color"><code>139</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.OR">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>OR</code></div>
+<div class="col-last odd-row-color"><code>130</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.OUTPUTFORMAT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>OUTPUTFORMAT</code></div>
+<div class="col-last even-row-color"><code>30</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.PERCENT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>PERCENT</code></div>
+<div class="col-last odd-row-color"><code>128</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.PLUS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>PLUS</code></div>
 <div class="col-last even-row-color"><code>122</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.MINUS_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>MINUS_EQUALS</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.PLUS_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>PLUS_EQUALS</code></div>
 <div class="col-last odd-row-color"><code>110</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.MINUS_MINUS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>MINUS_MINUS</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.PLUS_PLUS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>PLUS_PLUS</code></div>
 <div class="col-last even-row-color"><code>115</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.MOD_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>MOD_EQUALS</code></div>
-<div class="col-last odd-row-color"><code>113</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.NAMED_PARAMETER_EXPRESSION">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>NAMED_PARAMETER_EXPRESSION</code></div>
-<div class="col-last even-row-color"><code>4</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.NATURAL_GT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>NATURAL_GT</code></div>
-<div class="col-last odd-row-color"><code>151</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.NATURAL_GTE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>NATURAL_GTE</code></div>
-<div class="col-last even-row-color"><code>152</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.NESTED">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>NESTED</code></div>
-<div class="col-last odd-row-color"><code>67</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.NO_DIRECTIVE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>NO_DIRECTIVE</code></div>
-<div class="col-last even-row-color"><code>1</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.NO_PARSE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>NO_PARSE</code></div>
-<div class="col-last odd-row-color"><code>7</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.NO_SPACE_EXPRESSION">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>NO_SPACE_EXPRESSION</code></div>
-<div class="col-last even-row-color"><code>6</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.NOAUTOESC">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>NOAUTOESC</code></div>
-<div class="col-last odd-row-color"><code>32</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.NOESCAPE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>NOESCAPE</code></div>
-<div class="col-last even-row-color"><code>73</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.NON_ESCAPED_ID_START_CHAR">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>NON_ESCAPED_ID_START_CHAR</code></div>
-<div class="col-last odd-row-color"><code>145</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.NOPARSE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>NOPARSE</code></div>
-<div class="col-last even-row-color"><code>36</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.NOT_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>NOT_EQUALS</code></div>
-<div class="col-last odd-row-color"><code>108</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.NOTRIM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>NOTRIM</code></div>
-<div class="col-last even-row-color"><code>64</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.ON">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>ON</code></div>
-<div class="col-last odd-row-color"><code>16</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.OPEN_BRACKET">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>OPEN_BRACKET</code></div>
-<div class="col-last even-row-color"><code>134</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.OPEN_MISPLACED_INTERPOLATION">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>OPEN_MISPLACED_INTERPOLATION</code></div>
-<div class="col-last odd-row-color"><code>144</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.OPEN_PAREN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>OPEN_PAREN</code></div>
-<div class="col-last even-row-color"><code>136</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.OPENING_CURLY_BRACKET">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>OPENING_CURLY_BRACKET</code></div>
-<div class="col-last odd-row-color"><code>138</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.OR">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>OR</code></div>
-<div class="col-last even-row-color"><code>129</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.OUTPUTFORMAT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>OUTPUTFORMAT</code></div>
-<div class="col-last odd-row-color"><code>30</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.PERCENT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>PERCENT</code></div>
-<div class="col-last even-row-color"><code>127</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.PLUS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>PLUS</code></div>
-<div class="col-last odd-row-color"><code>121</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.PLUS_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>PLUS_EQUALS</code></div>
-<div class="col-last even-row-color"><code>109</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.PLUS_PLUS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>PLUS_PLUS</code></div>
-<div class="col-last odd-row-color"><code>114</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.RAW_STRING">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>RAW_STRING</code></div>
-<div class="col-last even-row-color"><code>95</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.RECOVER">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>RECOVER</code></div>
-<div class="col-last odd-row-color"><code>7</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.RECURSE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>RECURSE</code></div>
-<div class="col-last even-row-color"><code>69</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.RETURN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>RETURN</code></div>
-<div class="col-last odd-row-color"><code>27</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.RTRIM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>RTRIM</code></div>
-<div class="col-last even-row-color"><code>63</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.SEMICOLON">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>SEMICOLON</code></div>
-<div class="col-last odd-row-color"><code>132</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.SEP">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>SEP</code></div>
-<div class="col-last even-row-color"><code>12</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.SETTING">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>SETTING</code></div>
-<div class="col-last odd-row-color"><code>29</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.SIMPLE_NESTED">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>SIMPLE_NESTED</code></div>
-<div class="col-last even-row-color"><code>66</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.SIMPLE_RECURSE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>SIMPLE_RECURSE</code></div>
-<div class="col-last odd-row-color"><code>68</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.SIMPLE_RETURN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>SIMPLE_RETURN</code></div>
-<div class="col-last even-row-color"><code>58</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.SQUARE_BRACKET_INTERPOLATION_OPENING">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>SQUARE_BRACKET_INTERPOLATION_OPENING</code></div>
-<div class="col-last odd-row-color"><code>85</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.START_TAG">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>START_TAG</code></div>
-<div class="col-last even-row-color"><code>2</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.STATIC_TEXT_FALSE_ALARM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>STATIC_TEXT_FALSE_ALARM</code></div>
-<div class="col-last odd-row-color"><code>82</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.STATIC_TEXT_NON_WS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>STATIC_TEXT_NON_WS</code></div>
-<div class="col-last even-row-color"><code>81</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.STATIC_TEXT_WS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>STATIC_TEXT_WS</code></div>
-<div class="col-last odd-row-color"><code>80</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.STOP">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>STOP</code></div>
-<div class="col-last even-row-color"><code>26</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.STRING_LITERAL">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>STRING_LITERAL</code></div>
-<div class="col-last odd-row-color"><code>94</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.SWITCH">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>SWITCH</code></div>
-<div class="col-last even-row-color"><code>14</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.TERMINATING_EXCLAM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>TERMINATING_EXCLAM</code></div>
-<div class="col-last odd-row-color"><code>154</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.TERMINATING_WHITESPACE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>TERMINATING_WHITESPACE</code></div>
-<div class="col-last even-row-color"><code>153</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.TERSE_COMMENT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>TERSE_COMMENT</code></div>
-<div class="col-last odd-row-color"><code>35</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.TERSE_COMMENT_END">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>TERSE_COMMENT_END</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.RAW_STRING">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>RAW_STRING</code></div>
+<div class="col-last odd-row-color"><code>95</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.RECOVER">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>RECOVER</code></div>
+<div class="col-last even-row-color"><code>7</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.RECURSE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>RECURSE</code></div>
+<div class="col-last odd-row-color"><code>69</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.RETURN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>RETURN</code></div>
+<div class="col-last even-row-color"><code>27</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.RTRIM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>RTRIM</code></div>
+<div class="col-last odd-row-color"><code>63</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.SEMICOLON">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>SEMICOLON</code></div>
+<div class="col-last even-row-color"><code>133</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.SEP">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>SEP</code></div>
+<div class="col-last odd-row-color"><code>12</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.SETTING">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>SETTING</code></div>
+<div class="col-last even-row-color"><code>29</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.SIMPLE_NESTED">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>SIMPLE_NESTED</code></div>
+<div class="col-last odd-row-color"><code>66</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.SIMPLE_RECURSE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>SIMPLE_RECURSE</code></div>
+<div class="col-last even-row-color"><code>68</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.SIMPLE_RETURN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>SIMPLE_RETURN</code></div>
+<div class="col-last odd-row-color"><code>58</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.SQUARE_BRACKET_INTERPOLATION_OPENING">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>SQUARE_BRACKET_INTERPOLATION_OPENING</code></div>
+<div class="col-last even-row-color"><code>85</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.START_TAG">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>START_TAG</code></div>
+<div class="col-last odd-row-color"><code>2</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.STATIC_TEXT_FALSE_ALARM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>STATIC_TEXT_FALSE_ALARM</code></div>
+<div class="col-last even-row-color"><code>82</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.STATIC_TEXT_NON_WS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>STATIC_TEXT_NON_WS</code></div>
+<div class="col-last odd-row-color"><code>81</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.STATIC_TEXT_WS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>STATIC_TEXT_WS</code></div>
+<div class="col-last even-row-color"><code>80</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.STOP">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>STOP</code></div>
+<div class="col-last odd-row-color"><code>26</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.STRING_LITERAL">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>STRING_LITERAL</code></div>
+<div class="col-last even-row-color"><code>94</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.SWITCH">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>SWITCH</code></div>
+<div class="col-last odd-row-color"><code>14</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.TERMINATING_EXCLAM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>TERMINATING_EXCLAM</code></div>
 <div class="col-last even-row-color"><code>155</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.TIMES">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>TIMES</code></div>
-<div class="col-last odd-row-color"><code>123</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.TIMES_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>TIMES_EQUALS</code></div>
-<div class="col-last even-row-color"><code>111</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.TRANSFORM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>TRANSFORM</code></div>
-<div class="col-last odd-row-color"><code>24</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.TRIM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>TRIM</code></div>
-<div class="col-last even-row-color"><code>61</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.TRIVIAL_FTL_HEADER">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>TRIVIAL_FTL_HEADER</code></div>
-<div class="col-last odd-row-color"><code>78</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.TRUE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>TRUE</code></div>
-<div class="col-last even-row-color"><code>97</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.UNIFIED_CALL">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>UNIFIED_CALL</code></div>
-<div class="col-last odd-row-color"><code>75</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.UNIFIED_CALL_END">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>UNIFIED_CALL_END</code></div>
-<div class="col-last even-row-color"><code>76</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.UNKNOWN_DIRECTIVE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>UNKNOWN_DIRECTIVE</code></div>
-<div class="col-last odd-row-color"><code>79</code></div>
-<div class="col-first even-row-color"><code id="freemarker.core.ParseException.USING">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>USING</code></div>
-<div class="col-last even-row-color"><code>142</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.VISIT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>VISIT</code></div>
-<div class="col-last odd-row-color"><code>25</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.TERMINATING_WHITESPACE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>TERMINATING_WHITESPACE</code></div>
+<div class="col-last odd-row-color"><code>154</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.TERSE_COMMENT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>TERSE_COMMENT</code></div>
+<div class="col-last even-row-color"><code>35</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.TERSE_COMMENT_END">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>TERSE_COMMENT_END</code></div>
+<div class="col-last odd-row-color"><code>156</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.TIMES">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>TIMES</code></div>
+<div class="col-last even-row-color"><code>124</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.TIMES_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>TIMES_EQUALS</code></div>
+<div class="col-last odd-row-color"><code>112</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.TRANSFORM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>TRANSFORM</code></div>
+<div class="col-last even-row-color"><code>24</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.TRIM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>TRIM</code></div>
+<div class="col-last odd-row-color"><code>61</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.TRIVIAL_FTL_HEADER">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>TRIVIAL_FTL_HEADER</code></div>
+<div class="col-last even-row-color"><code>78</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.TRUE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>TRUE</code></div>
+<div class="col-last odd-row-color"><code>97</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.UNIFIED_CALL">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>UNIFIED_CALL</code></div>
+<div class="col-last even-row-color"><code>75</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.UNIFIED_CALL_END">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>UNIFIED_CALL_END</code></div>
+<div class="col-last odd-row-color"><code>76</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.UNKNOWN_DIRECTIVE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>UNKNOWN_DIRECTIVE</code></div>
+<div class="col-last even-row-color"><code>79</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.core.ParseException.USING">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>USING</code></div>
+<div class="col-last odd-row-color"><code>143</code></div>
+<div class="col-first even-row-color"><code id="freemarker.core.ParseException.VISIT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>VISIT</code></div>
+<div class="col-last even-row-color"><code>25</code></div>
 </div>
 </li>
 <li>
@@ -954,72 +956,6 @@ loadScripts(document, 'script');</script>
 </li>
 </ul>
 </section>
-<section class="constants-summary" id="freemarker.debug">
-<h2 title="freemarker.debug">freemarker.debug.*</h2>
-<ul class="block-list">
-<li>
-<div class="caption"><span>freemarker.debug.<a href="freemarker/debug/Debugger.html" title="interface in freemarker.debug">Debugger</a></span></div>
-<div class="summary-table three-column-summary">
-<div class="table-header col-first">Modifier and Type</div>
-<div class="table-header col-second">Constant Field</div>
-<div class="table-header col-last">Value</div>
-<div class="col-first even-row-color"><code id="freemarker.debug.Debugger.DEFAULT_PORT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code><a href="freemarker/debug/Debugger.html#DEFAULT_PORT">DEFAULT_PORT</a></code></div>
-<div class="col-last even-row-color"><code>7011</code></div>
-</div>
-</li>
-<li>
-<div class="caption"><span>freemarker.debug.<a href="freemarker/debug/DebugModel.html" title="interface in freemarker.debug">DebugModel</a></span></div>
-<div class="summary-table three-column-summary">
-<div class="table-header col-first">Modifier and Type</div>
-<div class="table-header col-second">Constant Field</div>
-<div class="table-header col-last">Value</div>
-<div class="col-first even-row-color"><code id="freemarker.debug.DebugModel.TYPE_BOOLEAN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code><a href="freemarker/debug/DebugModel.html#TYPE_BOOLEAN">TYPE_BOOLEAN</a></code></div>
-<div class="col-last even-row-color"><code>8</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.debug.DebugModel.TYPE_COLLECTION">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code><a href="freemarker/debug/DebugModel.html#TYPE_COLLECTION">TYPE_COLLECTION</a></code></div>
-<div class="col-last odd-row-color"><code>32</code></div>
-<div class="col-first even-row-color"><code id="freemarker.debug.DebugModel.TYPE_CONFIGURATION">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code><a href="freemarker/debug/DebugModel.html#TYPE_CONFIGURATION">TYPE_CONFIGURATION</a></code></div>
-<div class="col-last even-row-color"><code>8192</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.debug.DebugModel.TYPE_DATE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code><a href="freemarker/debug/DebugModel.html#TYPE_DATE">TYPE_DATE</a></code></div>
-<div class="col-last odd-row-color"><code>4</code></div>
-<div class="col-first even-row-color"><code id="freemarker.debug.DebugModel.TYPE_ENVIRONMENT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code><a href="freemarker/debug/DebugModel.html#TYPE_ENVIRONMENT">TYPE_ENVIRONMENT</a></code></div>
-<div class="col-last even-row-color"><code>2048</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.debug.DebugModel.TYPE_HASH">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code><a href="freemarker/debug/DebugModel.html#TYPE_HASH">TYPE_HASH</a></code></div>
-<div class="col-last odd-row-color"><code>64</code></div>
-<div class="col-first even-row-color"><code id="freemarker.debug.DebugModel.TYPE_HASH_EX">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code><a href="freemarker/debug/DebugModel.html#TYPE_HASH_EX">TYPE_HASH_EX</a></code></div>
-<div class="col-last even-row-color"><code>128</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.debug.DebugModel.TYPE_METHOD">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code><a href="freemarker/debug/DebugModel.html#TYPE_METHOD">TYPE_METHOD</a></code></div>
-<div class="col-last odd-row-color"><code>256</code></div>
-<div class="col-first even-row-color"><code id="freemarker.debug.DebugModel.TYPE_METHOD_EX">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code><a href="freemarker/debug/DebugModel.html#TYPE_METHOD_EX">TYPE_METHOD_EX</a></code></div>
-<div class="col-last even-row-color"><code>512</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.debug.DebugModel.TYPE_NUMBER">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code><a href="freemarker/debug/DebugModel.html#TYPE_NUMBER">TYPE_NUMBER</a></code></div>
-<div class="col-last odd-row-color"><code>2</code></div>
-<div class="col-first even-row-color"><code id="freemarker.debug.DebugModel.TYPE_SCALAR">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code><a href="freemarker/debug/DebugModel.html#TYPE_SCALAR">TYPE_SCALAR</a></code></div>
-<div class="col-last even-row-color"><code>1</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.debug.DebugModel.TYPE_SEQUENCE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code><a href="freemarker/debug/DebugModel.html#TYPE_SEQUENCE">TYPE_SEQUENCE</a></code></div>
-<div class="col-last odd-row-color"><code>16</code></div>
-<div class="col-first even-row-color"><code id="freemarker.debug.DebugModel.TYPE_TEMPLATE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code><a href="freemarker/debug/DebugModel.html#TYPE_TEMPLATE">TYPE_TEMPLATE</a></code></div>
-<div class="col-last even-row-color"><code>4096</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.debug.DebugModel.TYPE_TRANSFORM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code><a href="freemarker/debug/DebugModel.html#TYPE_TRANSFORM">TYPE_TRANSFORM</a></code></div>
-<div class="col-last odd-row-color"><code>1024</code></div>
-</div>
-</li>
-</ul>
-</section>
 <section class="constants-summary" id="freemarker.ext">
 <h2 title="freemarker.ext">freemarker.ext.*</h2>
 <ul class="block-list">
@@ -1601,13 +1537,13 @@ loadScripts(document, 'script');</script>
 <div class="col-last even-row-color"><code>20</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.AND">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>AND</code></div>
-<div class="col-last odd-row-color"><code>128</code></div>
+<div class="col-last odd-row-color"><code>129</code></div>
 <div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.AS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>AS</code></div>
-<div class="col-last even-row-color"><code>141</code></div>
+<div class="col-last even-row-color"><code>142</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.ASCII_DIGIT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>ASCII_DIGIT</code></div>
-<div class="col-last odd-row-color"><code>148</code></div>
+<div class="col-last odd-row-color"><code>149</code></div>
 <div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.ASSIGN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>ASSIGN</code></div>
 <div class="col-last even-row-color"><code>17</code></div>
@@ -1625,7 +1561,7 @@ loadScripts(document, 'script');</script>
 <div class="col-last even-row-color"><code>56</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.BUILT_IN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>BUILT_IN</code></div>
-<div class="col-last odd-row-color"><code>104</code></div>
+<div class="col-last odd-row-color"><code>105</code></div>
 <div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.CALL">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>CALL</code></div>
 <div class="col-last even-row-color"><code>28</code></div>
@@ -1634,10 +1570,10 @@ loadScripts(document, 'script');</script>
 <div class="col-last odd-row-color"><code>15</code></div>
 <div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.CLOSE_BRACKET">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>CLOSE_BRACKET</code></div>
-<div class="col-last even-row-color"><code>135</code></div>
+<div class="col-last even-row-color"><code>136</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.CLOSE_PAREN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>CLOSE_PAREN</code></div>
-<div class="col-last odd-row-color"><code>137</code></div>
+<div class="col-last odd-row-color"><code>138</code></div>
 <div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.CLOSE_TAG1">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>CLOSE_TAG1</code></div>
 <div class="col-last even-row-color"><code>4</code></div>
@@ -1646,13 +1582,13 @@ loadScripts(document, 'script');</script>
 <div class="col-last odd-row-color"><code>5</code></div>
 <div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.CLOSING_CURLY_BRACKET">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>CLOSING_CURLY_BRACKET</code></div>
-<div class="col-last even-row-color"><code>139</code></div>
+<div class="col-last even-row-color"><code>140</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.COLON">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>COLON</code></div>
-<div class="col-last odd-row-color"><code>133</code></div>
+<div class="col-last odd-row-color"><code>134</code></div>
 <div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.COMMA">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>COMMA</code></div>
-<div class="col-last even-row-color"><code>131</code></div>
+<div class="col-last even-row-color"><code>132</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.COMMENT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>COMMENT</code></div>
 <div class="col-last odd-row-color"><code>34</code></div>
@@ -1673,37 +1609,37 @@ loadScripts(document, 'script');</script>
 <div class="col-last even-row-color"><code>0</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.DIRECTIVE_END">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>DIRECTIVE_END</code></div>
-<div class="col-last odd-row-color"><code>149</code></div>
+<div class="col-last odd-row-color"><code>150</code></div>
 <div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.DIV_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>DIV_EQUALS</code></div>
-<div class="col-last even-row-color"><code>112</code></div>
+<div class="col-last even-row-color"><code>113</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.DIVIDE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>DIVIDE</code></div>
-<div class="col-last odd-row-color"><code>126</code></div>
+<div class="col-last odd-row-color"><code>127</code></div>
 <div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.DOLLAR_INTERPOLATION_OPENING">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>DOLLAR_INTERPOLATION_OPENING</code></div>
 <div class="col-last even-row-color"><code>83</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.DOT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>DOT</code></div>
-<div class="col-last odd-row-color"><code>100</code></div>
+<div class="col-last odd-row-color"><code>101</code></div>
 <div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.DOT_DOT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>DOT_DOT</code></div>
-<div class="col-last even-row-color"><code>101</code></div>
+<div class="col-last even-row-color"><code>102</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.DOT_DOT_ASTERISK">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>DOT_DOT_ASTERISK</code></div>
-<div class="col-last odd-row-color"><code>103</code></div>
+<div class="col-last odd-row-color"><code>104</code></div>
 <div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.DOT_DOT_LESS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>DOT_DOT_LESS</code></div>
-<div class="col-last even-row-color"><code>102</code></div>
+<div class="col-last even-row-color"><code>103</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.DOUBLE_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>DOUBLE_EQUALS</code></div>
-<div class="col-last odd-row-color"><code>107</code></div>
+<div class="col-last odd-row-color"><code>108</code></div>
 <div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.DOUBLE_STAR">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>DOUBLE_STAR</code></div>
-<div class="col-last even-row-color"><code>124</code></div>
+<div class="col-last even-row-color"><code>125</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.ELLIPSIS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>ELLIPSIS</code></div>
-<div class="col-last odd-row-color"><code>125</code></div>
+<div class="col-last odd-row-color"><code>126</code></div>
 <div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.ELSE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>ELSE</code></div>
 <div class="col-last even-row-color"><code>55</code></div>
@@ -1712,7 +1648,7 @@ loadScripts(document, 'script');</script>
 <div class="col-last odd-row-color"><code>9</code></div>
 <div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.EMPTY_DIRECTIVE_END">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>EMPTY_DIRECTIVE_END</code></div>
-<div class="col-last even-row-color"><code>150</code></div>
+<div class="col-last even-row-color"><code>151</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.END_ASSIGN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>END_ASSIGN</code></div>
 <div class="col-last odd-row-color"><code>46</code></div>
@@ -1781,7 +1717,7 @@ loadScripts(document, 'script');</script>
 <div class="col-last even-row-color"><code>0</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>EQUALS</code></div>
-<div class="col-last odd-row-color"><code>106</code></div>
+<div class="col-last odd-row-color"><code>107</code></div>
 <div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.ESCAPE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>ESCAPE</code></div>
 <div class="col-last even-row-color"><code>71</code></div>
@@ -1790,19 +1726,19 @@ loadScripts(document, 'script');</script>
 <div class="col-last odd-row-color"><code>93</code></div>
 <div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.ESCAPED_GT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>ESCAPED_GT</code></div>
-<div class="col-last even-row-color"><code>118</code></div>
+<div class="col-last even-row-color"><code>119</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.ESCAPED_GTE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>ESCAPED_GTE</code></div>
-<div class="col-last odd-row-color"><code>119</code></div>
+<div class="col-last odd-row-color"><code>120</code></div>
 <div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.ESCAPED_ID_CHAR">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>ESCAPED_ID_CHAR</code></div>
-<div class="col-last even-row-color"><code>146</code></div>
+<div class="col-last even-row-color"><code>147</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.EXCLAM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>EXCLAM</code></div>
-<div class="col-last odd-row-color"><code>130</code></div>
+<div class="col-last odd-row-color"><code>131</code></div>
 <div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.EXISTS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code>EXISTS</code></div>
-<div class="col-last even-row-color"><code>105</code></div>
+<div class="col-last even-row-color"><code>106</code></div>
 <div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.EXPRESSION_COMMENT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>EXPRESSION_COMMENT</code></div>
 <div class="col-last odd-row-color"><code>5</code></div>
@@ -1836,246 +1772,249 @@ loadScripts(document, 'script');</script>
 <div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.HASH_INTERPOLATION_OPENING">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second odd-row-color"><code>HASH_INTERPOLATION_OPENING</code></div>
 <div class="col-last odd-row-color"><code>84</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.ID">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>ID</code></div>
-<div class="col-last even-row-color"><code>143</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.ID_START_CHAR">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>ID_START_CHAR</code></div>
-<div class="col-last odd-row-color"><code>147</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.IF">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>IF</code></div>
-<div class="col-last even-row-color"><code>8</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.IMPORT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>IMPORT</code></div>
-<div class="col-last odd-row-color"><code>21</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.IN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>IN</code></div>
-<div class="col-last even-row-color"><code>140</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.IN_PAREN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>IN_PAREN</code></div>
-<div class="col-last odd-row-color"><code>3</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.INTEGER">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>INTEGER</code></div>
-<div class="col-last even-row-color"><code>98</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.ITEMS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>ITEMS</code></div>
-<div class="col-last odd-row-color"><code>11</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.KEEP_GOING">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>KEEP_GOING</code></div>
-<div class="col-last even-row-color"><code>157</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.LAMBDA_ARROW">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>LAMBDA_ARROW</code></div>
-<div class="col-last odd-row-color"><code>120</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.LESS_THAN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>LESS_THAN</code></div>
-<div class="col-last even-row-color"><code>116</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.LESS_THAN_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>LESS_THAN_EQUALS</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.HEX_INTEGER">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>HEX_INTEGER</code></div>
+<div class="col-last even-row-color"><code>100</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.ID">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>ID</code></div>
+<div class="col-last odd-row-color"><code>144</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.ID_START_CHAR">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>ID_START_CHAR</code></div>
+<div class="col-last even-row-color"><code>148</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.IF">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>IF</code></div>
+<div class="col-last odd-row-color"><code>8</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.IMPORT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>IMPORT</code></div>
+<div class="col-last even-row-color"><code>21</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.IN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>IN</code></div>
+<div class="col-last odd-row-color"><code>141</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.IN_PAREN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>IN_PAREN</code></div>
+<div class="col-last even-row-color"><code>3</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.INTEGER">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>INTEGER</code></div>
+<div class="col-last odd-row-color"><code>98</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.ITEMS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>ITEMS</code></div>
+<div class="col-last even-row-color"><code>11</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.KEEP_GOING">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>KEEP_GOING</code></div>
+<div class="col-last odd-row-color"><code>158</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.LAMBDA_ARROW">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>LAMBDA_ARROW</code></div>
+<div class="col-last even-row-color"><code>121</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.LESS_THAN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>LESS_THAN</code></div>
 <div class="col-last odd-row-color"><code>117</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.LIST">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>LIST</code></div>
-<div class="col-last even-row-color"><code>10</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.LOCALASSIGN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>LOCALASSIGN</code></div>
-<div class="col-last odd-row-color"><code>19</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.LONE_LESS_THAN_OR_DASH">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>LONE_LESS_THAN_OR_DASH</code></div>
-<div class="col-last even-row-color"><code>158</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.LTRIM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>LTRIM</code></div>
-<div class="col-last odd-row-color"><code>62</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.MACRO">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>MACRO</code></div>
-<div class="col-last even-row-color"><code>23</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.MAYBE_END">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>MAYBE_END</code></div>
-<div class="col-last odd-row-color"><code>156</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.MINUS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>MINUS</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.LESS_THAN_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>LESS_THAN_EQUALS</code></div>
+<div class="col-last even-row-color"><code>118</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.LIST">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>LIST</code></div>
+<div class="col-last odd-row-color"><code>10</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.LOCALASSIGN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>LOCALASSIGN</code></div>
+<div class="col-last even-row-color"><code>19</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.LONE_LESS_THAN_OR_DASH">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>LONE_LESS_THAN_OR_DASH</code></div>
+<div class="col-last odd-row-color"><code>159</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.LTRIM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>LTRIM</code></div>
+<div class="col-last even-row-color"><code>62</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.MACRO">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>MACRO</code></div>
+<div class="col-last odd-row-color"><code>23</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.MAYBE_END">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>MAYBE_END</code></div>
+<div class="col-last even-row-color"><code>157</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.MINUS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>MINUS</code></div>
+<div class="col-last odd-row-color"><code>123</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.MINUS_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>MINUS_EQUALS</code></div>
+<div class="col-last even-row-color"><code>111</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.MINUS_MINUS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>MINUS_MINUS</code></div>
+<div class="col-last odd-row-color"><code>116</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.MOD_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>MOD_EQUALS</code></div>
+<div class="col-last even-row-color"><code>114</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.NAMED_PARAMETER_EXPRESSION">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>NAMED_PARAMETER_EXPRESSION</code></div>
+<div class="col-last odd-row-color"><code>4</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.NATURAL_GT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>NATURAL_GT</code></div>
+<div class="col-last even-row-color"><code>152</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.NATURAL_GTE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>NATURAL_GTE</code></div>
+<div class="col-last odd-row-color"><code>153</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.NESTED">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>NESTED</code></div>
+<div class="col-last even-row-color"><code>67</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.NO_DIRECTIVE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>NO_DIRECTIVE</code></div>
+<div class="col-last odd-row-color"><code>1</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.NO_PARSE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>NO_PARSE</code></div>
+<div class="col-last even-row-color"><code>7</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.NO_SPACE_EXPRESSION">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>NO_SPACE_EXPRESSION</code></div>
+<div class="col-last odd-row-color"><code>6</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.NOAUTOESC">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>NOAUTOESC</code></div>
+<div class="col-last even-row-color"><code>32</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.NOESCAPE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>NOESCAPE</code></div>
+<div class="col-last odd-row-color"><code>73</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.NON_ESCAPED_ID_START_CHAR">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>NON_ESCAPED_ID_START_CHAR</code></div>
+<div class="col-last even-row-color"><code>146</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.NOPARSE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>NOPARSE</code></div>
+<div class="col-last odd-row-color"><code>36</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.NOT_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>NOT_EQUALS</code></div>
+<div class="col-last even-row-color"><code>109</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.NOTRIM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>NOTRIM</code></div>
+<div class="col-last odd-row-color"><code>64</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.ON">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>ON</code></div>
+<div class="col-last even-row-color"><code>16</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.OPEN_BRACKET">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>OPEN_BRACKET</code></div>
+<div class="col-last odd-row-color"><code>135</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.OPEN_MISPLACED_INTERPOLATION">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>OPEN_MISPLACED_INTERPOLATION</code></div>
+<div class="col-last even-row-color"><code>145</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.OPEN_PAREN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>OPEN_PAREN</code></div>
+<div class="col-last odd-row-color"><code>137</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.OPENING_CURLY_BRACKET">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>OPENING_CURLY_BRACKET</code></div>
+<div class="col-last even-row-color"><code>139</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.OR">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>OR</code></div>
+<div class="col-last odd-row-color"><code>130</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.OUTPUTFORMAT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>OUTPUTFORMAT</code></div>
+<div class="col-last even-row-color"><code>30</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.PERCENT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>PERCENT</code></div>
+<div class="col-last odd-row-color"><code>128</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.PLUS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>PLUS</code></div>
 <div class="col-last even-row-color"><code>122</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.MINUS_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>MINUS_EQUALS</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.PLUS_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>PLUS_EQUALS</code></div>
 <div class="col-last odd-row-color"><code>110</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.MINUS_MINUS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>MINUS_MINUS</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.PLUS_PLUS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>PLUS_PLUS</code></div>
 <div class="col-last even-row-color"><code>115</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.MOD_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>MOD_EQUALS</code></div>
-<div class="col-last odd-row-color"><code>113</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.NAMED_PARAMETER_EXPRESSION">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>NAMED_PARAMETER_EXPRESSION</code></div>
-<div class="col-last even-row-color"><code>4</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.NATURAL_GT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>NATURAL_GT</code></div>
-<div class="col-last odd-row-color"><code>151</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.NATURAL_GTE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>NATURAL_GTE</code></div>
-<div class="col-last even-row-color"><code>152</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.NESTED">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>NESTED</code></div>
-<div class="col-last odd-row-color"><code>67</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.NO_DIRECTIVE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>NO_DIRECTIVE</code></div>
-<div class="col-last even-row-color"><code>1</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.NO_PARSE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>NO_PARSE</code></div>
-<div class="col-last odd-row-color"><code>7</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.NO_SPACE_EXPRESSION">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>NO_SPACE_EXPRESSION</code></div>
-<div class="col-last even-row-color"><code>6</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.NOAUTOESC">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>NOAUTOESC</code></div>
-<div class="col-last odd-row-color"><code>32</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.NOESCAPE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>NOESCAPE</code></div>
-<div class="col-last even-row-color"><code>73</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.NON_ESCAPED_ID_START_CHAR">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>NON_ESCAPED_ID_START_CHAR</code></div>
-<div class="col-last odd-row-color"><code>145</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.NOPARSE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>NOPARSE</code></div>
-<div class="col-last even-row-color"><code>36</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.NOT_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>NOT_EQUALS</code></div>
-<div class="col-last odd-row-color"><code>108</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.NOTRIM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>NOTRIM</code></div>
-<div class="col-last even-row-color"><code>64</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.ON">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>ON</code></div>
-<div class="col-last odd-row-color"><code>16</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.OPEN_BRACKET">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>OPEN_BRACKET</code></div>
-<div class="col-last even-row-color"><code>134</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.OPEN_MISPLACED_INTERPOLATION">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>OPEN_MISPLACED_INTERPOLATION</code></div>
-<div class="col-last odd-row-color"><code>144</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.OPEN_PAREN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>OPEN_PAREN</code></div>
-<div class="col-last even-row-color"><code>136</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.OPENING_CURLY_BRACKET">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>OPENING_CURLY_BRACKET</code></div>
-<div class="col-last odd-row-color"><code>138</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.OR">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>OR</code></div>
-<div class="col-last even-row-color"><code>129</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.OUTPUTFORMAT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>OUTPUTFORMAT</code></div>
-<div class="col-last odd-row-color"><code>30</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.PERCENT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>PERCENT</code></div>
-<div class="col-last even-row-color"><code>127</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.PLUS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>PLUS</code></div>
-<div class="col-last odd-row-color"><code>121</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.PLUS_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>PLUS_EQUALS</code></div>
-<div class="col-last even-row-color"><code>109</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.PLUS_PLUS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>PLUS_PLUS</code></div>
-<div class="col-last odd-row-color"><code>114</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.RAW_STRING">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>RAW_STRING</code></div>
-<div class="col-last even-row-color"><code>95</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.RECOVER">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>RECOVER</code></div>
-<div class="col-last odd-row-color"><code>7</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.RECURSE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>RECURSE</code></div>
-<div class="col-last even-row-color"><code>69</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.RETURN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>RETURN</code></div>
-<div class="col-last odd-row-color"><code>27</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.RTRIM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>RTRIM</code></div>
-<div class="col-last even-row-color"><code>63</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.SEMICOLON">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>SEMICOLON</code></div>
-<div class="col-last odd-row-color"><code>132</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.SEP">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>SEP</code></div>
-<div class="col-last even-row-color"><code>12</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.SETTING">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>SETTING</code></div>
-<div class="col-last odd-row-color"><code>29</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.SIMPLE_NESTED">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>SIMPLE_NESTED</code></div>
-<div class="col-last even-row-color"><code>66</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.SIMPLE_RECURSE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>SIMPLE_RECURSE</code></div>
-<div class="col-last odd-row-color"><code>68</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.SIMPLE_RETURN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>SIMPLE_RETURN</code></div>
-<div class="col-last even-row-color"><code>58</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.SQUARE_BRACKET_INTERPOLATION_OPENING">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>SQUARE_BRACKET_INTERPOLATION_OPENING</code></div>
-<div class="col-last odd-row-color"><code>85</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.START_TAG">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>START_TAG</code></div>
-<div class="col-last even-row-color"><code>2</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.STATIC_TEXT_FALSE_ALARM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>STATIC_TEXT_FALSE_ALARM</code></div>
-<div class="col-last odd-row-color"><code>82</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.STATIC_TEXT_NON_WS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>STATIC_TEXT_NON_WS</code></div>
-<div class="col-last even-row-color"><code>81</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.STATIC_TEXT_WS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>STATIC_TEXT_WS</code></div>
-<div class="col-last odd-row-color"><code>80</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.STOP">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>STOP</code></div>
-<div class="col-last even-row-color"><code>26</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.STRING_LITERAL">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>STRING_LITERAL</code></div>
-<div class="col-last odd-row-color"><code>94</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.SWITCH">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>SWITCH</code></div>
-<div class="col-last even-row-color"><code>14</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.TERMINATING_EXCLAM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>TERMINATING_EXCLAM</code></div>
-<div class="col-last odd-row-color"><code>154</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.TERMINATING_WHITESPACE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>TERMINATING_WHITESPACE</code></div>
-<div class="col-last even-row-color"><code>153</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.TERSE_COMMENT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>TERSE_COMMENT</code></div>
-<div class="col-last odd-row-color"><code>35</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.TERSE_COMMENT_END">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>TERSE_COMMENT_END</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.RAW_STRING">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>RAW_STRING</code></div>
+<div class="col-last odd-row-color"><code>95</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.RECOVER">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>RECOVER</code></div>
+<div class="col-last even-row-color"><code>7</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.RECURSE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>RECURSE</code></div>
+<div class="col-last odd-row-color"><code>69</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.RETURN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>RETURN</code></div>
+<div class="col-last even-row-color"><code>27</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.RTRIM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>RTRIM</code></div>
+<div class="col-last odd-row-color"><code>63</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.SEMICOLON">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>SEMICOLON</code></div>
+<div class="col-last even-row-color"><code>133</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.SEP">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>SEP</code></div>
+<div class="col-last odd-row-color"><code>12</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.SETTING">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>SETTING</code></div>
+<div class="col-last even-row-color"><code>29</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.SIMPLE_NESTED">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>SIMPLE_NESTED</code></div>
+<div class="col-last odd-row-color"><code>66</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.SIMPLE_RECURSE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>SIMPLE_RECURSE</code></div>
+<div class="col-last even-row-color"><code>68</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.SIMPLE_RETURN">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>SIMPLE_RETURN</code></div>
+<div class="col-last odd-row-color"><code>58</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.SQUARE_BRACKET_INTERPOLATION_OPENING">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>SQUARE_BRACKET_INTERPOLATION_OPENING</code></div>
+<div class="col-last even-row-color"><code>85</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.START_TAG">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>START_TAG</code></div>
+<div class="col-last odd-row-color"><code>2</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.STATIC_TEXT_FALSE_ALARM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>STATIC_TEXT_FALSE_ALARM</code></div>
+<div class="col-last even-row-color"><code>82</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.STATIC_TEXT_NON_WS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>STATIC_TEXT_NON_WS</code></div>
+<div class="col-last odd-row-color"><code>81</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.STATIC_TEXT_WS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>STATIC_TEXT_WS</code></div>
+<div class="col-last even-row-color"><code>80</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.STOP">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>STOP</code></div>
+<div class="col-last odd-row-color"><code>26</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.STRING_LITERAL">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>STRING_LITERAL</code></div>
+<div class="col-last even-row-color"><code>94</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.SWITCH">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>SWITCH</code></div>
+<div class="col-last odd-row-color"><code>14</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.TERMINATING_EXCLAM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>TERMINATING_EXCLAM</code></div>
 <div class="col-last even-row-color"><code>155</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.TIMES">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>TIMES</code></div>
-<div class="col-last odd-row-color"><code>123</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.TIMES_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>TIMES_EQUALS</code></div>
-<div class="col-last even-row-color"><code>111</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.TRANSFORM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>TRANSFORM</code></div>
-<div class="col-last odd-row-color"><code>24</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.TRIM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>TRIM</code></div>
-<div class="col-last even-row-color"><code>61</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.TRIVIAL_FTL_HEADER">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>TRIVIAL_FTL_HEADER</code></div>
-<div class="col-last odd-row-color"><code>78</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.TRUE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>TRUE</code></div>
-<div class="col-last even-row-color"><code>97</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.UNIFIED_CALL">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>UNIFIED_CALL</code></div>
-<div class="col-last odd-row-color"><code>75</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.UNIFIED_CALL_END">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>UNIFIED_CALL_END</code></div>
-<div class="col-last even-row-color"><code>76</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.UNKNOWN_DIRECTIVE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>UNKNOWN_DIRECTIVE</code></div>
-<div class="col-last odd-row-color"><code>79</code></div>
-<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.USING">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second even-row-color"><code>USING</code></div>
-<div class="col-last even-row-color"><code>142</code></div>
-<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.VISIT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
-<div class="col-second odd-row-color"><code>VISIT</code></div>
-<div class="col-last odd-row-color"><code>25</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.TERMINATING_WHITESPACE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>TERMINATING_WHITESPACE</code></div>
+<div class="col-last odd-row-color"><code>154</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.TERSE_COMMENT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>TERSE_COMMENT</code></div>
+<div class="col-last even-row-color"><code>35</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.TERSE_COMMENT_END">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>TERSE_COMMENT_END</code></div>
+<div class="col-last odd-row-color"><code>156</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.TIMES">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>TIMES</code></div>
+<div class="col-last even-row-color"><code>124</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.TIMES_EQUALS">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>TIMES_EQUALS</code></div>
+<div class="col-last odd-row-color"><code>112</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.TRANSFORM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>TRANSFORM</code></div>
+<div class="col-last even-row-color"><code>24</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.TRIM">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>TRIM</code></div>
+<div class="col-last odd-row-color"><code>61</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.TRIVIAL_FTL_HEADER">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>TRIVIAL_FTL_HEADER</code></div>
+<div class="col-last even-row-color"><code>78</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.TRUE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>TRUE</code></div>
+<div class="col-last odd-row-color"><code>97</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.UNIFIED_CALL">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>UNIFIED_CALL</code></div>
+<div class="col-last even-row-color"><code>75</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.UNIFIED_CALL_END">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>UNIFIED_CALL_END</code></div>
+<div class="col-last odd-row-color"><code>76</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.UNKNOWN_DIRECTIVE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>UNKNOWN_DIRECTIVE</code></div>
+<div class="col-last even-row-color"><code>79</code></div>
+<div class="col-first odd-row-color"><code id="freemarker.template.Template.WrongEncodingException.USING">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second odd-row-color"><code>USING</code></div>
+<div class="col-last odd-row-color"><code>143</code></div>
+<div class="col-first even-row-color"><code id="freemarker.template.Template.WrongEncodingException.VISIT">public&nbsp;static&nbsp;final&nbsp;int</code></div>
+<div class="col-second even-row-color"><code>VISIT</code></div>
+<div class="col-last even-row-color"><code>25</code></div>
 </div>
 </li>
 <li>
diff --git a/docs/api/deprecated-list.html b/docs/api/deprecated-list.html
index fff0efbc..aef9f71e 100644
--- a/docs/api/deprecated-list.html
+++ b/docs/api/deprecated-list.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>Deprecated List (FreeMarker 2.3.34 API)</title>
+<title>Deprecated List (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="deprecated elements">
@@ -84,25 +84,17 @@ loadScripts(document, 'script');</script>
 <div class="summary-table two-column-summary">
 <div class="table-header col-first">Class</div>
 <div class="table-header col-last">Description</div>
-<div class="col-deprecated-item-name even-row-color"><a href="freemarker/core/CommandLine.html" title="class in freemarker.core">freemarker.core.CommandLine</a></div>
+<div class="col-deprecated-item-name even-row-color"><a href="freemarker/core/FreeMarkerTree.html" title="class in freemarker.core">freemarker.core.FreeMarkerTree</a></div>
 <div class="col-last even-row-color">
-<div class="deprecation-comment">Will be removed (main method in a library, often classified as CWE-489 "Leftover Debug Code").</div>
-</div>
-<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/core/FreeMarkerTree.html" title="class in freemarker.core">freemarker.core.FreeMarkerTree</a></div>
-<div class="col-last odd-row-color">
 <div class="deprecation-comment">Will be removed, as Swing classes aren't accessible on Google App Engine.</div>
 </div>
-<div class="col-deprecated-item-name even-row-color"><a href="freemarker/ext/ant/FreemarkerXmlTask.html" title="class in freemarker.ext.ant">freemarker.ext.ant.FreemarkerXmlTask</a></div>
-<div class="col-last even-row-color">
-<div class="deprecation-comment"><a href="http://fmpp.sourceforge.net">FMPP</a> is a more complete solution.</div>
-</div>
-<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/ext/beans/StringModel.html" title="class in freemarker.ext.beans">freemarker.ext.beans.StringModel</a></div>
+<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/ext/ant/FreemarkerXmlTask.html" title="class in freemarker.ext.ant">freemarker.ext.ant.FreemarkerXmlTask</a></div>
 <div class="col-last odd-row-color">
-<div class="deprecation-comment">Use <a href="freemarker/ext/beans/GenericObjectModel.html" title="class in freemarker.ext.beans"><code>GenericObjectModel</code></a> instead, which implements <a href="freemarker/template/MethodCallAwareTemplateHashModel.html" title="interface in freemarker.template"><code>MethodCallAwareTemplateHashModel</code></a>.</div>
+<div class="deprecation-comment"><a href="http://fmpp.sourceforge.net">FMPP</a> is a more complete solution.</div>
 </div>
-<div class="col-deprecated-item-name even-row-color"><a href="freemarker/ext/dom/Transform.html" title="class in freemarker.ext.dom">freemarker.ext.dom.Transform</a></div>
+<div class="col-deprecated-item-name even-row-color"><a href="freemarker/ext/beans/StringModel.html" title="class in freemarker.ext.beans">freemarker.ext.beans.StringModel</a></div>
 <div class="col-last even-row-color">
-<div class="deprecation-comment">Will be removed (main method in a library, often classified as CWE-489 "Leftover Debug Code").</div>
+<div class="deprecation-comment">Use <a href="freemarker/ext/beans/GenericObjectModel.html" title="class in freemarker.ext.beans"><code>GenericObjectModel</code></a> instead, which implements <a href="freemarker/template/MethodCallAwareTemplateHashModel.html" title="interface in freemarker.template"><code>MethodCallAwareTemplateHashModel</code></a>.</div>
 </div>
 <div class="col-deprecated-item-name odd-row-color"><a href="freemarker/ext/jakarta/jsp/FreemarkerTag.html" title="class in freemarker.ext.jakarta.jsp">freemarker.ext.jakarta.jsp.FreemarkerTag</a></div>
 <div class="col-last odd-row-color">
@@ -140,10 +132,6 @@ loadScripts(document, 'script');</script>
 <div class="col-last odd-row-color">
 <div class="deprecation-comment">Use <a href="freemarker/ext/dom/NodeModel.html" title="class in freemarker.ext.dom"><code>NodeModel</code></a> instead</div>
 </div>
-<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/utility/ToCanonical.html" title="class in freemarker.template.utility">freemarker.template.utility.ToCanonical</a></div>
-<div class="col-last even-row-color">
-<div class="deprecation-comment">Will be removed (main method in a library, often classified as CWE-489 "Leftover Debug Code").</div>
-</div>
 </div>
 </div>
 </li>
@@ -246,12 +234,12 @@ loadScripts(document, 'script');</script>
 <div class="col-deprecated-item-name odd-row-color"><a href="freemarker/cache/TemplateCache.html#getFullTemplatePath(freemarker.core.Environment,java.lang.String,java.lang.String)">freemarker.cache.TemplateCache.getFullTemplatePath&#8203;(Environment, String, String)</a></div>
 <div class="col-last odd-row-color">
 <div class="deprecation-comment">Use <a href="freemarker/core/Environment.html#toFullTemplateName(java.lang.String,java.lang.String)"><code>Environment.toFullTemplateName(String, String)</code></a> instead, as that can throw
-             <a href="freemarker/template/MalformedTemplateNameException.html" title="class in freemarker.template"><code>MalformedTemplateNameException</code></a>, and is on a more logical place anyway.</div>
+ <a href="freemarker/template/MalformedTemplateNameException.html" title="class in freemarker.template"><code>MalformedTemplateNameException</code></a>, and is on a more logical place anyway.</div>
 </div>
 <div class="col-deprecated-item-name even-row-color"><a href="freemarker/cache/TemplateCache.html#getTemplate(java.lang.String,java.util.Locale,java.lang.String,boolean)">freemarker.cache.TemplateCache.getTemplate&#8203;(String, Locale, String, boolean)</a></div>
 <div class="col-last even-row-color">
 <div class="deprecation-comment">Use <a href="freemarker/cache/TemplateCache.html#getTemplate(java.lang.String,java.util.Locale,java.lang.Object,java.lang.String,boolean)"><code>TemplateCache.getTemplate(String, Locale, Object, String, boolean)</code></a>, which can return more detailed
-             result when the template is missing.</div>
+ result when the template is missing.</div>
 </div>
 <div class="col-deprecated-item-name odd-row-color"><a href="freemarker/cache/TemplateCache.html#setConfiguration(freemarker.template.Configuration)">freemarker.cache.TemplateCache.setConfiguration&#8203;(Configuration)</a></div>
 <div class="col-last odd-row-color">
@@ -319,48 +307,65 @@ loadScripts(document, 'script');</script>
 <div class="col-last even-row-color">
 <div class="deprecation-comment">Changing the <code>null</code> model can cause a lot of confusion; don't do it.</div>
 </div>
-<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/ext/dom/NodeModel.html#setDocumentBuilderFactory(javax.xml.parsers.DocumentBuilderFactory)">freemarker.ext.dom.NodeModel.setDocumentBuilderFactory&#8203;(DocumentBuilderFactory)</a></div>
+<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/ext/dom/NodeModel.html#getDocumentBuilderFactory()">freemarker.ext.dom.NodeModel.getDocumentBuilderFactory()</a></div>
 <div class="col-last odd-row-color">
-<div class="deprecation-comment">It's a bad practice to change static fields, as if multiple independent components do that in the
-             same JVM, they unintentionally affect each other. Therefore it's recommended to leave this static
-             value at its default.</div>
+<div class="deprecation-comment">The returned <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.xml/javax/xml/parsers/DocumentBuilderFactory.html" title="class or interface in javax.xml.parsers" class="external-link"><code>DocumentBuilderFactory</code></a> is by default NOT SAFE from XXE attacks; see
+ <a href="freemarker/ext/dom/NodeModel.html#parse(org.xml.sax.InputSource,boolean,boolean)"><code>NodeModel.parse(InputSource, boolean, boolean)</code></a> for more details!</div>
 </div>
-<div class="col-deprecated-item-name even-row-color"><a href="freemarker/ext/dom/NodeModel.html#setErrorHandler(org.xml.sax.ErrorHandler)">freemarker.ext.dom.NodeModel.setErrorHandler&#8203;(ErrorHandler)</a></div>
+<div class="col-deprecated-item-name even-row-color"><a href="freemarker/ext/dom/NodeModel.html#parse(java.io.File)">freemarker.ext.dom.NodeModel.parse&#8203;(File)</a></div>
 <div class="col-last even-row-color">
-<div class="deprecation-comment">It's a bad practice to change static fields, as if multiple independent components do that in the
-             same JVM, they unintentionally affect each other. Therefore it's recommended to leave this static
-             value at its default.</div>
+<div class="deprecation-comment">The returned <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.xml/javax/xml/parsers/DocumentBuilderFactory.html" title="class or interface in javax.xml.parsers" class="external-link"><code>DocumentBuilderFactory</code></a> is by default NOT SAFE from XXE attacks; see
+ <a href="freemarker/ext/dom/NodeModel.html#parse(org.xml.sax.InputSource,boolean,boolean)"><code>NodeModel.parse(InputSource, boolean, boolean)</code></a> for more details!</div>
 </div>
-<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/ext/dom/Transform.html#main(java.lang.String%5B%5D)">freemarker.ext.dom.Transform.main&#8203;(String[])</a></div>
+<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/ext/dom/NodeModel.html#parse(java.io.File,boolean,boolean)">freemarker.ext.dom.NodeModel.parse&#8203;(File, boolean, boolean)</a></div>
 <div class="col-last odd-row-color">
-<div class="deprecation-comment">Will be removed (main method in a library, often classified as CWE-489 "Leftover Debug Code").</div>
+<div class="deprecation-comment">The returned <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.xml/javax/xml/parsers/DocumentBuilderFactory.html" title="class or interface in javax.xml.parsers" class="external-link"><code>DocumentBuilderFactory</code></a> is by default NOT SAFE from XXE attacks; see
+ <a href="freemarker/ext/dom/NodeModel.html#parse(org.xml.sax.InputSource,boolean,boolean)"><code>NodeModel.parse(InputSource, boolean, boolean)</code></a> for more details!</div>
 </div>
-<div class="col-deprecated-item-name even-row-color"><a href="freemarker/ext/jakarta/servlet/FreemarkerServlet.html#getTemplatePath()">freemarker.ext.jakarta.servlet.FreemarkerServlet.getTemplatePath()</a></div>
+<div class="col-deprecated-item-name even-row-color"><a href="freemarker/ext/dom/NodeModel.html#parse(org.xml.sax.InputSource)">freemarker.ext.dom.NodeModel.parse&#8203;(InputSource)</a></div>
 <div class="col-last even-row-color">
-<div class="deprecation-comment">Not called by FreeMarker code, and there's no point to override this (unless to cause confusion).</div>
+<div class="deprecation-comment">The returned <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.xml/javax/xml/parsers/DocumentBuilderFactory.html" title="class or interface in javax.xml.parsers" class="external-link"><code>DocumentBuilderFactory</code></a> is by default NOT SAFE from XXE attacks; see
+ <a href="freemarker/ext/dom/NodeModel.html#parse(org.xml.sax.InputSource,boolean,boolean)"><code>NodeModel.parse(InputSource, boolean, boolean)</code></a> for more details!</div>
 </div>
-<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/ext/jdom/NodeListModel.html#main(java.lang.String%5B%5D)">freemarker.ext.jdom.NodeListModel.main&#8203;(String[])</a></div>
+<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/ext/dom/NodeModel.html#parse(org.xml.sax.InputSource,boolean,boolean)">freemarker.ext.dom.NodeModel.parse&#8203;(InputSource, boolean, boolean)</a></div>
 <div class="col-last odd-row-color">
-<div class="deprecation-comment">Will be removed (main method in a library, often classified as CWE-489 "Leftover Debug Code").</div>
+<div class="deprecation-comment">The returned <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.xml/javax/xml/parsers/DocumentBuilderFactory.html" title="class or interface in javax.xml.parsers" class="external-link"><code>DocumentBuilderFactory</code></a> is by default NOT SAFE from XXE attacks; see earlier what
+ do instead.</div>
 </div>
-<div class="col-deprecated-item-name even-row-color"><a href="freemarker/ext/servlet/FreemarkerServlet.html#getTemplatePath()">freemarker.ext.servlet.FreemarkerServlet.getTemplatePath()</a></div>
+<div class="col-deprecated-item-name even-row-color"><a href="freemarker/ext/dom/NodeModel.html#setDocumentBuilderFactory(javax.xml.parsers.DocumentBuilderFactory)">freemarker.ext.dom.NodeModel.setDocumentBuilderFactory&#8203;(DocumentBuilderFactory)</a></div>
+<div class="col-last even-row-color">
+<div class="deprecation-comment">It's a bad practice to change static fields, as if multiple independent components do that in the
+ same JVM, they unintentionally affect each other. Therefore, it's recommended to leave this static value at its
+ default.</div>
+</div>
+<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/ext/dom/NodeModel.html#setErrorHandler(org.xml.sax.ErrorHandler)">freemarker.ext.dom.NodeModel.setErrorHandler&#8203;(ErrorHandler)</a></div>
+<div class="col-last odd-row-color">
+<div class="deprecation-comment">It's a bad practice to change static fields, as if multiple independent components do that in the
+ same JVM, they unintentionally affect each other. Therefore, it's recommended to leave this static value at its
+ default.</div>
+</div>
+<div class="col-deprecated-item-name even-row-color"><a href="freemarker/ext/jakarta/servlet/FreemarkerServlet.html#getTemplatePath()">freemarker.ext.jakarta.servlet.FreemarkerServlet.getTemplatePath()</a></div>
 <div class="col-last even-row-color">
 <div class="deprecation-comment">Not called by FreeMarker code, and there's no point to override this (unless to cause confusion).</div>
 </div>
-<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/log/Logger.html#selectLoggerLibrary(int)">freemarker.log.Logger.selectLoggerLibrary&#8203;(int)</a></div>
+<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/ext/servlet/FreemarkerServlet.html#getTemplatePath()">freemarker.ext.servlet.FreemarkerServlet.getTemplatePath()</a></div>
 <div class="col-last odd-row-color">
+<div class="deprecation-comment">Not called by FreeMarker code, and there's no point to override this (unless to cause confusion).</div>
+</div>
+<div class="col-deprecated-item-name even-row-color"><a href="freemarker/log/Logger.html#selectLoggerLibrary(int)">freemarker.log.Logger.selectLoggerLibrary&#8203;(int)</a></div>
+<div class="col-last even-row-color">
 <div class="deprecation-comment">This method isn't reliable, unless you can somehow ensure that you access the FreeMarker classes
              first; use the <a href="freemarker/log/Logger.html#SYSTEM_PROPERTY_NAME_LOGGER_LIBRARY">"org.freemarker.loggerLibrary"</a> Java system property instead, like
              <code>java ... -Dorg.freemarker.loggerLibrary=slf4j</code>. See
              <a href="freemarker/log/Logger.html#SYSTEM_PROPERTY_NAME_LOGGER_LIBRARY"><code>Logger.SYSTEM_PROPERTY_NAME_LOGGER_LIBRARY</code></a> for more.</div>
 </div>
-<div class="col-deprecated-item-name even-row-color"><a href="freemarker/log/Logger.html#setCategoryPrefix(java.lang.String)">freemarker.log.Logger.setCategoryPrefix&#8203;(String)</a></div>
-<div class="col-last even-row-color">
+<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/log/Logger.html#setCategoryPrefix(java.lang.String)">freemarker.log.Logger.setCategoryPrefix&#8203;(String)</a></div>
+<div class="col-last odd-row-color">
 <div class="deprecation-comment">This wasn't reliable, unless you can somehow ensure that you access the FreeMarker classes first. As
              it's not known to be useful for users, consider it removed.</div>
 </div>
-<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/Configuration.html#getDefaultConfiguration()">freemarker.template.Configuration.getDefaultConfiguration()</a></div>
-<div class="col-last odd-row-color">
+<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/Configuration.html#getDefaultConfiguration()">freemarker.template.Configuration.getDefaultConfiguration()</a></div>
+<div class="col-last even-row-color">
 <div class="deprecation-comment">The usage of the static singleton (the "default")
  <a href="freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> instance can easily cause erroneous, unpredictable
  behavior. This is because multiple independent software components may use
@@ -370,112 +375,108 @@ loadScripts(document, 'script');</script>
  typically creates with <code>new Configuration()</code> when the component
  is initialized.</div>
 </div>
-<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/Configuration.html#getIncompatibleEnhancements()">freemarker.template.Configuration.getIncompatibleEnhancements()</a></div>
-<div class="col-last even-row-color">
-<div class="deprecation-comment">Use <a href="freemarker/template/Configuration.html#getIncompatibleImprovements()"><code>Configuration.getIncompatibleImprovements()</code></a> instead.</div>
-</div>
-<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/Configuration.html#getParsedIncompatibleEnhancements()">freemarker.template.Configuration.getParsedIncompatibleEnhancements()</a></div>
+<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/Configuration.html#getIncompatibleEnhancements()">freemarker.template.Configuration.getIncompatibleEnhancements()</a></div>
 <div class="col-last odd-row-color">
 <div class="deprecation-comment">Use <a href="freemarker/template/Configuration.html#getIncompatibleImprovements()"><code>Configuration.getIncompatibleImprovements()</code></a> instead.</div>
 </div>
-<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/Configuration.html#getVersionNumber()">freemarker.template.Configuration.getVersionNumber()</a></div>
+<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/Configuration.html#getParsedIncompatibleEnhancements()">freemarker.template.Configuration.getParsedIncompatibleEnhancements()</a></div>
 <div class="col-last even-row-color">
-<div class="deprecation-comment">Use <a href="freemarker/template/Configuration.html#getVersion()"><code>Configuration.getVersion()</code></a> instead.</div>
+<div class="deprecation-comment">Use <a href="freemarker/template/Configuration.html#getIncompatibleImprovements()"><code>Configuration.getIncompatibleImprovements()</code></a> instead.</div>
 </div>
-<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/Configuration.html#setDefaultConfiguration(freemarker.template.Configuration)">freemarker.template.Configuration.setDefaultConfiguration&#8203;(Configuration)</a></div>
+<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/Configuration.html#getVersionNumber()">freemarker.template.Configuration.getVersionNumber()</a></div>
 <div class="col-last odd-row-color">
+<div class="deprecation-comment">Use <a href="freemarker/template/Configuration.html#getVersion()"><code>Configuration.getVersion()</code></a> instead.</div>
+</div>
+<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/Configuration.html#setDefaultConfiguration(freemarker.template.Configuration)">freemarker.template.Configuration.setDefaultConfiguration&#8203;(Configuration)</a></div>
+<div class="col-last even-row-color">
 <div class="deprecation-comment">Using the "default" <a href="freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> instance can
  easily lead to erroneous, unpredictable behaviour.
  See more <a href="freemarker/template/Configuration.html#getDefaultConfiguration()"><code>here...</code></a>.</div>
 </div>
-<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/Configuration.html#setIncompatibleEnhancements(java.lang.String)">freemarker.template.Configuration.setIncompatibleEnhancements&#8203;(String)</a></div>
-<div class="col-last even-row-color">
+<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/Configuration.html#setIncompatibleEnhancements(java.lang.String)">freemarker.template.Configuration.setIncompatibleEnhancements&#8203;(String)</a></div>
+<div class="col-last odd-row-color">
 <div class="deprecation-comment">Use <a href="freemarker/template/Configuration.html#%3Cinit%3E(freemarker.template.Version)"><code>Configuration(Version)</code></a>, or
     as last chance, <a href="freemarker/template/Configuration.html#setIncompatibleImprovements(freemarker.template.Version)"><code>Configuration.setIncompatibleImprovements(Version)</code></a> instead.</div>
 </div>
-<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/Configuration.html#setSharedVaribles(java.util.Map)">freemarker.template.Configuration.setSharedVaribles&#8203;(Map)</a></div>
-<div class="col-last odd-row-color">
+<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/Configuration.html#setSharedVaribles(java.util.Map)">freemarker.template.Configuration.setSharedVaribles&#8203;(Map)</a></div>
+<div class="col-last even-row-color">
 <div class="deprecation-comment">Use <a href="freemarker/template/Configuration.html#setSharedVariables(java.util.Map)"><code>Configuration.setSharedVariables(Map)</code></a> instead.</div>
 </div>
-<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/Configuration.html#setStrictSyntaxMode(boolean)">freemarker.template.Configuration.setStrictSyntaxMode&#8203;(boolean)</a></div>
-<div class="col-last even-row-color">
+<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/Configuration.html#setStrictSyntaxMode(boolean)">freemarker.template.Configuration.setStrictSyntaxMode&#8203;(boolean)</a></div>
+<div class="col-last odd-row-color">
 <div class="deprecation-comment">Only <code>true</code> (the default) value will be supported sometimes in the future.</div>
 </div>
-<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/Configuration.html#setTemplateUpdateDelay(int)">freemarker.template.Configuration.setTemplateUpdateDelay&#8203;(int)</a></div>
-<div class="col-last odd-row-color">
+<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/Configuration.html#setTemplateUpdateDelay(int)">freemarker.template.Configuration.setTemplateUpdateDelay&#8203;(int)</a></div>
+<div class="col-last even-row-color">
 <div class="deprecation-comment">Use <a href="freemarker/template/Configuration.html#setTemplateUpdateDelayMilliseconds(long)"><code>Configuration.setTemplateUpdateDelayMilliseconds(long)</code></a> instead, because the time granularity of this method
              is often misunderstood to be milliseconds.</div>
 </div>
-<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/SimpleSequence.html#add(boolean)">freemarker.template.SimpleSequence.add&#8203;(boolean)</a></div>
-<div class="col-last even-row-color">
-<div class="deprecation-comment">Use <a href="freemarker/template/SimpleSequence.html#add(java.lang.Object)"><code>SimpleSequence.add(Object)</code></a> instead, as this bypasses the <a href="freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a>.</div>
-</div>
-<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/SimpleSequence.html#toList()">freemarker.template.SimpleSequence.toList()</a></div>
+<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/SimpleSequence.html#add(boolean)">freemarker.template.SimpleSequence.add&#8203;(boolean)</a></div>
 <div class="col-last odd-row-color">
-<div class="deprecation-comment">No replacement exists; not a reliable way of getting back the original list elemnts.</div>
+<div class="deprecation-comment">Use <a href="freemarker/template/SimpleSequence.html#add(java.lang.Object)"><code>SimpleSequence.add(Object)</code></a> instead, as this bypasses the <a href="freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a>.</div>
 </div>
-<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/Template.html#addImport(freemarker.core.LibraryLoad)">freemarker.template.Template.addImport&#8203;(LibraryLoad)</a></div>
+<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/SimpleSequence.html#toList()">freemarker.template.SimpleSequence.toList()</a></div>
 <div class="col-last even-row-color">
-<div class="deprecation-comment">Should only be used internally, and might will be removed later.</div>
+<div class="deprecation-comment">No replacement exists; not a reliable way of getting back the original list elemnts.</div>
 </div>
-<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/Template.html#addMacro(freemarker.core.Macro)">freemarker.template.Template.addMacro&#8203;(Macro)</a></div>
+<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/Template.html#addImport(freemarker.core.LibraryLoad)">freemarker.template.Template.addImport&#8203;(LibraryLoad)</a></div>
 <div class="col-last odd-row-color">
 <div class="deprecation-comment">Should only be used internally, and might will be removed later.</div>
 </div>
-<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/Template.html#addPrefixNSMapping(java.lang.String,java.lang.String)">freemarker.template.Template.addPrefixNSMapping&#8203;(String, String)</a></div>
+<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/Template.html#addMacro(freemarker.core.Macro)">freemarker.template.Template.addMacro&#8203;(Macro)</a></div>
 <div class="col-last even-row-color">
 <div class="deprecation-comment">Should only be used internally, and might will be removed later.</div>
 </div>
-<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/Template.html#containingElements(int,int)">freemarker.template.Template.containingElements&#8203;(int, int)</a></div>
+<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/Template.html#addPrefixNSMapping(java.lang.String,java.lang.String)">freemarker.template.Template.addPrefixNSMapping&#8203;(String, String)</a></div>
 <div class="col-last odd-row-color">
 <div class="deprecation-comment">Should only be used internally, and might will be removed later.</div>
 </div>
-<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/Template.html#getImports()">freemarker.template.Template.getImports()</a></div>
+<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/Template.html#containingElements(int,int)">freemarker.template.Template.containingElements&#8203;(int, int)</a></div>
 <div class="col-last even-row-color">
 <div class="deprecation-comment">Should only be used internally, and might will be removed later.</div>
 </div>
-<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/Template.html#getMacros()">freemarker.template.Template.getMacros()</a></div>
+<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/Template.html#getImports()">freemarker.template.Template.getImports()</a></div>
 <div class="col-last odd-row-color">
 <div class="deprecation-comment">Should only be used internally, and might will be removed later.</div>
 </div>
-<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/Template.html#getRootTreeNode()">freemarker.template.Template.getRootTreeNode()</a></div>
+<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/Template.html#getMacros()">freemarker.template.Template.getMacros()</a></div>
 <div class="col-last even-row-color">
 <div class="deprecation-comment">Should only be used internally, and might will be removed later.</div>
 </div>
-<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/Template.html#setEncoding(java.lang.String)">freemarker.template.Template.setEncoding&#8203;(String)</a></div>
+<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/Template.html#getRootTreeNode()">freemarker.template.Template.getRootTreeNode()</a></div>
 <div class="col-last odd-row-color">
 <div class="deprecation-comment">Should only be used internally, and might will be removed later.</div>
 </div>
-<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/TemplateException.html#getCauseException()">freemarker.template.TemplateException.getCauseException()</a></div>
+<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/Template.html#setEncoding(java.lang.String)">freemarker.template.Template.setEncoding&#8203;(String)</a></div>
 <div class="col-last even-row-color">
+<div class="deprecation-comment">Should only be used internally, and might will be removed later.</div>
+</div>
+<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/TemplateException.html#getCauseException()">freemarker.template.TemplateException.getCauseException()</a></div>
+<div class="col-last odd-row-color">
 <div class="deprecation-comment">Java 1.4 has introduced <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Throwable.html#getCause()" title="class or interface in java.lang" class="external-link"><code>Throwable.getCause()</code></a> - use that instead, especially as this can't return
  runtime exceptions and errors as is.</div>
 </div>
-<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/TemplateException.html#getTemplateName()">freemarker.template.TemplateException.getTemplateName()</a></div>
-<div class="col-last odd-row-color">
+<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/TemplateException.html#getTemplateName()">freemarker.template.TemplateException.getTemplateName()</a></div>
+<div class="col-last even-row-color">
 <div class="deprecation-comment">Use <a href="freemarker/template/TemplateException.html#getTemplateSourceName()"><code>TemplateException.getTemplateSourceName()</code></a> instead, unless you are really sure that this is what you want.
              This method isn't really deprecated, it's just marked so to warn users about this.</div>
 </div>
-<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/utility/DeepUnwrap.html#premissiveUnwrap(freemarker.template.TemplateModel)">freemarker.template.utility.DeepUnwrap.premissiveUnwrap&#8203;(TemplateModel)</a></div>
-<div class="col-last even-row-color">
+<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/utility/DeepUnwrap.html#premissiveUnwrap(freemarker.template.TemplateModel)">freemarker.template.utility.DeepUnwrap.premissiveUnwrap&#8203;(TemplateModel)</a></div>
+<div class="col-last odd-row-color">
 <div class="deprecation-comment">the name of this method is mistyped. Use 
  <a href="freemarker/template/utility/DeepUnwrap.html#permissiveUnwrap(freemarker.template.TemplateModel)"><code>DeepUnwrap.permissiveUnwrap(TemplateModel)</code></a> instead.</div>
 </div>
-<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/utility/StringUtil.html#HTMLEnc(java.lang.String)">freemarker.template.utility.StringUtil.HTMLEnc&#8203;(String)</a></div>
-<div class="col-last odd-row-color">
-<div class="deprecation-comment">Use <a href="freemarker/template/utility/StringUtil.html#XHTMLEnc(java.lang.String)"><code>StringUtil.XHTMLEnc(String)</code></a> instead, because it escapes apostrophe-quote too.</div>
-</div>
-<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/utility/StringUtil.html#isXMLID(java.lang.String)">freemarker.template.utility.StringUtil.isXMLID&#8203;(String)</a></div>
+<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/utility/StringUtil.html#HTMLEnc(java.lang.String)">freemarker.template.utility.StringUtil.HTMLEnc&#8203;(String)</a></div>
 <div class="col-last even-row-color">
-<div class="deprecation-comment">Don't use this outside FreeMarker; it's name if misleading, and it doesn't follow the XML specs.</div>
+<div class="deprecation-comment">Use <a href="freemarker/template/utility/StringUtil.html#XHTMLEnc(java.lang.String)"><code>StringUtil.XHTMLEnc(String)</code></a> instead, because it escapes apostrophe-quote too.</div>
 </div>
-<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/utility/StringUtil.html#jsStringEnc(java.lang.String,boolean)">freemarker.template.utility.StringUtil.jsStringEnc&#8203;(String, boolean)</a></div>
+<div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/utility/StringUtil.html#isXMLID(java.lang.String)">freemarker.template.utility.StringUtil.isXMLID&#8203;(String)</a></div>
 <div class="col-last odd-row-color">
-<div class="deprecation-comment">Use <a href="freemarker/template/utility/StringUtil.html#jsStringEnc(java.lang.String,freemarker.template.utility.StringUtil.JsStringEncCompatibility)"><code>StringUtil.jsStringEnc(String, JsStringEncCompatibility)</code></a> instead.</div>
+<div class="deprecation-comment">Don't use this outside FreeMarker; it's name if misleading, and it doesn't follow the XML specs.</div>
 </div>
-<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/utility/ToCanonical.html#main(java.lang.String%5B%5D)">freemarker.template.utility.ToCanonical.main&#8203;(String[])</a></div>
+<div class="col-deprecated-item-name even-row-color"><a href="freemarker/template/utility/StringUtil.html#jsStringEnc(java.lang.String,boolean)">freemarker.template.utility.StringUtil.jsStringEnc&#8203;(String, boolean)</a></div>
 <div class="col-last even-row-color">
-<div class="deprecation-comment">Will be removed (main method in a library, often classified as CWE-489 "Leftover Debug Code").</div>
+<div class="deprecation-comment">Use <a href="freemarker/template/utility/StringUtil.html#jsStringEnc(java.lang.String,freemarker.template.utility.StringUtil.JsStringEncCompatibility)"><code>StringUtil.jsStringEnc(String, JsStringEncCompatibility)</code></a> instead.</div>
 </div>
 <div class="col-deprecated-item-name odd-row-color"><a href="freemarker/template/Version.html#getBuildDate()">freemarker.template.Version.getBuildDate()</a></div>
 <div class="col-last odd-row-color">
@@ -505,22 +506,22 @@ loadScripts(document, 'script');</script>
 <div class="col-deprecated-item-name even-row-color"><a href="freemarker/cache/ClassTemplateLoader.html#%3Cinit%3E()">freemarker.cache.ClassTemplateLoader()</a></div>
 <div class="col-last even-row-color">
 <div class="deprecation-comment">It's a confusing constructor, and seldom useful; use <a href="freemarker/cache/ClassTemplateLoader.html#%3Cinit%3E(java.lang.Class,java.lang.String)"><code>ClassTemplateLoader(Class, String)</code></a>
-             instead.</div>
+ instead.</div>
 </div>
 <div class="col-deprecated-item-name odd-row-color"><a href="freemarker/cache/ClassTemplateLoader.html#%3Cinit%3E(java.lang.Class)">freemarker.cache.ClassTemplateLoader&#8203;(Class&lt;?&gt;)</a></div>
 <div class="col-last odd-row-color">
 <div class="deprecation-comment">It's confusing that the base path is <code>""</code>; use <a href="freemarker/cache/ClassTemplateLoader.html#%3Cinit%3E(java.lang.Class,java.lang.String)"><code>ClassTemplateLoader(Class, String)</code></a>
-             instead.</div>
+ instead.</div>
 </div>
 <div class="col-deprecated-item-name even-row-color"><a href="freemarker/cache/FileTemplateLoader.html#%3Cinit%3E()">freemarker.cache.FileTemplateLoader()</a></div>
 <div class="col-last even-row-color">
 <div class="deprecation-comment">Relying on what the current directory is is a bad practice; use
-             <a href="freemarker/cache/FileTemplateLoader.html#%3Cinit%3E(java.io.File)"><code>FileTemplateLoader(File)</code></a> instead.</div>
+ <a href="freemarker/cache/FileTemplateLoader.html#%3Cinit%3E(java.io.File)"><code>FileTemplateLoader(File)</code></a> instead.</div>
 </div>
 <div class="col-deprecated-item-name odd-row-color"><a href="freemarker/cache/TemplateCache.html#%3Cinit%3E()">freemarker.cache.TemplateCache()</a></div>
 <div class="col-last odd-row-color">
 <div class="deprecation-comment">Use <a href="freemarker/cache/TemplateCache.html#%3Cinit%3E(freemarker.cache.TemplateLoader)"><code>TemplateCache(TemplateLoader)</code></a> instead. The default loader is useless in most
-     applications, also it can mean a security risk.</div>
+ applications, also it can mean a security risk.</div>
 </div>
 <div class="col-deprecated-item-name even-row-color"><a href="freemarker/cache/TemplateCache.html#%3Cinit%3E(freemarker.cache.TemplateLoader)">freemarker.cache.TemplateCache&#8203;(TemplateLoader)</a></div>
 <div class="col-last even-row-color">
diff --git a/docs/api/element-list b/docs/api/element-list
index 022651a5..c99b57b7 100644
--- a/docs/api/element-list
+++ b/docs/api/element-list
@@ -1,7 +1,5 @@
 freemarker.cache
 freemarker.core
-freemarker.debug
-freemarker.debug.impl
 freemarker.ext.ant
 freemarker.ext.beans
 freemarker.ext.dom
diff --git a/docs/api/freemarker/cache/AndMatcher.html b/docs/api/freemarker/cache/AndMatcher.html
index 5d109a0c..e85fc758 100644
--- a/docs/api/freemarker/cache/AndMatcher.html
+++ b/docs/api/freemarker/cache/AndMatcher.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>AndMatcher (FreeMarker 2.3.34 API)</title>
+<title>AndMatcher (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: AndMatcher">
diff --git a/docs/api/freemarker/cache/ByteArrayTemplateLoader.html b/docs/api/freemarker/cache/ByteArrayTemplateLoader.html
index 84d9c5e5..a31288f2 100644
--- a/docs/api/freemarker/cache/ByteArrayTemplateLoader.html
+++ b/docs/api/freemarker/cache/ByteArrayTemplateLoader.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>ByteArrayTemplateLoader (FreeMarker 2.3.34 API)</title>
+<title>ByteArrayTemplateLoader (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: ByteArrayTemplateLoader">
@@ -256,34 +256,32 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
 <dt>Specified by:</dt>
 <dd><code><a href="TemplateLoader.html#findTemplateSource(java.lang.String)">findTemplateSource</a></code>&nbsp;in interface&nbsp;<code><a href="TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></dd>
 <dt>Parameters:</dt>
-<dd><code>name</code> - The name (template root directory relative path) of the template, already localized and normalized by
-            the <a href="TemplateCache.html" title="class in freemarker.cache"><code>cache</code></a>. It is completely up to the loader implementation to
-            interpret the name, however it should expect to receive hierarchical paths where path components are
-            separated by a slash (not backslash). Backslashes (or any other OS specific separator character) are
-            not considered as separators by FreeMarker, and thus they will not be replaced with slash before
-            passing to this method, so it's up to the template loader to handle them (say, by throwing an
-            exception that tells the user that the path (s)he has entered is invalid, as (s)he must use slash --
-            typical mistake of Windows users). The passed names are always considered relative to some
-            loader-defined root location (often referred as the "template root directory"), and will never start
-            with a slash, nor will they contain a path component consisting of either a single or a double dot --
-            these are all resolved by the template cache before passing the name to the loader. As a side effect,
-            paths that trivially reach outside template root directory, such as <code>../my.ftl</code>, will be
-            rejected by the template cache, so they never reach the template loader. Note again, that if the path
-            uses backslash as path separator instead of slash as (the template loader should not accept that), the
-            normalization will not properly happen, as FreeMarker (the cache) recognizes only the slashes as
-            separators.</dd>
+<dd><code>name</code> - The name (template root directory relative path) of the template, already localized and normalized by the
+         <a href="TemplateCache.html" title="class in freemarker.cache"><code>cache</code></a>. It is completely up to the loader implementation to
+         interpret the name, however it should expect to receive hierarchical paths where path components are
+         separated by a slash (not backslash). Backslashes (or any other OS specific separator character) are not
+         considered as separators by FreeMarker, and thus they will not be replaced with slash before passing to
+         this method, so it's up to the template loader to handle them (say, by throwing an exception that tells
+         the user that the path (s)he has entered is invalid, as (s)he must use slash -- typical mistake of
+         Windows users). The passed names are always considered relative to some loader-defined root location
+         (often referred as the "template root directory"), and will never start with a slash, nor will they
+         contain a path component consisting of either a single or a double dot -- these are all resolved by the
+         template cache before passing the name to the loader. As a side effect, paths that trivially reach
+         outside template root directory, such as <code>../my.ftl</code>, will be rejected by the template cache, so
+         they never reach the template loader. Note again, that if the path uses backslash as path separator
+         instead of slash as (the template loader should not accept that), the normalization will not properly
+         happen, as FreeMarker (the cache) recognizes only the slashes as separators.</dd>
 <dt>Returns:</dt>
 <dd>An object representing the template source, which can be supplied in subsequent calls to
-         <a href="TemplateLoader.html#getLastModified(java.lang.Object)"><code>TemplateLoader.getLastModified(Object)</code></a> and <a href="TemplateLoader.html#getReader(java.lang.Object,java.lang.String)"><code>TemplateLoader.getReader(Object, String)</code></a>, when those are called on the
-         same <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>. <code>null</code> must be returned if the source for the template doesn't exist;
-         don't throw exception then! The exact type of this object is up to the <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>
-         implementation. As this object is possibly used as hash key in caches, and is surly compared with another
-         template source for equality, <b>it must have a proper <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> and
-         <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link"><code>Object.hashCode()</code></a>) implementation</b>. Especially, template sources that refer to the same
-         physical source must be equivalent, otherwise template caching can become inefficient. This is only
-         expected from <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> when the compared template sources came from the same
-         <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> instance. Also, it must not influence the equality if the source is open or
-         closed (<a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
+ <a href="TemplateLoader.html#getLastModified(java.lang.Object)"><code>TemplateLoader.getLastModified(Object)</code></a> and <a href="TemplateLoader.html#getReader(java.lang.Object,java.lang.String)"><code>TemplateLoader.getReader(Object, String)</code></a>, when those are called on the same
+ <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>. <code>null</code> must be returned if the source for the template doesn't exist; don't throw
+ exception then! The exact type of this object is up to the <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> implementation. As this object
+ is possibly used as hash key in caches, and is surly compared with another template source for equality, <b>it
+ must have a proper <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> and <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link"><code>Object.hashCode()</code></a>) implementation</b>. Especially,
+ template sources that refer to the same physical source must be equivalent, otherwise template caching can become
+ inefficient. This is only expected from <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> when the compared template sources came
+ from the same <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> instance. Also, it must not influence the equality if the source is open or
+ closed (<a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
 </dl>
 </section>
 </li>
@@ -299,15 +297,14 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
 <dd><code><a href="TemplateLoader.html#getLastModified(java.lang.Object)">getLastModified</a></code>&nbsp;in interface&nbsp;<code><a href="TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></dd>
 <dt>Parameters:</dt>
 <dd><code>templateSource</code> - an object representing a template source (the template file), obtained through a prior call to
-            <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
-            <a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
+         <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
+         <a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
 <dt>Returns:</dt>
 <dd>The time of last modification for the specified template source, or -1 if the time is not known. This
-            value meant to be milliseconds since the epoch, but in fact FreeMarker doesn't care what it means, it
-            only cares if it changes, in which case the template needs to be reloaded (even if the value has
-            decreased). -1 is not special in that regard either; if you keep returning it, FreeMarker won't
-            reload the template (as far as it's not evicted from the cache from some other
-            reason). Note that <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Long.html#MIN_VALUE" title="class or interface in java.lang" class="external-link"><code>Long.MIN_VALUE</code></a> is reserved for internal use.</dd>
+ value meant to be milliseconds since the epoch, but in fact FreeMarker doesn't care what it means, it only cares
+ if it changes, in which case the template needs to be reloaded (even if the value has decreased). -1 is not
+ special in that regard either; if you keep returning it, FreeMarker won't reload the template (as far as it's not
+ evicted from the cache from some other reason). Note that <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Long.html#MIN_VALUE" title="class or interface in java.lang" class="external-link"><code>Long.MIN_VALUE</code></a> is reserved for internal use.</dd>
 </dl>
 </section>
 </li>
@@ -323,31 +320,31 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
  reads the template from its beginning. Before this method is called for the second time (or later), its caller
  must close the previously returned <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a>, and it must not use it anymore. That is, this method is not
  required to support multiple concurrent readers for the same source <code>templateSource</code> object.
- 
+
  <p>
  Typically, this method is called if the template is missing from the cache, or if after calling
  <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a> and <a href="TemplateLoader.html#getLastModified(java.lang.Object)"><code>TemplateLoader.getLastModified(Object)</code></a> it was determined that the cached copy
  of the template is stale. Then, if it turns out that the <code>encoding</code> parameter used doesn't match the actual
  template content (based on the <code>#ftl encoding=...</code> header), this method will be called for a second time
  with the correct <code>encoding</code> parameter value.
- 
+
  <p>
- Unlike <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>, this method must not tolerate if the template is not found, and
- must throw <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link"><code>IOException</code></a> in that case.</div>
+ Unlike <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>, this method must not tolerate if the template is not found, and must
+ throw <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link"><code>IOException</code></a> in that case.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="TemplateLoader.html#getReader(java.lang.Object,java.lang.String)">getReader</a></code>&nbsp;in interface&nbsp;<code><a href="TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></dd>
 <dt>Parameters:</dt>
 <dd><code>templateSource</code> - an object representing a template source, obtained through a prior call to
-            <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
-            <a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
-<dd><code>encoding</code> - the character encoding used to translate source bytes to characters. Some loaders may not have access
-            to the byte representation of the template stream, and instead directly obtain a character stream.
-            These loaders should ignore the encoding parameter.</dd>
+         <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
+         <a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
+<dd><code>encoding</code> - the character encoding used to translate source bytes to characters. Some loaders may not have access to
+         the byte representation of the template stream, and instead directly obtain a character stream. These
+         loaders should ignore the encoding parameter.</dd>
 <dt>Returns:</dt>
 <dd>A <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a> representing the template character stream; not <code>null</code>. It's the responsibility of
-         the caller (which is <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a> usually) to <code>close()</code> it. The <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a> is not
-         required to work after the <code>templateSource</code> was closed (<a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
+ the caller (which is <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a> usually) to <code>close()</code> it. The <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a> is not required to
+ work after the <code>templateSource</code> was closed (<a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
 <dt>Throws:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/UnsupportedEncodingException.html" title="class or interface in java.io" class="external-link">UnsupportedEncodingException</a></code></dd>
 </dl>
diff --git a/docs/api/freemarker/cache/CacheStorage.html b/docs/api/freemarker/cache/CacheStorage.html
index 02b65596..bd3a0784 100644
--- a/docs/api/freemarker/cache/CacheStorage.html
+++ b/docs/api/freemarker/cache/CacheStorage.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>CacheStorage (FreeMarker 2.3.34 API)</title>
+<title>CacheStorage (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, interface: CacheStorage">
@@ -85,11 +85,9 @@ loadScripts(document, 'script');</script>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public interface </span><span class="element-name type-name-label">CacheStorage</span></div>
-<div class="block">Cache storage abstracts away the storage aspects of a cache - associating
- an object with a key, retrieval and removal via the key. It is actually a
- small subset of the <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link"><code>Map</code></a> interface. 
- The implementations can be coded in a non-threadsafe manner as the natural
- user of the cache storage, <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a> does the necessary
+<div class="block">Cache storage abstracts away the storage aspects of a cache - associating an object with a key, retrieval and removal
+ via the key. It is actually a small subset of the <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link"><code>Map</code></a> interface. The implementations can be coded
+ in a non-threadsafe manner as the natural user of the cache storage, <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a> does the necessary
  synchronization.</div>
 <dl class="notes">
 <dt>See Also:</dt>
diff --git a/docs/api/freemarker/cache/CacheStorageWithGetSize.html b/docs/api/freemarker/cache/CacheStorageWithGetSize.html
index 5fd9d196..9b874a5d 100644
--- a/docs/api/freemarker/cache/CacheStorageWithGetSize.html
+++ b/docs/api/freemarker/cache/CacheStorageWithGetSize.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>CacheStorageWithGetSize (FreeMarker 2.3.34 API)</title>
+<title>CacheStorageWithGetSize (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, interface: CacheStorageWithGetSize">
diff --git a/docs/api/freemarker/cache/ClassTemplateLoader.html b/docs/api/freemarker/cache/ClassTemplateLoader.html
index a9faf004..0fc3cf4d 100644
--- a/docs/api/freemarker/cache/ClassTemplateLoader.html
+++ b/docs/api/freemarker/cache/ClassTemplateLoader.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>ClassTemplateLoader (FreeMarker 2.3.34 API)</title>
+<title>ClassTemplateLoader (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: ClassTemplateLoader">
@@ -89,7 +89,11 @@ loadScripts(document, 'script');</script>
 <span class="extends-implements">extends <a href="URLTemplateLoader.html" title="class in freemarker.cache">URLTemplateLoader</a></span></div>
 <div class="block">A <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> that can load templates from the "classpath". Naturally, it can load from jar files, or from
  anywhere where Java can load classes from. Internally, it uses <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Class.html#getResource(java.lang.String)" title="class or interface in java.lang" class="external-link"><code>Class.getResource(String)</code></a> or
- <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/ClassLoader.html#getResource(java.lang.String)" title="class or interface in java.lang" class="external-link"><code>ClassLoader.getResource(String)</code></a> to load templates.</div>
+ <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/ClassLoader.html#getResource(java.lang.String)" title="class or interface in java.lang" class="external-link"><code>ClassLoader.getResource(String)</code></a> to load templates.
+
+ <p>Since FreeMarker 2.3.35 this checks if the provided template name backs out from the base package, and if so
+ will throw <a href="../template/MalformedTemplateNameException.html" title="class in freemarker.template"><code>MalformedTemplateNameException</code></a>. This check is normally done by the <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a>, but see
+ in the description of <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> why it's better to also check it here.</div>
 </section>
 <section class="summary">
 <ul class="summary-list">
@@ -105,14 +109,14 @@ loadScripts(document, 'script');</script>
 <div class="col-last even-row-color">
 <div class="block"><span class="deprecated-label">Deprecated.</span>
 <div class="deprecation-comment">It's a confusing constructor, and seldom useful; use <a href="#%3Cinit%3E(java.lang.Class,java.lang.String)"><code>ClassTemplateLoader(Class, String)</code></a>
-             instead.</div>
+ instead.</div>
 </div>
 </div>
 <div class="col-constructor-name odd-row-color"><code><span class="member-name-link"><a href="#%3Cinit%3E(java.lang.Class)">ClassTemplateLoader</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;?&gt;&nbsp;resourceLoaderClass)</code></div>
 <div class="col-last odd-row-color">
 <div class="block"><span class="deprecated-label">Deprecated.</span>
 <div class="deprecation-comment">It's confusing that the base path is <code>""</code>; use <a href="#%3Cinit%3E(java.lang.Class,java.lang.String)"><code>ClassTemplateLoader(Class, String)</code></a>
-             instead.</div>
+ instead.</div>
 </div>
 </div>
 <div class="col-constructor-name even-row-color"><code><span class="member-name-link"><a href="#%3Cinit%3E(java.lang.Class,java.lang.String)">ClassTemplateLoader</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;?&gt;&nbsp;resourceLoaderClass,
@@ -162,8 +166,7 @@ loadScripts(document, 'script');</script>
 <div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>protected <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/net/URL.html" title="class or interface in java.net" class="external-link">URL</a></code></div>
 <div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#getURL(java.lang.String)">getURL</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</code></div>
 <div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
-<div class="block">Given a template name (plus potential locale decorations) retrieves
- an URL that points the template source.</div>
+<div class="block">Given a template name (plus potential locale decorations) retrieves an URL that points the template source.</div>
 </div>
 <div class="col-first even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
 <div class="col-second even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#toString()">toString</a></span>()</code></div>
@@ -197,7 +200,7 @@ loadScripts(document, 'script');</script>
 </span><span class="modifiers">public</span>&nbsp;<span class="element-name">ClassTemplateLoader</span>()</div>
 <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
 <div class="deprecation-comment">It's a confusing constructor, and seldom useful; use <a href="#%3Cinit%3E(java.lang.Class,java.lang.String)"><code>ClassTemplateLoader(Class, String)</code></a>
-             instead.</div>
+ instead.</div>
 </div>
 <div class="block">Creates a template loader that will use the <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Class.html#getResource(java.lang.String)" title="class or interface in java.lang" class="external-link"><code>Class.getResource(String)</code></a> method of its own class to load the
  resources, and <code>"/"</code> as base package path. This means that that template paths will be resolved relatively
@@ -206,8 +209,7 @@ loadScripts(document, 'script');</script>
  <a href="#%3Cinit%3E(java.lang.Class,java.lang.String)"><code>new ClassTemplateLoader(com.example.myapplication.SomeClass.class,
  "templates")</code></a>
 
- <p>
- If you extend this class, then the extending class will be used to load the resources.</div>
+ <p>If you extend this class, then the extending class will be used to load the resources.</div>
 </section>
 </li>
 <li>
@@ -217,7 +219,7 @@ loadScripts(document, 'script');</script>
 </span><span class="modifiers">public</span>&nbsp;<span class="element-name">ClassTemplateLoader</span>&#8203;<span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;?&gt;&nbsp;resourceLoaderClass)</span></div>
 <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
 <div class="deprecation-comment">It's confusing that the base path is <code>""</code>; use <a href="#%3Cinit%3E(java.lang.Class,java.lang.String)"><code>ClassTemplateLoader(Class, String)</code></a>
-             instead.</div>
+ instead.</div>
 </div>
 <div class="block">Creates a template loader that will use the <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Class.html#getResource(java.lang.String)" title="class or interface in java.lang" class="external-link"><code>Class.getResource(String)</code></a> method of the specified class to
  load the resources, and <code>""</code> as base package path. This means that template paths will be resolved
@@ -236,8 +238,7 @@ loadScripts(document, 'script');</script>
 <div class="block">Creates a template loader that will use the <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Class.html#getResource(java.lang.String)" title="class or interface in java.lang" class="external-link"><code>Class.getResource(String)</code></a> method of the specified class to
  load the resources, and the specified base package path (absolute or relative).
 
- <p>
- Examples:
+ <p>Examples:
  <ul>
  <li>Relative base path (will load from the <code>com.example.myapplication.templates</code> package):<br>
  <code>new ClassTemplateLoader(com.example.myapplication.SomeClass.class, "templates")</code>
@@ -246,14 +247,13 @@ loadScripts(document, 'script');</script>
  </ul></div>
 <dl class="notes">
 <dt>Parameters:</dt>
-<dd><code>resourceLoaderClass</code> - The class whose <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Class.html#getResource(java.lang.String)" title="class or interface in java.lang" class="external-link"><code>Class.getResource(String)</code></a> method will be used to load the templates. Be sure
-            that you chose a class whose defining class-loader sees the templates. This parameter can't be
-            <code>null</code>.</dd>
-<dd><code>basePackagePath</code> - The package that contains the templates, in path (<code>/</code>-separated) format. If it doesn't start
-            with a <code>/</code> then it's relative to the path (package) of the <code>resourceLoaderClass</code> class. If
-            it starts with <code>/</code> then it's relative to the root of the package hierarchy. Note that path
-            components should be separated by forward slashes independently of the separator character used by the
-            underlying operating system. This parameter can't be <code>null</code>.</dd>
+<dd><code>resourceLoaderClass</code> - The class whose <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Class.html#getResource(java.lang.String)" title="class or interface in java.lang" class="external-link"><code>Class.getResource(String)</code></a> method will be used to load the templates. Be sure that
+         you chose a class whose defining class-loader sees the templates. This parameter can't be <code>null</code>.</dd>
+<dd><code>basePackagePath</code> - The package that contains the templates, in path (<code>/</code>-separated) format. If it doesn't start with a
+         <code>/</code> then it's relative to the path (package) of the <code>resourceLoaderClass</code> class. If it starts
+         with <code>/</code> then it's relative to the root of the package hierarchy. Note that path components should
+         be separated by forward slashes independently of the separator character used by the underlying operating
+         system. This parameter can't be <code>null</code>.</dd>
 <dt>See Also:</dt>
 <dd><a href="#%3Cinit%3E(java.lang.ClassLoader,java.lang.String)"><code>ClassTemplateLoader(ClassLoader, String)</code></a></dd>
 </dl>
@@ -266,8 +266,8 @@ loadScripts(document, 'script');</script>
  <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;basePackagePath)</span></div>
 <div class="block">Similar to <a href="#%3Cinit%3E(java.lang.Class,java.lang.String)"><code>ClassTemplateLoader(Class, String)</code></a>, but instead of <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Class.html#getResource(java.lang.String)" title="class or interface in java.lang" class="external-link"><code>Class.getResource(String)</code></a> it uses
  <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/ClassLoader.html#getResource(java.lang.String)" title="class or interface in java.lang" class="external-link"><code>ClassLoader.getResource(String)</code></a>. Because a <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/ClassLoader.html" title="class or interface in java.lang" class="external-link"><code>ClassLoader</code></a> isn't bound to any Java package, it
- doesn't mater if the <code>basePackagePath</code> starts with <code>/</code> or not, it will be always relative to the root
- of the package hierarchy</div>
+ doesn't matter if the <code>basePackagePath</code> starts with <code>/</code> or not, it will be always relative to the
+ root of the package hierarchy</div>
 <dl class="notes">
 <dt>Since:</dt>
 <dd>2.3.22</dd>
@@ -287,14 +287,13 @@ loadScripts(document, 'script');</script>
 <h3>getURL</h3>
 <div class="member-signature"><span class="modifiers">protected</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/net/URL.html" title="class or interface in java.net" class="external-link">URL</a></span>&nbsp;<span class="element-name">getURL</span>&#8203;<span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="externa [...]
 <div class="block"><span class="descfrm-type-label">Description copied from class:&nbsp;<code><a href="URLTemplateLoader.html#getURL(java.lang.String)">URLTemplateLoader</a></code></span></div>
-<div class="block">Given a template name (plus potential locale decorations) retrieves
- an URL that points the template source.</div>
+<div class="block">Given a template name (plus potential locale decorations) retrieves an URL that points the template source.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="URLTemplateLoader.html#getURL(java.lang.String)">getURL</a></code>&nbsp;in class&nbsp;<code><a href="URLTemplateLoader.html" title="class in freemarker.cache">URLTemplateLoader</a></code></dd>
 <dt>Parameters:</dt>
-<dd><code>name</code> - the name of the sought template, including the locale
- decorations.</dd>
+<dd><code>name</code> - the name of the sought template, including the locale decorations; same as the parameter to
+         <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>; see rules there.</dd>
 <dt>Returns:</dt>
 <dd>an URL that points to the template source, or <code>null</code> if the template does not exist.</dd>
 </dl>
diff --git a/docs/api/freemarker/cache/ConcurrentCacheStorage.html b/docs/api/freemarker/cache/ConcurrentCacheStorage.html
index a12d5896..eabbfb82 100644
--- a/docs/api/freemarker/cache/ConcurrentCacheStorage.html
+++ b/docs/api/freemarker/cache/ConcurrentCacheStorage.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>ConcurrentCacheStorage (FreeMarker 2.3.34 API)</title>
+<title>ConcurrentCacheStorage (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, interface: ConcurrentCacheStorage">
@@ -86,8 +86,8 @@ loadScripts(document, 'script');</script>
 <hr>
 <div class="type-signature"><span class="modifiers">public interface </span><span class="element-name type-name-label">ConcurrentCacheStorage</span><span class="extends-implements">
 extends <a href="CacheStorage.html" title="interface in freemarker.cache">CacheStorage</a></span></div>
-<div class="block">An optional interface for cache storage that knows whether it can be 
- concurrently accessible without synchronization.</div>
+<div class="block">An optional interface for cache storage that knows whether it can be concurrently accessible without
+ synchronization.</div>
 </section>
 <section class="summary">
 <ul class="summary-list">
@@ -105,8 +105,8 @@ extends <a href="CacheStorage.html" title="interface in freemarker.cache">CacheS
 <div class="col-first even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code>boolean</code></div>
 <div class="col-second even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#isConcurrent()">isConcurrent</a></span>()</code></div>
 <div class="col-last even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">
-<div class="block">Returns true if this instance of cache storage is concurrently 
- accessible from multiple threads without synchronization.</div>
+<div class="block">Returns true if this instance of cache storage is concurrently accessible from multiple threads without
+ synchronization.</div>
 </div>
 </div>
 </div>
@@ -129,12 +129,12 @@ extends <a href="CacheStorage.html" title="interface in freemarker.cache">CacheS
 <section class="detail" id="isConcurrent()">
 <h3>isConcurrent</h3>
 <div class="member-signature"><span class="return-type">boolean</span>&nbsp;<span class="element-name">isConcurrent</span>()</div>
-<div class="block">Returns true if this instance of cache storage is concurrently 
- accessible from multiple threads without synchronization.</div>
+<div class="block">Returns true if this instance of cache storage is concurrently accessible from multiple threads without
+ synchronization.</div>
 <dl class="notes">
 <dt>Returns:</dt>
-<dd>true if this instance of cache storage is concurrently 
- accessible from multiple threads without synchronization.</dd>
+<dd>true if this instance of cache storage is concurrently accessible from multiple threads without
+ synchronization.</dd>
 </dl>
 </section>
 </li>
diff --git a/docs/api/freemarker/cache/ConditionalTemplateConfigurationFactory.html b/docs/api/freemarker/cache/ConditionalTemplateConfigurationFactory.html
index 32abe820..2f1bd0c2 100644
--- a/docs/api/freemarker/cache/ConditionalTemplateConfigurationFactory.html
+++ b/docs/api/freemarker/cache/ConditionalTemplateConfigurationFactory.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>ConditionalTemplateConfigurationFactory (FreeMarker 2.3.34 API)</title>
+<title>ConditionalTemplateConfigurationFactory (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: ConditionalTemplateConfigurationFactory">
@@ -130,8 +130,8 @@ loadScripts(document, 'script');</script>
 <div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#setConfigurationOfChildren(freemarker.template.Configuration)">setConfigurationOfChildren</a></span>&#8203;(<a href="../template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</code></div>
 <div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
 <div class="block">Calls <a href="../core/TemplateConfiguration.html#setParentConfiguration(freemarker.template.Configuration)"><code>TemplateConfiguration.setParentConfiguration(Configuration)</code></a> on each enclosed
- <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="TemplateConfigurationFactory.html#setConfiguration(freemarker.template.Configuration)"><code>TemplateConfigurationFactory.setConfiguration(Configuration)</code></a>
- on each enclosed <a href="TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects.</div>
+ <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="TemplateConfigurationFactory.html#setConfiguration(freemarker.template.Configuration)"><code>TemplateConfigurationFactory.setConfiguration(Configuration)</code></a> on each
+ enclosed <a href="TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects.</div>
 </div>
 </div>
 </div>
@@ -189,14 +189,13 @@ loadScripts(document, 'script');</script>
 <dd><code><a href="TemplateConfigurationFactory.html#get(java.lang.String,java.lang.Object)">get</a></code>&nbsp;in class&nbsp;<code><a href="TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></code></dd>
 <dt>Parameters:</dt>
 <dd><code>sourceName</code> - The name (path) that was used for <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. See
-            <a href="../template/Template.html#getSourceName()"><code>Template.getSourceName()</code></a> for details.</dd>
+         <a href="../template/Template.html#getSourceName()"><code>Template.getSourceName()</code></a> for details.</dd>
 <dd><code>templateSource</code> - The object returned by <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>.</dd>
 <dt>Returns:</dt>
-<dd>The <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> to apply, or <code>null</code> if the there's no <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> for
-         this template source.</dd>
+<dd>The <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> to apply, or <code>null</code> if the there's no
+ <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> for this template source.</dd>
 <dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - Typically, if there factory needs further I/O to find out more about the template source, but that
-             fails.</dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - Typically, if the factory needs further I/O to find out more about the template source, but that fails.</dd>
 <dd><code><a href="TemplateConfigurationFactoryException.html" title="class in freemarker.cache">TemplateConfigurationFactoryException</a></code> - If there's a problem that's specific to the factory logic.</dd>
 </dl>
 </section>
@@ -207,9 +206,9 @@ loadScripts(document, 'script');</script>
 <div class="member-signature"><span class="modifiers">protected</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name">setConfigurationOfChildren</span>&#8203;<span class="parameters">(<a href="../template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</span></div>
 <div class="block"><span class="descfrm-type-label">Description copied from class:&nbsp;<code><a href="TemplateConfigurationFactory.html#setConfigurationOfChildren(freemarker.template.Configuration)">TemplateConfigurationFactory</a></code></span></div>
 <div class="block">Calls <a href="../core/TemplateConfiguration.html#setParentConfiguration(freemarker.template.Configuration)"><code>TemplateConfiguration.setParentConfiguration(Configuration)</code></a> on each enclosed
- <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="TemplateConfigurationFactory.html#setConfiguration(freemarker.template.Configuration)"><code>TemplateConfigurationFactory.setConfiguration(Configuration)</code></a>
- on each enclosed <a href="TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects. It only supposed to call these on the direct
- "children" of this object, not on the children of the children.</div>
+ <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="TemplateConfigurationFactory.html#setConfiguration(freemarker.template.Configuration)"><code>TemplateConfigurationFactory.setConfiguration(Configuration)</code></a> on each
+ enclosed <a href="TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects. It only supposed to call these on the direct "children" of
+ this object, not on the children of the children.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="TemplateConfigurationFactory.html#setConfigurationOfChildren(freemarker.template.Configuration)">setConfigurationOfChildren</a></code>&nbsp;in class&nbsp;<code><a href="TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></code></dd>
diff --git a/docs/api/freemarker/cache/FileExtensionMatcher.html b/docs/api/freemarker/cache/FileExtensionMatcher.html
index 9a847a62..e110ed23 100644
--- a/docs/api/freemarker/cache/FileExtensionMatcher.html
+++ b/docs/api/freemarker/cache/FileExtensionMatcher.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>FileExtensionMatcher (FreeMarker 2.3.34 API)</title>
+<title>FileExtensionMatcher (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: FileExtensionMatcher">
@@ -131,7 +131,7 @@ loadScripts(document, 'script');</script>
 <div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>void</code></div>
 <div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#setCaseInsensitive(boolean)">setCaseInsensitive</a></span>&#8203;(boolean&nbsp;caseInsensitive)</code></div>
 <div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
-<div class="block">Sets if the matching will be case insensitive (UNICODE compliant); default is <code>true</code>.</div>
+<div class="block">Sets if the matching will be case-insensitive (UNICODE compliant); default is <code>true</code>.</div>
 </div>
 </div>
 </div>
@@ -156,8 +156,8 @@ loadScripts(document, 'script');</script>
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name">FileExtensionMatcher</span>&#8203;<span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;extension)</span></div>
 <dl class="notes">
 <dt>Parameters:</dt>
-<dd><code>extension</code> - The file extension (without the initial dot). Can't contain there characters:
-            <code>'/'</code>, <code>'*'</code>, <code>'?'</code>. May contains <code>'.'</code>, but can't start with it.</dd>
+<dd><code>extension</code> - The file extension (without the initial dot). Can't contain there characters: <code>'/'</code>, <code>'*'</code>,
+         <code>'?'</code>. May contains <code>'.'</code>, but can't start with it.</dd>
 </dl>
 </section>
 </li>
@@ -191,7 +191,7 @@ loadScripts(document, 'script');</script>
 <section class="detail" id="setCaseInsensitive(boolean)">
 <h3>setCaseInsensitive</h3>
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name">setCaseInsensitive</span>&#8203;<span class="parameters">(boolean&nbsp;caseInsensitive)</span></div>
-<div class="block">Sets if the matching will be case insensitive (UNICODE compliant); default is <code>true</code>.</div>
+<div class="block">Sets if the matching will be case-insensitive (UNICODE compliant); default is <code>true</code>.</div>
 </section>
 </li>
 <li>
diff --git a/docs/api/freemarker/cache/FileNameGlobMatcher.html b/docs/api/freemarker/cache/FileNameGlobMatcher.html
index e87d96e8..26db2adc 100644
--- a/docs/api/freemarker/cache/FileNameGlobMatcher.html
+++ b/docs/api/freemarker/cache/FileNameGlobMatcher.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>FileNameGlobMatcher (FreeMarker 2.3.34 API)</title>
+<title>FileNameGlobMatcher (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: FileNameGlobMatcher">
@@ -133,7 +133,7 @@ loadScripts(document, 'script');</script>
 <div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>void</code></div>
 <div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#setCaseInsensitive(boolean)">setCaseInsensitive</a></span>&#8203;(boolean&nbsp;caseInsensitive)</code></div>
 <div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
-<div class="block">Sets if the matching will be case insensitive (UNICODE compliant); default is <code>false</code>.</div>
+<div class="block">Sets if the matching will be case-insensitive (UNICODE compliant); default is <code>false</code>.</div>
 </div>
 </div>
 </div>
@@ -193,7 +193,7 @@ loadScripts(document, 'script');</script>
 <section class="detail" id="setCaseInsensitive(boolean)">
 <h3>setCaseInsensitive</h3>
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name">setCaseInsensitive</span>&#8203;<span class="parameters">(boolean&nbsp;caseInsensitive)</span></div>
-<div class="block">Sets if the matching will be case insensitive (UNICODE compliant); default is <code>false</code>.</div>
+<div class="block">Sets if the matching will be case-insensitive (UNICODE compliant); default is <code>false</code>.</div>
 </section>
 </li>
 <li>
diff --git a/docs/api/freemarker/cache/FileTemplateLoader.html b/docs/api/freemarker/cache/FileTemplateLoader.html
index 09d1103a..7ce9434f 100644
--- a/docs/api/freemarker/cache/FileTemplateLoader.html
+++ b/docs/api/freemarker/cache/FileTemplateLoader.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>FileTemplateLoader (FreeMarker 2.3.34 API)</title>
+<title>FileTemplateLoader (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: FileTemplateLoader">
@@ -127,13 +127,13 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
 <div class="col-last even-row-color">
 <div class="block"><span class="deprecated-label">Deprecated.</span>
 <div class="deprecation-comment">Relying on what the current directory is is a bad practice; use
-             <a href="#%3Cinit%3E(java.io.File)"><code>FileTemplateLoader(File)</code></a> instead.</div>
+ <a href="#%3Cinit%3E(java.io.File)"><code>FileTemplateLoader(File)</code></a> instead.</div>
 </div>
 </div>
 <div class="col-constructor-name odd-row-color"><code><span class="member-name-link"><a href="#%3Cinit%3E(java.io.File)">FileTemplateLoader</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/File.html" title="class or interface in java.io" class="external-link">File</a>&nbsp;baseDir)</code></div>
 <div class="col-last odd-row-color">
-<div class="block">Creates a new file template loader that will use the specified directory
- as the base directory for loading templates.</div>
+<div class="block">Creates a new file template loader that will use the specified directory as the base directory for loading
+ templates.</div>
 </div>
 <div class="col-constructor-name even-row-color"><code><span class="member-name-link"><a href="#%3Cinit%3E(java.io.File,boolean)">FileTemplateLoader</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/File.html" title="class or interface in java.io" class="external-link">File</a>&nbsp;baseDir,
  boolean&nbsp;disableCanonicalPathCheck)</code></div>
@@ -251,7 +251,7 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
                    throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
 <div class="deprecation-comment">Relying on what the current directory is is a bad practice; use
-             <a href="#%3Cinit%3E(java.io.File)"><code>FileTemplateLoader(File)</code></a> instead.</div>
+ <a href="#%3Cinit%3E(java.io.File)"><code>FileTemplateLoader(File)</code></a> instead.</div>
 </div>
 <div class="block">Creates a new file template cache that will use the current directory (the value of the system property
  <code>user.dir</code> as the base directory for loading templates. It will not allow access to template files
@@ -267,10 +267,9 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
 <h3>FileTemplateLoader</h3>
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name">FileTemplateLoader</span>&#8203;<span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/File.html" title="class or interface in java.io" class="external-link">File</a>&nbsp;baseDir)</span>
                    throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
-<div class="block">Creates a new file template loader that will use the specified directory
- as the base directory for loading templates. It will not allow access to
- template files that are accessible through symlinks that point outside 
- the base directory.</div>
+<div class="block">Creates a new file template loader that will use the specified directory as the base directory for loading
+ templates. It will not allow access to template files that are accessible through symlinks that point outside the
+ base directory.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
 <dd><code>baseDir</code> - the base directory for loading templates</dd>
@@ -291,12 +290,12 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
 <dt>Parameters:</dt>
 <dd><code>baseDir</code> - the base directory for loading templates</dd>
 <dd><code>disableCanonicalPathCheck</code> - If <code>true</code>, it will not check if the file to be loaded is inside the <code>baseDir</code> or not,
-            according the <em>canonical</em> paths of the <code>baseDir</code> and the file to load. Note that
-            <a href="../template/Configuration.html#getTemplate(java.lang.String)"><code>Configuration.getTemplate(String)</code></a> and (its overloads) already prevents backing out from the
-            template directory with paths like <code>/../../../etc/password</code>, however, that can be circumvented
-            with symbolic links or other file system features. If you really want to use symbolic links that point
-            outside the <code>baseDir</code>, set this parameter to <code>true</code>, but then be very careful with
-            template paths that are supplied by the visitor or an external system.</dd>
+         according the <em>canonical</em> paths of the <code>baseDir</code> and the file to load. Note that
+         <a href="../template/Configuration.html#getTemplate(java.lang.String)"><code>Configuration.getTemplate(String)</code></a> and (its overloads) already prevents backing out from the
+         template directory with paths like <code>/../../../etc/password</code>, however, that can be circumvented with
+         symbolic links or other file system features. If you really want to use symbolic links that point outside
+         the <code>baseDir</code>, set this parameter to <code>true</code>, but then be very careful with template paths
+         that are supplied by the visitor or an external system.</dd>
 <dt>Throws:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code></dd>
 </dl>
@@ -322,38 +321,36 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
 <dt>Specified by:</dt>
 <dd><code><a href="TemplateLoader.html#findTemplateSource(java.lang.String)">findTemplateSource</a></code>&nbsp;in interface&nbsp;<code><a href="TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></dd>
 <dt>Parameters:</dt>
-<dd><code>name</code> - The name (template root directory relative path) of the template, already localized and normalized by
-            the <a href="TemplateCache.html" title="class in freemarker.cache"><code>cache</code></a>. It is completely up to the loader implementation to
-            interpret the name, however it should expect to receive hierarchical paths where path components are
-            separated by a slash (not backslash). Backslashes (or any other OS specific separator character) are
-            not considered as separators by FreeMarker, and thus they will not be replaced with slash before
-            passing to this method, so it's up to the template loader to handle them (say, by throwing an
-            exception that tells the user that the path (s)he has entered is invalid, as (s)he must use slash --
-            typical mistake of Windows users). The passed names are always considered relative to some
-            loader-defined root location (often referred as the "template root directory"), and will never start
-            with a slash, nor will they contain a path component consisting of either a single or a double dot --
-            these are all resolved by the template cache before passing the name to the loader. As a side effect,
-            paths that trivially reach outside template root directory, such as <code>../my.ftl</code>, will be
-            rejected by the template cache, so they never reach the template loader. Note again, that if the path
-            uses backslash as path separator instead of slash as (the template loader should not accept that), the
-            normalization will not properly happen, as FreeMarker (the cache) recognizes only the slashes as
-            separators.</dd>
+<dd><code>name</code> - The name (template root directory relative path) of the template, already localized and normalized by the
+         <a href="TemplateCache.html" title="class in freemarker.cache"><code>cache</code></a>. It is completely up to the loader implementation to
+         interpret the name, however it should expect to receive hierarchical paths where path components are
+         separated by a slash (not backslash). Backslashes (or any other OS specific separator character) are not
+         considered as separators by FreeMarker, and thus they will not be replaced with slash before passing to
+         this method, so it's up to the template loader to handle them (say, by throwing an exception that tells
+         the user that the path (s)he has entered is invalid, as (s)he must use slash -- typical mistake of
+         Windows users). The passed names are always considered relative to some loader-defined root location
+         (often referred as the "template root directory"), and will never start with a slash, nor will they
+         contain a path component consisting of either a single or a double dot -- these are all resolved by the
+         template cache before passing the name to the loader. As a side effect, paths that trivially reach
+         outside template root directory, such as <code>../my.ftl</code>, will be rejected by the template cache, so
+         they never reach the template loader. Note again, that if the path uses backslash as path separator
+         instead of slash as (the template loader should not accept that), the normalization will not properly
+         happen, as FreeMarker (the cache) recognizes only the slashes as separators.</dd>
 <dt>Returns:</dt>
 <dd>An object representing the template source, which can be supplied in subsequent calls to
-         <a href="TemplateLoader.html#getLastModified(java.lang.Object)"><code>TemplateLoader.getLastModified(Object)</code></a> and <a href="TemplateLoader.html#getReader(java.lang.Object,java.lang.String)"><code>TemplateLoader.getReader(Object, String)</code></a>, when those are called on the
-         same <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>. <code>null</code> must be returned if the source for the template doesn't exist;
-         don't throw exception then! The exact type of this object is up to the <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>
-         implementation. As this object is possibly used as hash key in caches, and is surly compared with another
-         template source for equality, <b>it must have a proper <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> and
-         <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link"><code>Object.hashCode()</code></a>) implementation</b>. Especially, template sources that refer to the same
-         physical source must be equivalent, otherwise template caching can become inefficient. This is only
-         expected from <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> when the compared template sources came from the same
-         <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> instance. Also, it must not influence the equality if the source is open or
-         closed (<a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
+ <a href="TemplateLoader.html#getLastModified(java.lang.Object)"><code>TemplateLoader.getLastModified(Object)</code></a> and <a href="TemplateLoader.html#getReader(java.lang.Object,java.lang.String)"><code>TemplateLoader.getReader(Object, String)</code></a>, when those are called on the same
+ <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>. <code>null</code> must be returned if the source for the template doesn't exist; don't throw
+ exception then! The exact type of this object is up to the <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> implementation. As this object
+ is possibly used as hash key in caches, and is surly compared with another template source for equality, <b>it
+ must have a proper <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> and <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link"><code>Object.hashCode()</code></a>) implementation</b>. Especially,
+ template sources that refer to the same physical source must be equivalent, otherwise template caching can become
+ inefficient. This is only expected from <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> when the compared template sources came
+ from the same <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> instance. Also, it must not influence the equality if the source is open or
+ closed (<a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
 <dt>Throws:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - When an error occurs that makes it impossible to find out if the template exists, or to access the
-             existing template. Don't throw exception if the template doesn't exist, instead return with
-             <code>null</code> then!</dd>
+         existing template. Don't throw exception if the template doesn't exist, instead return with <code>null</code>
+         then!</dd>
 </dl>
 </section>
 </li>
@@ -369,15 +366,14 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
 <dd><code><a href="TemplateLoader.html#getLastModified(java.lang.Object)">getLastModified</a></code>&nbsp;in interface&nbsp;<code><a href="TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></dd>
 <dt>Parameters:</dt>
 <dd><code>templateSource</code> - an object representing a template source (the template file), obtained through a prior call to
-            <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
-            <a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
+         <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
+         <a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
 <dt>Returns:</dt>
 <dd>The time of last modification for the specified template source, or -1 if the time is not known. This
-            value meant to be milliseconds since the epoch, but in fact FreeMarker doesn't care what it means, it
-            only cares if it changes, in which case the template needs to be reloaded (even if the value has
-            decreased). -1 is not special in that regard either; if you keep returning it, FreeMarker won't
-            reload the template (as far as it's not evicted from the cache from some other
-            reason). Note that <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Long.html#MIN_VALUE" title="class or interface in java.lang" class="external-link"><code>Long.MIN_VALUE</code></a> is reserved for internal use.</dd>
+ value meant to be milliseconds since the epoch, but in fact FreeMarker doesn't care what it means, it only cares
+ if it changes, in which case the template needs to be reloaded (even if the value has decreased). -1 is not
+ special in that regard either; if you keep returning it, FreeMarker won't reload the template (as far as it's not
+ evicted from the cache from some other reason). Note that <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Long.html#MIN_VALUE" title="class or interface in java.lang" class="external-link"><code>Long.MIN_VALUE</code></a> is reserved for internal use.</dd>
 </dl>
 </section>
 </li>
@@ -393,31 +389,31 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
  reads the template from its beginning. Before this method is called for the second time (or later), its caller
  must close the previously returned <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a>, and it must not use it anymore. That is, this method is not
  required to support multiple concurrent readers for the same source <code>templateSource</code> object.
- 
+
  <p>
  Typically, this method is called if the template is missing from the cache, or if after calling
  <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a> and <a href="TemplateLoader.html#getLastModified(java.lang.Object)"><code>TemplateLoader.getLastModified(Object)</code></a> it was determined that the cached copy
  of the template is stale. Then, if it turns out that the <code>encoding</code> parameter used doesn't match the actual
  template content (based on the <code>#ftl encoding=...</code> header), this method will be called for a second time
  with the correct <code>encoding</code> parameter value.
- 
+
  <p>
- Unlike <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>, this method must not tolerate if the template is not found, and
- must throw <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link"><code>IOException</code></a> in that case.</div>
+ Unlike <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>, this method must not tolerate if the template is not found, and must
+ throw <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link"><code>IOException</code></a> in that case.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="TemplateLoader.html#getReader(java.lang.Object,java.lang.String)">getReader</a></code>&nbsp;in interface&nbsp;<code><a href="TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></dd>
 <dt>Parameters:</dt>
 <dd><code>templateSource</code> - an object representing a template source, obtained through a prior call to
-            <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
-            <a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
-<dd><code>encoding</code> - the character encoding used to translate source bytes to characters. Some loaders may not have access
-            to the byte representation of the template stream, and instead directly obtain a character stream.
-            These loaders should ignore the encoding parameter.</dd>
+         <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
+         <a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
+<dd><code>encoding</code> - the character encoding used to translate source bytes to characters. Some loaders may not have access to
+         the byte representation of the template stream, and instead directly obtain a character stream. These
+         loaders should ignore the encoding parameter.</dd>
 <dt>Returns:</dt>
 <dd>A <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a> representing the template character stream; not <code>null</code>. It's the responsibility of
-         the caller (which is <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a> usually) to <code>close()</code> it. The <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a> is not
-         required to work after the <code>templateSource</code> was closed (<a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
+ the caller (which is <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a> usually) to <code>close()</code> it. The <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a> is not required to
+ work after the <code>templateSource</code> was closed (<a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
 <dt>Throws:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - if an I/O error occurs while accessing the stream.</dd>
 </dl>
@@ -462,7 +458,7 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
  check can be resource intensive, as to check the file name the directories involved, up to the
  <a href="#getBaseDirectory()"><code>getBaseDirectory()</code></a> directory, must be listed. Positive results (matching case) will be cached without
  expiration time.
- 
+
  <p>The default in <a href="FileTemplateLoader.html" title="class in freemarker.cache"><code>FileTemplateLoader</code></a> is <code>false</code>, but subclasses may change they by overriding
  <a href="#getEmulateCaseSensitiveFileSystemDefault()"><code>getEmulateCaseSensitiveFileSystemDefault()</code></a>.</div>
 <dl class="notes">
diff --git a/docs/api/freemarker/cache/FirstMatchTemplateConfigurationFactory.html b/docs/api/freemarker/cache/FirstMatchTemplateConfigurationFactory.html
index 19f9eb65..59ed505c 100644
--- a/docs/api/freemarker/cache/FirstMatchTemplateConfigurationFactory.html
+++ b/docs/api/freemarker/cache/FirstMatchTemplateConfigurationFactory.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>FirstMatchTemplateConfigurationFactory (FreeMarker 2.3.34 API)</title>
+<title>FirstMatchTemplateConfigurationFactory (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: FirstMatchTemplateConfigurationFactory">
@@ -147,8 +147,8 @@ loadScripts(document, 'script');</script>
 <div class="col-second even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#setConfigurationOfChildren(freemarker.template.Configuration)">setConfigurationOfChildren</a></span>&#8203;(<a href="../template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</code></div>
 <div class="col-last even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
 <div class="block">Calls <a href="../core/TemplateConfiguration.html#setParentConfiguration(freemarker.template.Configuration)"><code>TemplateConfiguration.setParentConfiguration(Configuration)</code></a> on each enclosed
- <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="TemplateConfigurationFactory.html#setConfiguration(freemarker.template.Configuration)"><code>TemplateConfigurationFactory.setConfiguration(Configuration)</code></a>
- on each enclosed <a href="TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects.</div>
+ <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="TemplateConfigurationFactory.html#setConfiguration(freemarker.template.Configuration)"><code>TemplateConfigurationFactory.setConfiguration(Configuration)</code></a> on each
+ enclosed <a href="TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects.</div>
 </div>
 <div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>void</code></div>
 <div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#setNoMatchErrorDetails(java.lang.String)">setNoMatchErrorDetails</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;noMatchErrorDetails)</code></div>
@@ -201,14 +201,13 @@ loadScripts(document, 'script');</script>
 <dd><code><a href="TemplateConfigurationFactory.html#get(java.lang.String,java.lang.Object)">get</a></code>&nbsp;in class&nbsp;<code><a href="TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></code></dd>
 <dt>Parameters:</dt>
 <dd><code>sourceName</code> - The name (path) that was used for <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. See
-            <a href="../template/Template.html#getSourceName()"><code>Template.getSourceName()</code></a> for details.</dd>
+         <a href="../template/Template.html#getSourceName()"><code>Template.getSourceName()</code></a> for details.</dd>
 <dd><code>templateSource</code> - The object returned by <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>.</dd>
 <dt>Returns:</dt>
-<dd>The <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> to apply, or <code>null</code> if the there's no <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> for
-         this template source.</dd>
+<dd>The <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> to apply, or <code>null</code> if the there's no
+ <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> for this template source.</dd>
 <dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - Typically, if there factory needs further I/O to find out more about the template source, but that
-             fails.</dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - Typically, if the factory needs further I/O to find out more about the template source, but that fails.</dd>
 <dd><code><a href="TemplateConfigurationFactoryException.html" title="class in freemarker.cache">TemplateConfigurationFactoryException</a></code> - If there's a problem that's specific to the factory logic.</dd>
 </dl>
 </section>
@@ -236,8 +235,8 @@ loadScripts(document, 'script');</script>
 <section class="detail" id="getNoMatchErrorDetails()">
 <h3>getNoMatchErrorDetails</h3>
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name">getNoMatchErrorDetails</span>()</div>
-<div class="block">Use this to specify the text added to the exception error message when there was no matching choice.
- The default is <code>null</code> (no error details).</div>
+<div class="block">Use this to specify the text added to the exception error message when there was no matching choice. The default
+ is <code>null</code> (no error details).</div>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd><a href="#setAllowNoMatch(boolean)"><code>setAllowNoMatch(boolean)</code></a></dd>
@@ -270,9 +269,9 @@ loadScripts(document, 'script');</script>
 <div class="member-signature"><span class="modifiers">protected</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name">setConfigurationOfChildren</span>&#8203;<span class="parameters">(<a href="../template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</span></div>
 <div class="block"><span class="descfrm-type-label">Description copied from class:&nbsp;<code><a href="TemplateConfigurationFactory.html#setConfigurationOfChildren(freemarker.template.Configuration)">TemplateConfigurationFactory</a></code></span></div>
 <div class="block">Calls <a href="../core/TemplateConfiguration.html#setParentConfiguration(freemarker.template.Configuration)"><code>TemplateConfiguration.setParentConfiguration(Configuration)</code></a> on each enclosed
- <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="TemplateConfigurationFactory.html#setConfiguration(freemarker.template.Configuration)"><code>TemplateConfigurationFactory.setConfiguration(Configuration)</code></a>
- on each enclosed <a href="TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects. It only supposed to call these on the direct
- "children" of this object, not on the children of the children.</div>
+ <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="TemplateConfigurationFactory.html#setConfiguration(freemarker.template.Configuration)"><code>TemplateConfigurationFactory.setConfiguration(Configuration)</code></a> on each
+ enclosed <a href="TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects. It only supposed to call these on the direct "children" of
+ this object, not on the children of the children.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="TemplateConfigurationFactory.html#setConfigurationOfChildren(freemarker.template.Configuration)">setConfigurationOfChildren</a></code>&nbsp;in class&nbsp;<code><a href="TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></code></dd>
diff --git a/docs/api/freemarker/cache/MergingTemplateConfigurationFactory.html b/docs/api/freemarker/cache/MergingTemplateConfigurationFactory.html
index 0113b296..92d228da 100644
--- a/docs/api/freemarker/cache/MergingTemplateConfigurationFactory.html
+++ b/docs/api/freemarker/cache/MergingTemplateConfigurationFactory.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>MergingTemplateConfigurationFactory (FreeMarker 2.3.34 API)</title>
+<title>MergingTemplateConfigurationFactory (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: MergingTemplateConfigurationFactory">
@@ -127,8 +127,8 @@ loadScripts(document, 'script');</script>
 <div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#setConfigurationOfChildren(freemarker.template.Configuration)">setConfigurationOfChildren</a></span>&#8203;(<a href="../template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</code></div>
 <div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
 <div class="block">Calls <a href="../core/TemplateConfiguration.html#setParentConfiguration(freemarker.template.Configuration)"><code>TemplateConfiguration.setParentConfiguration(Configuration)</code></a> on each enclosed
- <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="TemplateConfigurationFactory.html#setConfiguration(freemarker.template.Configuration)"><code>TemplateConfigurationFactory.setConfiguration(Configuration)</code></a>
- on each enclosed <a href="TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects.</div>
+ <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="TemplateConfigurationFactory.html#setConfiguration(freemarker.template.Configuration)"><code>TemplateConfigurationFactory.setConfiguration(Configuration)</code></a> on each
+ enclosed <a href="TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects.</div>
 </div>
 </div>
 </div>
@@ -178,14 +178,13 @@ loadScripts(document, 'script');</script>
 <dd><code><a href="TemplateConfigurationFactory.html#get(java.lang.String,java.lang.Object)">get</a></code>&nbsp;in class&nbsp;<code><a href="TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></code></dd>
 <dt>Parameters:</dt>
 <dd><code>sourceName</code> - The name (path) that was used for <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. See
-            <a href="../template/Template.html#getSourceName()"><code>Template.getSourceName()</code></a> for details.</dd>
+         <a href="../template/Template.html#getSourceName()"><code>Template.getSourceName()</code></a> for details.</dd>
 <dd><code>templateSource</code> - The object returned by <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>.</dd>
 <dt>Returns:</dt>
-<dd>The <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> to apply, or <code>null</code> if the there's no <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> for
-         this template source.</dd>
+<dd>The <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> to apply, or <code>null</code> if the there's no
+ <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> for this template source.</dd>
 <dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - Typically, if there factory needs further I/O to find out more about the template source, but that
-             fails.</dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - Typically, if the factory needs further I/O to find out more about the template source, but that fails.</dd>
 <dd><code><a href="TemplateConfigurationFactoryException.html" title="class in freemarker.cache">TemplateConfigurationFactoryException</a></code> - If there's a problem that's specific to the factory logic.</dd>
 </dl>
 </section>
@@ -196,9 +195,9 @@ loadScripts(document, 'script');</script>
 <div class="member-signature"><span class="modifiers">protected</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name">setConfigurationOfChildren</span>&#8203;<span class="parameters">(<a href="../template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</span></div>
 <div class="block"><span class="descfrm-type-label">Description copied from class:&nbsp;<code><a href="TemplateConfigurationFactory.html#setConfigurationOfChildren(freemarker.template.Configuration)">TemplateConfigurationFactory</a></code></span></div>
 <div class="block">Calls <a href="../core/TemplateConfiguration.html#setParentConfiguration(freemarker.template.Configuration)"><code>TemplateConfiguration.setParentConfiguration(Configuration)</code></a> on each enclosed
- <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="TemplateConfigurationFactory.html#setConfiguration(freemarker.template.Configuration)"><code>TemplateConfigurationFactory.setConfiguration(Configuration)</code></a>
- on each enclosed <a href="TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects. It only supposed to call these on the direct
- "children" of this object, not on the children of the children.</div>
+ <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="TemplateConfigurationFactory.html#setConfiguration(freemarker.template.Configuration)"><code>TemplateConfigurationFactory.setConfiguration(Configuration)</code></a> on each
+ enclosed <a href="TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects. It only supposed to call these on the direct "children" of
+ this object, not on the children of the children.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="TemplateConfigurationFactory.html#setConfigurationOfChildren(freemarker.template.Configuration)">setConfigurationOfChildren</a></code>&nbsp;in class&nbsp;<code><a href="TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></code></dd>
diff --git a/docs/api/freemarker/cache/MruCacheStorage.html b/docs/api/freemarker/cache/MruCacheStorage.html
index 4bbc4630..30c0be59 100644
--- a/docs/api/freemarker/cache/MruCacheStorage.html
+++ b/docs/api/freemarker/cache/MruCacheStorage.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>MruCacheStorage (FreeMarker 2.3.34 API)</title>
+<title>MruCacheStorage (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: MruCacheStorage">
diff --git a/docs/api/freemarker/cache/MultiTemplateLoader.html b/docs/api/freemarker/cache/MultiTemplateLoader.html
index fb16d20e..7cc2d17c 100644
--- a/docs/api/freemarker/cache/MultiTemplateLoader.html
+++ b/docs/api/freemarker/cache/MultiTemplateLoader.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>MultiTemplateLoader (FreeMarker 2.3.34 API)</title>
+<title>MultiTemplateLoader (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: MultiTemplateLoader">
@@ -225,38 +225,36 @@ implements <a href="StatefulTemplateLoader.html" title="interface in freemarker.
 <dt>Specified by:</dt>
 <dd><code><a href="TemplateLoader.html#findTemplateSource(java.lang.String)">findTemplateSource</a></code>&nbsp;in interface&nbsp;<code><a href="TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></dd>
 <dt>Parameters:</dt>
-<dd><code>name</code> - The name (template root directory relative path) of the template, already localized and normalized by
-            the <a href="TemplateCache.html" title="class in freemarker.cache"><code>cache</code></a>. It is completely up to the loader implementation to
-            interpret the name, however it should expect to receive hierarchical paths where path components are
-            separated by a slash (not backslash). Backslashes (or any other OS specific separator character) are
-            not considered as separators by FreeMarker, and thus they will not be replaced with slash before
-            passing to this method, so it's up to the template loader to handle them (say, by throwing an
-            exception that tells the user that the path (s)he has entered is invalid, as (s)he must use slash --
-            typical mistake of Windows users). The passed names are always considered relative to some
-            loader-defined root location (often referred as the "template root directory"), and will never start
-            with a slash, nor will they contain a path component consisting of either a single or a double dot --
-            these are all resolved by the template cache before passing the name to the loader. As a side effect,
-            paths that trivially reach outside template root directory, such as <code>../my.ftl</code>, will be
-            rejected by the template cache, so they never reach the template loader. Note again, that if the path
-            uses backslash as path separator instead of slash as (the template loader should not accept that), the
-            normalization will not properly happen, as FreeMarker (the cache) recognizes only the slashes as
-            separators.</dd>
+<dd><code>name</code> - The name (template root directory relative path) of the template, already localized and normalized by the
+         <a href="TemplateCache.html" title="class in freemarker.cache"><code>cache</code></a>. It is completely up to the loader implementation to
+         interpret the name, however it should expect to receive hierarchical paths where path components are
+         separated by a slash (not backslash). Backslashes (or any other OS specific separator character) are not
+         considered as separators by FreeMarker, and thus they will not be replaced with slash before passing to
+         this method, so it's up to the template loader to handle them (say, by throwing an exception that tells
+         the user that the path (s)he has entered is invalid, as (s)he must use slash -- typical mistake of
+         Windows users). The passed names are always considered relative to some loader-defined root location
+         (often referred as the "template root directory"), and will never start with a slash, nor will they
+         contain a path component consisting of either a single or a double dot -- these are all resolved by the
+         template cache before passing the name to the loader. As a side effect, paths that trivially reach
+         outside template root directory, such as <code>../my.ftl</code>, will be rejected by the template cache, so
+         they never reach the template loader. Note again, that if the path uses backslash as path separator
+         instead of slash as (the template loader should not accept that), the normalization will not properly
+         happen, as FreeMarker (the cache) recognizes only the slashes as separators.</dd>
 <dt>Returns:</dt>
 <dd>An object representing the template source, which can be supplied in subsequent calls to
-         <a href="TemplateLoader.html#getLastModified(java.lang.Object)"><code>TemplateLoader.getLastModified(Object)</code></a> and <a href="TemplateLoader.html#getReader(java.lang.Object,java.lang.String)"><code>TemplateLoader.getReader(Object, String)</code></a>, when those are called on the
-         same <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>. <code>null</code> must be returned if the source for the template doesn't exist;
-         don't throw exception then! The exact type of this object is up to the <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>
-         implementation. As this object is possibly used as hash key in caches, and is surly compared with another
-         template source for equality, <b>it must have a proper <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> and
-         <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link"><code>Object.hashCode()</code></a>) implementation</b>. Especially, template sources that refer to the same
-         physical source must be equivalent, otherwise template caching can become inefficient. This is only
-         expected from <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> when the compared template sources came from the same
-         <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> instance. Also, it must not influence the equality if the source is open or
-         closed (<a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
+ <a href="TemplateLoader.html#getLastModified(java.lang.Object)"><code>TemplateLoader.getLastModified(Object)</code></a> and <a href="TemplateLoader.html#getReader(java.lang.Object,java.lang.String)"><code>TemplateLoader.getReader(Object, String)</code></a>, when those are called on the same
+ <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>. <code>null</code> must be returned if the source for the template doesn't exist; don't throw
+ exception then! The exact type of this object is up to the <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> implementation. As this object
+ is possibly used as hash key in caches, and is surly compared with another template source for equality, <b>it
+ must have a proper <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> and <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link"><code>Object.hashCode()</code></a>) implementation</b>. Especially,
+ template sources that refer to the same physical source must be equivalent, otherwise template caching can become
+ inefficient. This is only expected from <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> when the compared template sources came
+ from the same <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> instance. Also, it must not influence the equality if the source is open or
+ closed (<a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
 <dt>Throws:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - When an error occurs that makes it impossible to find out if the template exists, or to access the
-             existing template. Don't throw exception if the template doesn't exist, instead return with
-             <code>null</code> then!</dd>
+         existing template. Don't throw exception if the template doesn't exist, instead return with <code>null</code>
+         then!</dd>
 </dl>
 </section>
 </li>
@@ -272,15 +270,14 @@ implements <a href="StatefulTemplateLoader.html" title="interface in freemarker.
 <dd><code><a href="TemplateLoader.html#getLastModified(java.lang.Object)">getLastModified</a></code>&nbsp;in interface&nbsp;<code><a href="TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></dd>
 <dt>Parameters:</dt>
 <dd><code>templateSource</code> - an object representing a template source (the template file), obtained through a prior call to
-            <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
-            <a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
+         <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
+         <a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
 <dt>Returns:</dt>
 <dd>The time of last modification for the specified template source, or -1 if the time is not known. This
-            value meant to be milliseconds since the epoch, but in fact FreeMarker doesn't care what it means, it
-            only cares if it changes, in which case the template needs to be reloaded (even if the value has
-            decreased). -1 is not special in that regard either; if you keep returning it, FreeMarker won't
-            reload the template (as far as it's not evicted from the cache from some other
-            reason). Note that <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Long.html#MIN_VALUE" title="class or interface in java.lang" class="external-link"><code>Long.MIN_VALUE</code></a> is reserved for internal use.</dd>
+ value meant to be milliseconds since the epoch, but in fact FreeMarker doesn't care what it means, it only cares
+ if it changes, in which case the template needs to be reloaded (even if the value has decreased). -1 is not
+ special in that regard either; if you keep returning it, FreeMarker won't reload the template (as far as it's not
+ evicted from the cache from some other reason). Note that <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Long.html#MIN_VALUE" title="class or interface in java.lang" class="external-link"><code>Long.MIN_VALUE</code></a> is reserved for internal use.</dd>
 </dl>
 </section>
 </li>
@@ -296,31 +293,31 @@ implements <a href="StatefulTemplateLoader.html" title="interface in freemarker.
  reads the template from its beginning. Before this method is called for the second time (or later), its caller
  must close the previously returned <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a>, and it must not use it anymore. That is, this method is not
  required to support multiple concurrent readers for the same source <code>templateSource</code> object.
- 
+
  <p>
  Typically, this method is called if the template is missing from the cache, or if after calling
  <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a> and <a href="TemplateLoader.html#getLastModified(java.lang.Object)"><code>TemplateLoader.getLastModified(Object)</code></a> it was determined that the cached copy
  of the template is stale. Then, if it turns out that the <code>encoding</code> parameter used doesn't match the actual
  template content (based on the <code>#ftl encoding=...</code> header), this method will be called for a second time
  with the correct <code>encoding</code> parameter value.
- 
+
  <p>
- Unlike <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>, this method must not tolerate if the template is not found, and
- must throw <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link"><code>IOException</code></a> in that case.</div>
+ Unlike <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>, this method must not tolerate if the template is not found, and must
+ throw <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link"><code>IOException</code></a> in that case.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="TemplateLoader.html#getReader(java.lang.Object,java.lang.String)">getReader</a></code>&nbsp;in interface&nbsp;<code><a href="TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></dd>
 <dt>Parameters:</dt>
 <dd><code>templateSource</code> - an object representing a template source, obtained through a prior call to
-            <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
-            <a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
-<dd><code>encoding</code> - the character encoding used to translate source bytes to characters. Some loaders may not have access
-            to the byte representation of the template stream, and instead directly obtain a character stream.
-            These loaders should ignore the encoding parameter.</dd>
+         <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
+         <a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
+<dd><code>encoding</code> - the character encoding used to translate source bytes to characters. Some loaders may not have access to
+         the byte representation of the template stream, and instead directly obtain a character stream. These
+         loaders should ignore the encoding parameter.</dd>
 <dt>Returns:</dt>
 <dd>A <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a> representing the template character stream; not <code>null</code>. It's the responsibility of
-         the caller (which is <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a> usually) to <code>close()</code> it. The <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a> is not
-         required to work after the <code>templateSource</code> was closed (<a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
+ the caller (which is <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a> usually) to <code>close()</code> it. The <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a> is not required to
+ work after the <code>templateSource</code> was closed (<a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
 <dt>Throws:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - if an I/O error occurs while accessing the stream.</dd>
 </dl>
diff --git a/docs/api/freemarker/cache/NotMatcher.html b/docs/api/freemarker/cache/NotMatcher.html
index bc8cd18b..ed4ca17f 100644
--- a/docs/api/freemarker/cache/NotMatcher.html
+++ b/docs/api/freemarker/cache/NotMatcher.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>NotMatcher (FreeMarker 2.3.34 API)</title>
+<title>NotMatcher (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: NotMatcher">
diff --git a/docs/api/freemarker/cache/NullCacheStorage.html b/docs/api/freemarker/cache/NullCacheStorage.html
index e554ef7e..159ebf1a 100644
--- a/docs/api/freemarker/cache/NullCacheStorage.html
+++ b/docs/api/freemarker/cache/NullCacheStorage.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>NullCacheStorage (FreeMarker 2.3.34 API)</title>
+<title>NullCacheStorage (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: NullCacheStorage">
@@ -150,8 +150,8 @@ implements <a href="ConcurrentCacheStorage.html" title="interface in freemarker.
 <div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>boolean</code></div>
 <div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#isConcurrent()">isConcurrent</a></span>()</code></div>
 <div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
-<div class="block">Returns true if this instance of cache storage is concurrently 
- accessible from multiple threads without synchronization.</div>
+<div class="block">Returns true if this instance of cache storage is concurrently accessible from multiple threads without
+ synchronization.</div>
 </div>
 <div class="col-first even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>void</code></div>
 <div class="col-second even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#put(java.lang.Object,java.lang.Object)">put</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&nbsp;key,
@@ -214,14 +214,14 @@ implements <a href="ConcurrentCacheStorage.html" title="interface in freemarker.
 <h3>isConcurrent</h3>
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name">isConcurrent</span>()</div>
 <div class="block"><span class="descfrm-type-label">Description copied from interface:&nbsp;<code><a href="ConcurrentCacheStorage.html#isConcurrent()">ConcurrentCacheStorage</a></code></span></div>
-<div class="block">Returns true if this instance of cache storage is concurrently 
- accessible from multiple threads without synchronization.</div>
+<div class="block">Returns true if this instance of cache storage is concurrently accessible from multiple threads without
+ synchronization.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="ConcurrentCacheStorage.html#isConcurrent()">isConcurrent</a></code>&nbsp;in interface&nbsp;<code><a href="ConcurrentCacheStorage.html" title="interface in freemarker.cache">ConcurrentCacheStorage</a></code></dd>
 <dt>Returns:</dt>
-<dd>true if this instance of cache storage is concurrently 
- accessible from multiple threads without synchronization.</dd>
+<dd>true if this instance of cache storage is concurrently accessible from multiple threads without
+ synchronization.</dd>
 </dl>
 </section>
 </li>
diff --git a/docs/api/freemarker/cache/OrMatcher.html b/docs/api/freemarker/cache/OrMatcher.html
index 087f9d5e..29aa8d9d 100644
--- a/docs/api/freemarker/cache/OrMatcher.html
+++ b/docs/api/freemarker/cache/OrMatcher.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>OrMatcher (FreeMarker 2.3.34 API)</title>
+<title>OrMatcher (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: OrMatcher">
diff --git a/docs/api/freemarker/cache/PathGlobMatcher.html b/docs/api/freemarker/cache/PathGlobMatcher.html
index 8564b345..3cb3810c 100644
--- a/docs/api/freemarker/cache/PathGlobMatcher.html
+++ b/docs/api/freemarker/cache/PathGlobMatcher.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>PathGlobMatcher (FreeMarker 2.3.34 API)</title>
+<title>PathGlobMatcher (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: PathGlobMatcher">
diff --git a/docs/api/freemarker/cache/PathRegexMatcher.html b/docs/api/freemarker/cache/PathRegexMatcher.html
index 23a30759..bfb81bad 100644
--- a/docs/api/freemarker/cache/PathRegexMatcher.html
+++ b/docs/api/freemarker/cache/PathRegexMatcher.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>PathRegexMatcher (FreeMarker 2.3.34 API)</title>
+<title>PathRegexMatcher (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: PathRegexMatcher">
diff --git a/docs/api/freemarker/cache/SoftCacheStorage.html b/docs/api/freemarker/cache/SoftCacheStorage.html
index 886d51cd..094c8489 100644
--- a/docs/api/freemarker/cache/SoftCacheStorage.html
+++ b/docs/api/freemarker/cache/SoftCacheStorage.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>SoftCacheStorage (FreeMarker 2.3.34 API)</title>
+<title>SoftCacheStorage (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: SoftCacheStorage">
@@ -195,8 +195,8 @@ implements <a href="ConcurrentCacheStorage.html" title="interface in freemarker.
 <dt>Specified by:</dt>
 <dd><code><a href="ConcurrentCacheStorage.html#isConcurrent()">isConcurrent</a></code>&nbsp;in interface&nbsp;<code><a href="ConcurrentCacheStorage.html" title="interface in freemarker.cache">ConcurrentCacheStorage</a></code></dd>
 <dt>Returns:</dt>
-<dd>true if this instance of cache storage is concurrently 
- accessible from multiple threads without synchronization.</dd>
+<dd>true if this instance of cache storage is concurrently accessible from multiple threads without
+ synchronization.</dd>
 </dl>
 </section>
 </li>
diff --git a/docs/api/freemarker/cache/StatefulTemplateLoader.html b/docs/api/freemarker/cache/StatefulTemplateLoader.html
index 500b07c5..89bd37e8 100644
--- a/docs/api/freemarker/cache/StatefulTemplateLoader.html
+++ b/docs/api/freemarker/cache/StatefulTemplateLoader.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>StatefulTemplateLoader (FreeMarker 2.3.34 API)</title>
+<title>StatefulTemplateLoader (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, interface: StatefulTemplateLoader">
diff --git a/docs/api/freemarker/cache/StringTemplateLoader.html b/docs/api/freemarker/cache/StringTemplateLoader.html
index 41fb07d7..502874dd 100644
--- a/docs/api/freemarker/cache/StringTemplateLoader.html
+++ b/docs/api/freemarker/cache/StringTemplateLoader.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>StringTemplateLoader (FreeMarker 2.3.34 API)</title>
+<title>StringTemplateLoader (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: StringTemplateLoader">
@@ -312,34 +312,32 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
 <dt>Specified by:</dt>
 <dd><code><a href="TemplateLoader.html#findTemplateSource(java.lang.String)">findTemplateSource</a></code>&nbsp;in interface&nbsp;<code><a href="TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></dd>
 <dt>Parameters:</dt>
-<dd><code>name</code> - The name (template root directory relative path) of the template, already localized and normalized by
-            the <a href="TemplateCache.html" title="class in freemarker.cache"><code>cache</code></a>. It is completely up to the loader implementation to
-            interpret the name, however it should expect to receive hierarchical paths where path components are
-            separated by a slash (not backslash). Backslashes (or any other OS specific separator character) are
-            not considered as separators by FreeMarker, and thus they will not be replaced with slash before
-            passing to this method, so it's up to the template loader to handle them (say, by throwing an
-            exception that tells the user that the path (s)he has entered is invalid, as (s)he must use slash --
-            typical mistake of Windows users). The passed names are always considered relative to some
-            loader-defined root location (often referred as the "template root directory"), and will never start
-            with a slash, nor will they contain a path component consisting of either a single or a double dot --
-            these are all resolved by the template cache before passing the name to the loader. As a side effect,
-            paths that trivially reach outside template root directory, such as <code>../my.ftl</code>, will be
-            rejected by the template cache, so they never reach the template loader. Note again, that if the path
-            uses backslash as path separator instead of slash as (the template loader should not accept that), the
-            normalization will not properly happen, as FreeMarker (the cache) recognizes only the slashes as
-            separators.</dd>
+<dd><code>name</code> - The name (template root directory relative path) of the template, already localized and normalized by the
+         <a href="TemplateCache.html" title="class in freemarker.cache"><code>cache</code></a>. It is completely up to the loader implementation to
+         interpret the name, however it should expect to receive hierarchical paths where path components are
+         separated by a slash (not backslash). Backslashes (or any other OS specific separator character) are not
+         considered as separators by FreeMarker, and thus they will not be replaced with slash before passing to
+         this method, so it's up to the template loader to handle them (say, by throwing an exception that tells
+         the user that the path (s)he has entered is invalid, as (s)he must use slash -- typical mistake of
+         Windows users). The passed names are always considered relative to some loader-defined root location
+         (often referred as the "template root directory"), and will never start with a slash, nor will they
+         contain a path component consisting of either a single or a double dot -- these are all resolved by the
+         template cache before passing the name to the loader. As a side effect, paths that trivially reach
+         outside template root directory, such as <code>../my.ftl</code>, will be rejected by the template cache, so
+         they never reach the template loader. Note again, that if the path uses backslash as path separator
+         instead of slash as (the template loader should not accept that), the normalization will not properly
+         happen, as FreeMarker (the cache) recognizes only the slashes as separators.</dd>
 <dt>Returns:</dt>
 <dd>An object representing the template source, which can be supplied in subsequent calls to
-         <a href="TemplateLoader.html#getLastModified(java.lang.Object)"><code>TemplateLoader.getLastModified(Object)</code></a> and <a href="TemplateLoader.html#getReader(java.lang.Object,java.lang.String)"><code>TemplateLoader.getReader(Object, String)</code></a>, when those are called on the
-         same <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>. <code>null</code> must be returned if the source for the template doesn't exist;
-         don't throw exception then! The exact type of this object is up to the <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>
-         implementation. As this object is possibly used as hash key in caches, and is surly compared with another
-         template source for equality, <b>it must have a proper <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> and
-         <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link"><code>Object.hashCode()</code></a>) implementation</b>. Especially, template sources that refer to the same
-         physical source must be equivalent, otherwise template caching can become inefficient. This is only
-         expected from <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> when the compared template sources came from the same
-         <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> instance. Also, it must not influence the equality if the source is open or
-         closed (<a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
+ <a href="TemplateLoader.html#getLastModified(java.lang.Object)"><code>TemplateLoader.getLastModified(Object)</code></a> and <a href="TemplateLoader.html#getReader(java.lang.Object,java.lang.String)"><code>TemplateLoader.getReader(Object, String)</code></a>, when those are called on the same
+ <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>. <code>null</code> must be returned if the source for the template doesn't exist; don't throw
+ exception then! The exact type of this object is up to the <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> implementation. As this object
+ is possibly used as hash key in caches, and is surly compared with another template source for equality, <b>it
+ must have a proper <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> and <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link"><code>Object.hashCode()</code></a>) implementation</b>. Especially,
+ template sources that refer to the same physical source must be equivalent, otherwise template caching can become
+ inefficient. This is only expected from <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> when the compared template sources came
+ from the same <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> instance. Also, it must not influence the equality if the source is open or
+ closed (<a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
 </dl>
 </section>
 </li>
@@ -355,15 +353,14 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
 <dd><code><a href="TemplateLoader.html#getLastModified(java.lang.Object)">getLastModified</a></code>&nbsp;in interface&nbsp;<code><a href="TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></dd>
 <dt>Parameters:</dt>
 <dd><code>templateSource</code> - an object representing a template source (the template file), obtained through a prior call to
-            <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
-            <a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
+         <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
+         <a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
 <dt>Returns:</dt>
 <dd>The time of last modification for the specified template source, or -1 if the time is not known. This
-            value meant to be milliseconds since the epoch, but in fact FreeMarker doesn't care what it means, it
-            only cares if it changes, in which case the template needs to be reloaded (even if the value has
-            decreased). -1 is not special in that regard either; if you keep returning it, FreeMarker won't
-            reload the template (as far as it's not evicted from the cache from some other
-            reason). Note that <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Long.html#MIN_VALUE" title="class or interface in java.lang" class="external-link"><code>Long.MIN_VALUE</code></a> is reserved for internal use.</dd>
+ value meant to be milliseconds since the epoch, but in fact FreeMarker doesn't care what it means, it only cares
+ if it changes, in which case the template needs to be reloaded (even if the value has decreased). -1 is not
+ special in that regard either; if you keep returning it, FreeMarker won't reload the template (as far as it's not
+ evicted from the cache from some other reason). Note that <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Long.html#MIN_VALUE" title="class or interface in java.lang" class="external-link"><code>Long.MIN_VALUE</code></a> is reserved for internal use.</dd>
 </dl>
 </section>
 </li>
@@ -378,31 +375,31 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
  reads the template from its beginning. Before this method is called for the second time (or later), its caller
  must close the previously returned <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a>, and it must not use it anymore. That is, this method is not
  required to support multiple concurrent readers for the same source <code>templateSource</code> object.
- 
+
  <p>
  Typically, this method is called if the template is missing from the cache, or if after calling
  <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a> and <a href="TemplateLoader.html#getLastModified(java.lang.Object)"><code>TemplateLoader.getLastModified(Object)</code></a> it was determined that the cached copy
  of the template is stale. Then, if it turns out that the <code>encoding</code> parameter used doesn't match the actual
  template content (based on the <code>#ftl encoding=...</code> header), this method will be called for a second time
  with the correct <code>encoding</code> parameter value.
- 
+
  <p>
- Unlike <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>, this method must not tolerate if the template is not found, and
- must throw <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link"><code>IOException</code></a> in that case.</div>
+ Unlike <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>, this method must not tolerate if the template is not found, and must
+ throw <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link"><code>IOException</code></a> in that case.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="TemplateLoader.html#getReader(java.lang.Object,java.lang.String)">getReader</a></code>&nbsp;in interface&nbsp;<code><a href="TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></dd>
 <dt>Parameters:</dt>
 <dd><code>templateSource</code> - an object representing a template source, obtained through a prior call to
-            <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
-            <a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
-<dd><code>encoding</code> - the character encoding used to translate source bytes to characters. Some loaders may not have access
-            to the byte representation of the template stream, and instead directly obtain a character stream.
-            These loaders should ignore the encoding parameter.</dd>
+         <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
+         <a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
+<dd><code>encoding</code> - the character encoding used to translate source bytes to characters. Some loaders may not have access to
+         the byte representation of the template stream, and instead directly obtain a character stream. These
+         loaders should ignore the encoding parameter.</dd>
 <dt>Returns:</dt>
 <dd>A <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a> representing the template character stream; not <code>null</code>. It's the responsibility of
-         the caller (which is <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a> usually) to <code>close()</code> it. The <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a> is not
-         required to work after the <code>templateSource</code> was closed (<a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
+ the caller (which is <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a> usually) to <code>close()</code> it. The <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a> is not required to
+ work after the <code>templateSource</code> was closed (<a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
 </dl>
 </section>
 </li>
diff --git a/docs/api/freemarker/cache/StrongCacheStorage.html b/docs/api/freemarker/cache/StrongCacheStorage.html
index 661686a4..640b5b7e 100644
--- a/docs/api/freemarker/cache/StrongCacheStorage.html
+++ b/docs/api/freemarker/cache/StrongCacheStorage.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>StrongCacheStorage (FreeMarker 2.3.34 API)</title>
+<title>StrongCacheStorage (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: StrongCacheStorage">
@@ -183,8 +183,8 @@ implements <a href="ConcurrentCacheStorage.html" title="interface in freemarker.
 <dt>Specified by:</dt>
 <dd><code><a href="ConcurrentCacheStorage.html#isConcurrent()">isConcurrent</a></code>&nbsp;in interface&nbsp;<code><a href="ConcurrentCacheStorage.html" title="interface in freemarker.cache">ConcurrentCacheStorage</a></code></dd>
 <dt>Returns:</dt>
-<dd>true if this instance of cache storage is concurrently 
- accessible from multiple threads without synchronization.</dd>
+<dd>true if this instance of cache storage is concurrently accessible from multiple threads without
+ synchronization.</dd>
 </dl>
 </section>
 </li>
diff --git a/docs/api/freemarker/cache/TemplateCache.MaybeMissingTemplate.html b/docs/api/freemarker/cache/TemplateCache.MaybeMissingTemplate.html
index 416ae0ae..253535e7 100644
--- a/docs/api/freemarker/cache/TemplateCache.MaybeMissingTemplate.html
+++ b/docs/api/freemarker/cache/TemplateCache.MaybeMissingTemplate.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateCache.MaybeMissingTemplate (FreeMarker 2.3.34 API)</title>
+<title>TemplateCache.MaybeMissingTemplate (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: TemplateCache, class: MaybeMissingTemplate">
@@ -85,7 +85,7 @@ loadScripts(document, 'script');</script>
 <hr>
 <div class="type-signature"><span class="modifiers">public static final class </span><span class="element-name type-name-label">TemplateCache.MaybeMissingTemplate</span>
 <span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span></div>
-<div class="block">Used for the return value of <a href="TemplateCache.html#getTemplate(java.lang.String,java.util.Locale,java.lang.Object,java.lang.String,boolean)"><code>TemplateCache.getTemplate(String, Locale, Object, String, boolean)</code></a>.</div>
+<div class="block">Return value of <a href="TemplateCache.html#getTemplate(java.lang.String,java.util.Locale,java.lang.Object,java.lang.String,boolean)"><code>TemplateCache.getTemplate(String, Locale, Object, String, boolean)</code></a>.</div>
 <dl class="notes">
 <dt>Since:</dt>
 <dd>2.3.22</dd>
diff --git a/docs/api/freemarker/cache/TemplateCache.html b/docs/api/freemarker/cache/TemplateCache.html
index c2b3084c..4728b2cc 100644
--- a/docs/api/freemarker/cache/TemplateCache.html
+++ b/docs/api/freemarker/cache/TemplateCache.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateCache (FreeMarker 2.3.34 API)</title>
+<title>TemplateCache (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: TemplateCache">
@@ -81,15 +81,14 @@ loadScripts(document, 'script');</script>
 <hr>
 <div class="type-signature"><span class="modifiers">public class </span><span class="element-name type-name-label">TemplateCache</span>
 <span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span></div>
-<div class="block">Performs caching and on-demand loading of the templates.
- The actual template "file" loading is delegated to a <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> that you can specify in the constructor.
- Some aspects of caching is delegated to a <a href="CacheStorage.html" title="interface in freemarker.cache"><code>CacheStorage</code></a> that you can also specify in the constructor.
- 
+<div class="block">Performs caching and on-demand loading of the templates. The actual template "file" loading is delegated to a
+ <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> that you can specify in the constructor. Some aspects of caching is delegated to a
+ <a href="CacheStorage.html" title="interface in freemarker.cache"><code>CacheStorage</code></a> that you can also specify in the constructor.
+
  <p>Typically you don't instantiate or otherwise use this class directly. The <a href="../template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> embeds an
  instance of this class, that you access indirectly through <a href="../template/Configuration.html#getTemplate(java.lang.String)"><code>Configuration.getTemplate(String)</code></a> and other
  <a href="../template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> API-s. Then <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> and <a href="CacheStorage.html" title="interface in freemarker.cache"><code>CacheStorage</code></a> can be set with
- <a href="../template/Configuration.html#setTemplateLoader(freemarker.cache.TemplateLoader)"><code>Configuration.setTemplateLoader(TemplateLoader)</code></a> and
- <a href="../template/Configuration.html#setCacheStorage(freemarker.cache.CacheStorage)"><code>Configuration.setCacheStorage(CacheStorage)</code></a>.</div>
+ <a href="../template/Configuration.html#setTemplateLoader(freemarker.cache.TemplateLoader)"><code>Configuration.setTemplateLoader(TemplateLoader)</code></a> and <a href="../template/Configuration.html#setCacheStorage(freemarker.cache.CacheStorage)"><code>Configuration.setCacheStorage(CacheStorage)</code></a>.</div>
 </section>
 <section class="summary">
 <ul class="summary-list">
@@ -105,7 +104,7 @@ loadScripts(document, 'script');</script>
 <div class="col-first even-row-color"><code>static class&nbsp;</code></div>
 <div class="col-second even-row-color"><code><span class="member-name-link"><a href="TemplateCache.MaybeMissingTemplate.html" title="class in freemarker.cache">TemplateCache.MaybeMissingTemplate</a></span></code></div>
 <div class="col-last even-row-color">
-<div class="block">Used for the return value of <a href="#getTemplate(java.lang.String,java.util.Locale,java.lang.Object,java.lang.String,boolean)"><code>getTemplate(String, Locale, Object, String, boolean)</code></a>.</div>
+<div class="block">Return value of <a href="#getTemplate(java.lang.String,java.util.Locale,java.lang.Object,java.lang.String,boolean)"><code>getTemplate(String, Locale, Object, String, boolean)</code></a>.</div>
 </div>
 </div>
 </section>
@@ -202,9 +201,8 @@ loadScripts(document, 'script');</script>
 <div class="col-first even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>void</code></div>
 <div class="col-second even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#clear()">clear</a></span>()</code></div>
 <div class="col-last even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
-<div class="block">Removes all entries from the cache, forcing reloading of templates
- on subsequent <a href="#getTemplate(java.lang.String,java.util.Locale,java.lang.String,boolean)"><code>getTemplate(String, Locale, String, boolean)</code></a>
- calls.</div>
+<div class="block">Removes all entries from the cache, forcing reloading of templates on subsequent
+ <a href="#getTemplate(java.lang.String,java.util.Locale,java.lang.String,boolean)"><code>getTemplate(String, Locale, String, boolean)</code></a> calls.</div>
 </div>
 <div class="col-first odd-row-color method-summary-table-tab1 method-summary-table-tab6 method-summary-table-tab4 method-summary-table"><code>protected static <a href="TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></div>
 <div class="col-second odd-row-color method-summary-table-tab1 method-summary-table-tab6 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#createLegacyDefaultTemplateLoader()">createLegacyDefaultTemplateLoader</a></span>()</code></div>
@@ -219,8 +217,7 @@ loadScripts(document, 'script');</script>
 <div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>long</code></div>
 <div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#getDelay()">getDelay</a></span>()</code></div>
 <div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
-<div class="block">Gets the delay in milliseconds between checking for newer versions of a
- template source.</div>
+<div class="block">Gets the delay in milliseconds between checking for newer versions of a template source.</div>
 </div>
 <div class="col-first even-row-color method-summary-table-tab1 method-summary-table-tab6 method-summary-table-tab4 method-summary-table"><code>static <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
 <div class="col-second even-row-color method-summary-table-tab1 method-summary-table-tab6 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#getFullTemplatePath(freemarker.core.Environment,java.lang.String,java.lang.String)">getFullTemplatePath</a></span>&#8203;(<a href="../core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env,
@@ -229,7 +226,7 @@ loadScripts(document, 'script');</script>
 <div class="col-last even-row-color method-summary-table-tab1 method-summary-table-tab6 method-summary-table-tab4 method-summary-table">
 <div class="block"><span class="deprecated-label">Deprecated.</span>
 <div class="deprecation-comment">Use <a href="../core/Environment.html#toFullTemplateName(java.lang.String,java.lang.String)"><code>Environment.toFullTemplateName(String, String)</code></a> instead, as that can throw
-             <a href="../template/MalformedTemplateNameException.html" title="class in freemarker.template"><code>MalformedTemplateNameException</code></a>, and is on a more logical place anyway.</div>
+ <a href="../template/MalformedTemplateNameException.html" title="class in freemarker.template"><code>MalformedTemplateNameException</code></a>, and is on a more logical place anyway.</div>
 </div>
 </div>
 <div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>boolean</code></div>
@@ -255,7 +252,7 @@ loadScripts(document, 'script');</script>
 <div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-tab6 method-summary-table-tab4 method-summary-table">
 <div class="block"><span class="deprecated-label">Deprecated.</span>
 <div class="deprecation-comment">Use <a href="#getTemplate(java.lang.String,java.util.Locale,java.lang.Object,java.lang.String,boolean)"><code>getTemplate(String, Locale, Object, String, boolean)</code></a>, which can return more detailed
-             result when the template is missing.</div>
+ result when the template is missing.</div>
 </div>
 </div>
 <div class="col-first even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><a href="TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></code></div>
@@ -298,8 +295,7 @@ loadScripts(document, 'script');</script>
 <div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>void</code></div>
 <div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#setDelay(long)">setDelay</a></span>&#8203;(long&nbsp;delay)</code></div>
 <div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
-<div class="block">Sets the delay in milliseconds between checking for newer versions of a
- template sources.</div>
+<div class="block">Sets the delay in milliseconds between checking for newer versions of a template sources.</div>
 </div>
 <div class="col-first even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>void</code></div>
 <div class="col-second even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#setLocalizedLookup(boolean)">setLocalizedLookup</a></span>&#8203;(boolean&nbsp;localizedLookup)</code></div>
@@ -351,11 +347,10 @@ loadScripts(document, 'script');</script>
 </span><span class="modifiers">public</span>&nbsp;<span class="element-name">TemplateCache</span>()</div>
 <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
 <div class="deprecation-comment">Use <a href="#%3Cinit%3E(freemarker.cache.TemplateLoader)"><code>TemplateCache(TemplateLoader)</code></a> instead. The default loader is useless in most
-     applications, also it can mean a security risk.</div>
+ applications, also it can mean a security risk.</div>
 </div>
-<div class="block">Returns a template cache that will first try to load a template from
- the file system relative to the current user directory (i.e. the value
- of the system property <code>user.dir</code>), then from the classpath.</div>
+<div class="block">Returns a template cache that will first try to load a template from the file system relative to the current user
+ directory (i.e. the value of the system property <code>user.dir</code>), then from the classpath.</div>
 </section>
 </li>
 <li>
@@ -436,14 +431,14 @@ loadScripts(document, 'script');</script>
 <dl class="notes">
 <dt>Parameters:</dt>
 <dd><code>templateLoader</code> - The <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> to use. Can be <code>null</code>, though then every request will result in
-            <a href="../template/TemplateNotFoundException.html" title="class in freemarker.template"><code>TemplateNotFoundException</code></a>.</dd>
+         <a href="../template/TemplateNotFoundException.html" title="class in freemarker.template"><code>TemplateNotFoundException</code></a>.</dd>
 <dd><code>cacheStorage</code> - The <a href="CacheStorage.html" title="interface in freemarker.cache"><code>CacheStorage</code></a> to use. Can't be <code>null</code>.</dd>
 <dd><code>templateLookupStrategy</code> - The <a href="TemplateLookupStrategy.html" title="class in freemarker.cache"><code>TemplateLookupStrategy</code></a> to use. Can't be <code>null</code>.</dd>
 <dd><code>templateNameFormat</code> - The <a href="TemplateNameFormat.html" title="class in freemarker.cache"><code>TemplateNameFormat</code></a> to use. Can't be <code>null</code>.</dd>
 <dd><code>templateConfigurations</code> - The <a href="TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> to use. Can be <code>null</code> (then all templates will use the
-            settings coming from the <a href="../template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> as is).</dd>
-<dd><code>config</code> - The <a href="../template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> this cache will be used for. Can be <code>null</code> for backward compatibility,
-            as it can be set with <a href="#setConfiguration(freemarker.template.Configuration)"><code>setConfiguration(Configuration)</code></a> later.</dd>
+         settings coming from the <a href="../template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> as is).</dd>
+<dd><code>config</code> - The <a href="../template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> this cache will be used for. Can be <code>null</code> for backward compatibility, as
+         it can be set with <a href="#setConfiguration(freemarker.template.Configuration)"><code>setConfiguration(Configuration)</code></a> later.</dd>
 <dt>Since:</dt>
 <dd>2.3.24</dd>
 </dl>
@@ -465,9 +460,8 @@ loadScripts(document, 'script');</script>
 <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
 <div class="deprecation-comment">Use the <a href="#%3Cinit%3E(freemarker.cache.TemplateLoader,freemarker.cache.CacheStorage,freemarker.template.Configuration)"><code>TemplateCache(TemplateLoader, CacheStorage, Configuration)</code></a> constructor.</div>
 </div>
-<div class="block">Sets the configuration object to which this cache belongs. This
- method is called by the configuration itself to establish the
- relation, and should not be called by users.</div>
+<div class="block">Sets the configuration object to which this cache belongs. This method is called by the configuration itself to
+ establish the relation, and should not be called by users.</div>
 </section>
 </li>
 <li>
@@ -523,28 +517,26 @@ loadScripts(document, 'script');</script>
                                                throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Retrieves the template with the given name (and according the specified further parameters) from the template
  cache, loading it into the cache first if it's missing/staled.
- 
+
  <p>
  All parameters must be non-<code>null</code>, except <code>customLookupCondition</code>. For the meaning of the parameters
  see <a href="../template/Configuration.html#getTemplate(java.lang.String,java.util.Locale,java.lang.String,boolean)"><code>Configuration.getTemplate(String, Locale, String, boolean)</code></a>.</div>
 <dl class="notes">
 <dt>Returns:</dt>
 <dd>A <a href="TemplateCache.MaybeMissingTemplate.html" title="class in freemarker.cache"><code>TemplateCache.MaybeMissingTemplate</code></a> object that contains the <a href="../template/Template.html" title="class in freemarker.template"><code>Template</code></a>, or a
-         <a href="TemplateCache.MaybeMissingTemplate.html" title="class in freemarker.cache"><code>TemplateCache.MaybeMissingTemplate</code></a> object that contains <code>null</code> as the <a href="../template/Template.html" title="class in freemarker.template"><code>Template</code></a> and information
-         about the missing template. The return value itself is never <code>null</code>. Note that exceptions occurring
-         during template loading will not be classified as a missing template, so they will cause an exception to
-         be thrown by this method instead of returning a <a href="TemplateCache.MaybeMissingTemplate.html" title="class in freemarker.cache"><code>TemplateCache.MaybeMissingTemplate</code></a>. The idea is that having a
-         missing template is normal (not exceptional), providing that the backing storage mechanism could indeed
-         check that it's missing.</dd>
+ <a href="TemplateCache.MaybeMissingTemplate.html" title="class in freemarker.cache"><code>TemplateCache.MaybeMissingTemplate</code></a> object that contains <code>null</code> as the <a href="../template/Template.html" title="class in freemarker.template"><code>Template</code></a> and information about the
+ missing template. The return value itself is never <code>null</code>. Note that exceptions occurring during template
+ loading will not be classified as a missing template, so they will cause an exception to be thrown by this method
+ instead of returning a <a href="TemplateCache.MaybeMissingTemplate.html" title="class in freemarker.cache"><code>TemplateCache.MaybeMissingTemplate</code></a>. The idea is that having a missing template is normal (not
+ exceptional), providing that the backing storage mechanism could indeed check that it's missing.</dd>
 <dt>Throws:</dt>
 <dd><code><a href="../template/MalformedTemplateNameException.html" title="class in freemarker.template">MalformedTemplateNameException</a></code> - If the <code>name</code> was malformed according the current <a href="TemplateNameFormat.html" title="class in freemarker.cache"><code>TemplateNameFormat</code></a>. However, if the
-             <a href="TemplateNameFormat.html" title="class in freemarker.cache"><code>TemplateNameFormat</code></a> is <a href="TemplateNameFormat.html#DEFAULT_2_3_0"><code>TemplateNameFormat.DEFAULT_2_3_0</code></a> and
-             <a href="../template/Configuration.html#getIncompatibleImprovements()"><code>Configuration.getIncompatibleImprovements()</code></a> is less than 2.4.0, then instead of throwing this
-             exception, a <a href="TemplateCache.MaybeMissingTemplate.html" title="class in freemarker.cache"><code>TemplateCache.MaybeMissingTemplate</code></a> will be returned, similarly as if the template were missing
-             (the <a href="TemplateCache.MaybeMissingTemplate.html#getMissingTemplateReason()"><code>TemplateCache.MaybeMissingTemplate.getMissingTemplateReason()</code></a> will describe the real error).</dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - If reading the template has failed from a reason other than the template is missing. This method
-             should never be a <a href="../template/TemplateNotFoundException.html" title="class in freemarker.template"><code>TemplateNotFoundException</code></a>, as that condition is indicated in the return
-             value.</dd>
+         <a href="TemplateNameFormat.html" title="class in freemarker.cache"><code>TemplateNameFormat</code></a> is <a href="TemplateNameFormat.html#DEFAULT_2_3_0"><code>TemplateNameFormat.DEFAULT_2_3_0</code></a> and
+         <a href="../template/Configuration.html#getIncompatibleImprovements()"><code>Configuration.getIncompatibleImprovements()</code></a> is less than 2.4.0, then instead of throwing this
+         exception, a <a href="TemplateCache.MaybeMissingTemplate.html" title="class in freemarker.cache"><code>TemplateCache.MaybeMissingTemplate</code></a> will be returned, similarly as if the template were missing
+         (the <a href="TemplateCache.MaybeMissingTemplate.html#getMissingTemplateReason()"><code>TemplateCache.MaybeMissingTemplate.getMissingTemplateReason()</code></a> will describe the real error).</dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - If reading the template has failed from a reason other than the template is missing. This method should
+         never be a <a href="../template/TemplateNotFoundException.html" title="class in freemarker.template"><code>TemplateNotFoundException</code></a>, as that condition is indicated in the return value.</dd>
 <dt>Since:</dt>
 <dd>2.3.22</dd>
 </dl>
@@ -561,14 +553,14 @@ loadScripts(document, 'script');</script>
                      throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
 <div class="deprecation-comment">Use <a href="#getTemplate(java.lang.String,java.util.Locale,java.lang.Object,java.lang.String,boolean)"><code>getTemplate(String, Locale, Object, String, boolean)</code></a>, which can return more detailed
-             result when the template is missing.</div>
+ result when the template is missing.</div>
 </div>
 <div class="block">Similar to <a href="#getTemplate(java.lang.String,java.util.Locale,java.lang.Object,java.lang.String,boolean)"><code>getTemplate(String, Locale, Object, String, boolean)</code></a> with <code>null</code>
  <code>customLookupCondition</code>.</div>
 <dl class="notes">
 <dt>Returns:</dt>
 <dd><a href="TemplateCache.MaybeMissingTemplate.html#getTemplate()"><code>TemplateCache.MaybeMissingTemplate.getTemplate()</code></a> of the
-         <a href="#getTemplate(java.lang.String,java.util.Locale,java.lang.Object,java.lang.String,boolean)"><code>getTemplate(String, Locale, Object, String, boolean)</code></a> return value.</dd>
+ <a href="#getTemplate(java.lang.String,java.util.Locale,java.lang.Object,java.lang.String,boolean)"><code>getTemplate(String, Locale, Object, String, boolean)</code></a> return value.</dd>
 <dt>Throws:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code></dd>
 </dl>
@@ -589,8 +581,7 @@ loadScripts(document, 'script');</script>
 <section class="detail" id="getDelay()">
 <h3>getDelay</h3>
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">long</span>&nbsp;<span class="element-name">getDelay</span>()</div>
-<div class="block">Gets the delay in milliseconds between checking for newer versions of a
- template source.</div>
+<div class="block">Gets the delay in milliseconds between checking for newer versions of a template source.</div>
 <dl class="notes">
 <dt>Returns:</dt>
 <dd>the current value of the delay</dd>
@@ -601,8 +592,7 @@ loadScripts(document, 'script');</script>
 <section class="detail" id="setDelay(long)">
 <h3>setDelay</h3>
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name">setDelay</span>&#8203;<span class="parameters">(long&nbsp;delay)</span></div>
-<div class="block">Sets the delay in milliseconds between checking for newer versions of a
- template sources.</div>
+<div class="block">Sets the delay in milliseconds between checking for newer versions of a template sources.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
 <dd><code>delay</code> - the new value of the delay</dd>
@@ -627,11 +617,10 @@ loadScripts(document, 'script');</script>
 <section class="detail" id="clear()">
 <h3>clear</h3>
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name">clear</span>()</div>
-<div class="block">Removes all entries from the cache, forcing reloading of templates
- on subsequent <a href="#getTemplate(java.lang.String,java.util.Locale,java.lang.String,boolean)"><code>getTemplate(String, Locale, String, boolean)</code></a>
- calls. If the configured template loader is 
- <a href="StatefulTemplateLoader.html" title="interface in freemarker.cache"><code>stateful</code></a>, then its 
- <a href="StatefulTemplateLoader.html#resetState()"><code>StatefulTemplateLoader.resetState()</code></a> method is invoked as well.</div>
+<div class="block">Removes all entries from the cache, forcing reloading of templates on subsequent
+ <a href="#getTemplate(java.lang.String,java.util.Locale,java.lang.String,boolean)"><code>getTemplate(String, Locale, String, boolean)</code></a> calls. If the configured template loader is
+ <a href="StatefulTemplateLoader.html" title="interface in freemarker.cache"><code>stateful</code></a>, then its <a href="StatefulTemplateLoader.html#resetState()"><code>StatefulTemplateLoader.resetState()</code></a> method is invoked
+ as well.</div>
 </section>
 </li>
 <li>
@@ -662,7 +651,7 @@ loadScripts(document, 'script');</script>
 <div class="block">Removes an entry from the cache, hence forcing the re-loading of it when it's next time requested. (It doesn't
  delete the template file itself.) This is to give the application finer control over cache updating than
  <a href="#setDelay(long)"><code>setDelay(long)</code></a> alone does.
- 
+ <p>
  For the meaning of the parameters, see
  <a href="../template/Configuration.html#getTemplate(java.lang.String,java.util.Locale,java.lang.Object,java.lang.String,boolean,boolean)"><code>Configuration.getTemplate(String, Locale, Object, String, boolean, boolean)</code></a></div>
 <dl class="notes">
@@ -680,12 +669,12 @@ loadScripts(document, 'script');</script>
  <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;targetName)</span></div>
 <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
 <div class="deprecation-comment">Use <a href="../core/Environment.html#toFullTemplateName(java.lang.String,java.lang.String)"><code>Environment.toFullTemplateName(String, String)</code></a> instead, as that can throw
-             <a href="../template/MalformedTemplateNameException.html" title="class in freemarker.template"><code>MalformedTemplateNameException</code></a>, and is on a more logical place anyway.</div>
+ <a href="../template/MalformedTemplateNameException.html" title="class in freemarker.template"><code>MalformedTemplateNameException</code></a>, and is on a more logical place anyway.</div>
 </div>
 <dl class="notes">
 <dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></code> - If the <code>baseName</code> or <code>targetName</code> is malformed according the <a href="TemplateNameFormat.html" title="class in freemarker.cache"><code>TemplateNameFormat</code></a>
-             in use.</dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></code> - If the <code>baseName</code> or <code>targetName</code> is malformed according the <a href="TemplateNameFormat.html" title="class in freemarker.cache"><code>TemplateNameFormat</code></a> in
+         use.</dd>
 </dl>
 </section>
 </li>
diff --git a/docs/api/freemarker/cache/TemplateConfigurationFactory.html b/docs/api/freemarker/cache/TemplateConfigurationFactory.html
index 41e91c7a..608a9660 100644
--- a/docs/api/freemarker/cache/TemplateConfigurationFactory.html
+++ b/docs/api/freemarker/cache/TemplateConfigurationFactory.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateConfigurationFactory (FreeMarker 2.3.34 API)</title>
+<title>TemplateConfigurationFactory (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: TemplateConfigurationFactory">
@@ -138,8 +138,8 @@ loadScripts(document, 'script');</script>
 <div class="col-second odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#setConfigurationOfChildren(freemarker.template.Configuration)">setConfigurationOfChildren</a></span>&#8203;(<a href="../template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</code></div>
 <div class="col-last odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">
 <div class="block">Calls <a href="../core/TemplateConfiguration.html#setParentConfiguration(freemarker.template.Configuration)"><code>TemplateConfiguration.setParentConfiguration(Configuration)</code></a> on each enclosed
- <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="#setConfiguration(freemarker.template.Configuration)"><code>setConfiguration(Configuration)</code></a>
- on each enclosed <a href="TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects.</div>
+ <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="#setConfiguration(freemarker.template.Configuration)"><code>setConfiguration(Configuration)</code></a> on each
+ enclosed <a href="TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects.</div>
 </div>
 </div>
 </div>
@@ -183,14 +183,13 @@ loadScripts(document, 'script');</script>
 <dl class="notes">
 <dt>Parameters:</dt>
 <dd><code>sourceName</code> - The name (path) that was used for <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. See
-            <a href="../template/Template.html#getSourceName()"><code>Template.getSourceName()</code></a> for details.</dd>
+         <a href="../template/Template.html#getSourceName()"><code>Template.getSourceName()</code></a> for details.</dd>
 <dd><code>templateSource</code> - The object returned by <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>.</dd>
 <dt>Returns:</dt>
-<dd>The <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> to apply, or <code>null</code> if the there's no <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> for
-         this template source.</dd>
+<dd>The <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> to apply, or <code>null</code> if the there's no
+ <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> for this template source.</dd>
 <dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - Typically, if there factory needs further I/O to find out more about the template source, but that
-             fails.</dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - Typically, if the factory needs further I/O to find out more about the template source, but that fails.</dd>
 <dd><code><a href="TemplateConfigurationFactoryException.html" title="class in freemarker.cache">TemplateConfigurationFactoryException</a></code> - If there's a problem that's specific to the factory logic.</dd>
 </dl>
 </section>
@@ -200,7 +199,7 @@ loadScripts(document, 'script');</script>
 <h3>setConfiguration</h3>
 <div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name">setConfiguration</span>&#8203;<span class="parameters">(<a href="../template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</span></div>
 <div class="block">Binds this <a href="TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> to a <a href="../template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>. Once it's bound, it can't be bound to
- another <a href="../template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> any more. This is automatically called by
+ another <a href="../template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> anymore. This is automatically called by
  <a href="../template/Configuration.html#setTemplateConfigurations(freemarker.cache.TemplateConfigurationFactory)"><code>Configuration.setTemplateConfigurations(TemplateConfigurationFactory)</code></a>.</div>
 </section>
 </li>
@@ -217,9 +216,9 @@ loadScripts(document, 'script');</script>
 <h3>setConfigurationOfChildren</h3>
 <div class="member-signature"><span class="modifiers">protected abstract</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name">setConfigurationOfChildren</span>&#8203;<span class="parameters">(<a href="../template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</span></div>
 <div class="block">Calls <a href="../core/TemplateConfiguration.html#setParentConfiguration(freemarker.template.Configuration)"><code>TemplateConfiguration.setParentConfiguration(Configuration)</code></a> on each enclosed
- <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="#setConfiguration(freemarker.template.Configuration)"><code>setConfiguration(Configuration)</code></a>
- on each enclosed <a href="TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects. It only supposed to call these on the direct
- "children" of this object, not on the children of the children.</div>
+ <a href="../core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="#setConfiguration(freemarker.template.Configuration)"><code>setConfiguration(Configuration)</code></a> on each
+ enclosed <a href="TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects. It only supposed to call these on the direct "children" of
+ this object, not on the children of the children.</div>
 </section>
 </li>
 </ul>
diff --git a/docs/api/freemarker/cache/TemplateConfigurationFactoryException.html b/docs/api/freemarker/cache/TemplateConfigurationFactoryException.html
index c1ddd4d8..cf3c14b6 100644
--- a/docs/api/freemarker/cache/TemplateConfigurationFactoryException.html
+++ b/docs/api/freemarker/cache/TemplateConfigurationFactoryException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateConfigurationFactoryException (FreeMarker 2.3.34 API)</title>
+<title>TemplateConfigurationFactoryException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: TemplateConfigurationFactoryException">
diff --git a/docs/api/freemarker/cache/TemplateLoader.html b/docs/api/freemarker/cache/TemplateLoader.html
index e0b044e3..571a17d1 100644
--- a/docs/api/freemarker/cache/TemplateLoader.html
+++ b/docs/api/freemarker/cache/TemplateLoader.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateLoader (FreeMarker 2.3.34 API)</title>
+<title>TemplateLoader (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, interface: TemplateLoader">
@@ -85,26 +85,35 @@ loadScripts(document, 'script');</script>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public interface </span><span class="element-name type-name-label">TemplateLoader</span></div>
-<div class="block">FreeMarker loads template "files" through objects that implement this interface,
- thus the templates need not be real files, and can come from any kind of data source
- (like classpath, servlet context, database, etc). While FreeMarker provides a few
- <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> implementations out-of-the-box, it's normal for embedding
- frameworks to use their own implementations.
- 
+<div class="block">FreeMarker loads template "files" through objects that implement this interface, thus the templates need not be real
+ files, and can come from any kind of data source (like classpath, servlet context, database, etc). While FreeMarker
+ provides a few <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> implementations out-of-the-box, it's normal for embedding frameworks to use
+ their own implementations.
+
  <p>To set the <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> used by FreeMaker, use
  <a href="../template/Configuration.html#setTemplateLoader(freemarker.cache.TemplateLoader)"><code>Configuration.setTemplateLoader(TemplateLoader)</code></a>.
- 
+
  <p>Implementations of this interface should be thread-safe.
- 
+
  <p>Implementations should override <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#toString()" title="class or interface in java.lang" class="external-link"><code>Object.toString()</code></a> to show information about from where the
  <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> loads the templates. For example, for a template loader that loads template from database
  table <code>toString</code> could return something like
  <code>"MyDatabaseTemplateLoader(user=\"cms\", table=\"mail_templates\")"</code>. This string will be shown in
  <a href="../template/TemplateNotFoundException.html" title="class in freemarker.template"><code>TemplateNotFoundException</code></a> exception messages, next to the template name.
- 
+
  <p>For those who has to dig deeper, note that the <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> is actually stored inside
- the <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a> of the <a href="../template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>, and is normally only accessed directly
- by the <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a>, and templates are get via the <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a> API-s.</div>
+ the <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a> of the <a href="../template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>, and is normally only accessed directly by the
+ <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a>, and templates are get via the <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a> API-s.
+
+ <p>SECURITY WARNING: The contract of this interface does not require checking the template name against
+ directory traversal attacks! If users or external systems can specify any part of the template name (of the template
+ path), ensure that it's restricted in format (like ban special characters, ensure that you have a template file
+ extension at the end), or check if the <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> you are using checks against path traversal attacks. In
+ principle, normalizing template names and basic traversal limitation is the responsibility of the
+ <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a>, however, not everyone gets <a href="../template/Template.html" title="class in freemarker.template"><code>Template</code></a>-s through
+ <a href="../template/Configuration.html#getTemplate(java.lang.String)"><code>Configuration.getTemplate(String)</code></a>, and so through <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a>. Also, a concrete
+ <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> implementation can have storage-specific syntax that <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a> doesn't recognize,
+ but allows path traversal.</div>
 </section>
 <section class="summary">
 <ul class="summary-list">
@@ -165,38 +174,36 @@ loadScripts(document, 'script');</script>
  template can be loaded from. See the return value for more information.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
-<dd><code>name</code> - The name (template root directory relative path) of the template, already localized and normalized by
-            the <a href="TemplateCache.html" title="class in freemarker.cache"><code>cache</code></a>. It is completely up to the loader implementation to
-            interpret the name, however it should expect to receive hierarchical paths where path components are
-            separated by a slash (not backslash). Backslashes (or any other OS specific separator character) are
-            not considered as separators by FreeMarker, and thus they will not be replaced with slash before
-            passing to this method, so it's up to the template loader to handle them (say, by throwing an
-            exception that tells the user that the path (s)he has entered is invalid, as (s)he must use slash --
-            typical mistake of Windows users). The passed names are always considered relative to some
-            loader-defined root location (often referred as the "template root directory"), and will never start
-            with a slash, nor will they contain a path component consisting of either a single or a double dot --
-            these are all resolved by the template cache before passing the name to the loader. As a side effect,
-            paths that trivially reach outside template root directory, such as <code>../my.ftl</code>, will be
-            rejected by the template cache, so they never reach the template loader. Note again, that if the path
-            uses backslash as path separator instead of slash as (the template loader should not accept that), the
-            normalization will not properly happen, as FreeMarker (the cache) recognizes only the slashes as
-            separators.</dd>
+<dd><code>name</code> - The name (template root directory relative path) of the template, already localized and normalized by the
+         <a href="TemplateCache.html" title="class in freemarker.cache"><code>cache</code></a>. It is completely up to the loader implementation to
+         interpret the name, however it should expect to receive hierarchical paths where path components are
+         separated by a slash (not backslash). Backslashes (or any other OS specific separator character) are not
+         considered as separators by FreeMarker, and thus they will not be replaced with slash before passing to
+         this method, so it's up to the template loader to handle them (say, by throwing an exception that tells
+         the user that the path (s)he has entered is invalid, as (s)he must use slash -- typical mistake of
+         Windows users). The passed names are always considered relative to some loader-defined root location
+         (often referred as the "template root directory"), and will never start with a slash, nor will they
+         contain a path component consisting of either a single or a double dot -- these are all resolved by the
+         template cache before passing the name to the loader. As a side effect, paths that trivially reach
+         outside template root directory, such as <code>../my.ftl</code>, will be rejected by the template cache, so
+         they never reach the template loader. Note again, that if the path uses backslash as path separator
+         instead of slash as (the template loader should not accept that), the normalization will not properly
+         happen, as FreeMarker (the cache) recognizes only the slashes as separators.</dd>
 <dt>Returns:</dt>
 <dd>An object representing the template source, which can be supplied in subsequent calls to
-         <a href="#getLastModified(java.lang.Object)"><code>getLastModified(Object)</code></a> and <a href="#getReader(java.lang.Object,java.lang.String)"><code>getReader(Object, String)</code></a>, when those are called on the
-         same <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>. <code>null</code> must be returned if the source for the template doesn't exist;
-         don't throw exception then! The exact type of this object is up to the <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>
-         implementation. As this object is possibly used as hash key in caches, and is surly compared with another
-         template source for equality, <b>it must have a proper <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> and
-         <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link"><code>Object.hashCode()</code></a>) implementation</b>. Especially, template sources that refer to the same
-         physical source must be equivalent, otherwise template caching can become inefficient. This is only
-         expected from <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> when the compared template sources came from the same
-         <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> instance. Also, it must not influence the equality if the source is open or
-         closed (<a href="#closeTemplateSource(java.lang.Object)"><code>closeTemplateSource(Object)</code></a>).</dd>
+ <a href="#getLastModified(java.lang.Object)"><code>getLastModified(Object)</code></a> and <a href="#getReader(java.lang.Object,java.lang.String)"><code>getReader(Object, String)</code></a>, when those are called on the same
+ <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>. <code>null</code> must be returned if the source for the template doesn't exist; don't throw
+ exception then! The exact type of this object is up to the <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> implementation. As this object
+ is possibly used as hash key in caches, and is surly compared with another template source for equality, <b>it
+ must have a proper <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> and <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link"><code>Object.hashCode()</code></a>) implementation</b>. Especially,
+ template sources that refer to the same physical source must be equivalent, otherwise template caching can become
+ inefficient. This is only expected from <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> when the compared template sources came
+ from the same <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> instance. Also, it must not influence the equality if the source is open or
+ closed (<a href="#closeTemplateSource(java.lang.Object)"><code>closeTemplateSource(Object)</code></a>).</dd>
 <dt>Throws:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - When an error occurs that makes it impossible to find out if the template exists, or to access the
-             existing template. Don't throw exception if the template doesn't exist, instead return with
-             <code>null</code> then!</dd>
+         existing template. Don't throw exception if the template doesn't exist, instead return with <code>null</code>
+         then!</dd>
 </dl>
 </section>
 </li>
@@ -209,15 +216,14 @@ loadScripts(document, 'script');</script>
 <dl class="notes">
 <dt>Parameters:</dt>
 <dd><code>templateSource</code> - an object representing a template source (the template file), obtained through a prior call to
-            <a href="#findTemplateSource(java.lang.String)"><code>findTemplateSource(String)</code></a>. This must be an object on which
-            <a href="#closeTemplateSource(java.lang.Object)"><code>closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
+         <a href="#findTemplateSource(java.lang.String)"><code>findTemplateSource(String)</code></a>. This must be an object on which
+         <a href="#closeTemplateSource(java.lang.Object)"><code>closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
 <dt>Returns:</dt>
 <dd>The time of last modification for the specified template source, or -1 if the time is not known. This
-            value meant to be milliseconds since the epoch, but in fact FreeMarker doesn't care what it means, it
-            only cares if it changes, in which case the template needs to be reloaded (even if the value has
-            decreased). -1 is not special in that regard either; if you keep returning it, FreeMarker won't
-            reload the template (as far as it's not evicted from the cache from some other
-            reason). Note that <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Long.html#MIN_VALUE" title="class or interface in java.lang" class="external-link"><code>Long.MIN_VALUE</code></a> is reserved for internal use.</dd>
+ value meant to be milliseconds since the epoch, but in fact FreeMarker doesn't care what it means, it only cares
+ if it changes, in which case the template needs to be reloaded (even if the value has decreased). -1 is not
+ special in that regard either; if you keep returning it, FreeMarker won't reload the template (as far as it's not
+ evicted from the cache from some other reason). Note that <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Long.html#MIN_VALUE" title="class or interface in java.lang" class="external-link"><code>Long.MIN_VALUE</code></a> is reserved for internal use.</dd>
 </dl>
 </section>
 </li>
@@ -232,29 +238,29 @@ loadScripts(document, 'script');</script>
  reads the template from its beginning. Before this method is called for the second time (or later), its caller
  must close the previously returned <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a>, and it must not use it anymore. That is, this method is not
  required to support multiple concurrent readers for the same source <code>templateSource</code> object.
- 
+
  <p>
  Typically, this method is called if the template is missing from the cache, or if after calling
  <a href="#findTemplateSource(java.lang.String)"><code>findTemplateSource(String)</code></a> and <a href="#getLastModified(java.lang.Object)"><code>getLastModified(Object)</code></a> it was determined that the cached copy
  of the template is stale. Then, if it turns out that the <code>encoding</code> parameter used doesn't match the actual
  template content (based on the <code>#ftl encoding=...</code> header), this method will be called for a second time
  with the correct <code>encoding</code> parameter value.
- 
+
  <p>
- Unlike <a href="#findTemplateSource(java.lang.String)"><code>findTemplateSource(String)</code></a>, this method must not tolerate if the template is not found, and
- must throw <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link"><code>IOException</code></a> in that case.</div>
+ Unlike <a href="#findTemplateSource(java.lang.String)"><code>findTemplateSource(String)</code></a>, this method must not tolerate if the template is not found, and must
+ throw <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link"><code>IOException</code></a> in that case.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
 <dd><code>templateSource</code> - an object representing a template source, obtained through a prior call to
-            <a href="#findTemplateSource(java.lang.String)"><code>findTemplateSource(String)</code></a>. This must be an object on which
-            <a href="#closeTemplateSource(java.lang.Object)"><code>closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
-<dd><code>encoding</code> - the character encoding used to translate source bytes to characters. Some loaders may not have access
-            to the byte representation of the template stream, and instead directly obtain a character stream.
-            These loaders should ignore the encoding parameter.</dd>
+         <a href="#findTemplateSource(java.lang.String)"><code>findTemplateSource(String)</code></a>. This must be an object on which
+         <a href="#closeTemplateSource(java.lang.Object)"><code>closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
+<dd><code>encoding</code> - the character encoding used to translate source bytes to characters. Some loaders may not have access to
+         the byte representation of the template stream, and instead directly obtain a character stream. These
+         loaders should ignore the encoding parameter.</dd>
 <dt>Returns:</dt>
 <dd>A <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a> representing the template character stream; not <code>null</code>. It's the responsibility of
-         the caller (which is <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a> usually) to <code>close()</code> it. The <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a> is not
-         required to work after the <code>templateSource</code> was closed (<a href="#closeTemplateSource(java.lang.Object)"><code>closeTemplateSource(Object)</code></a>).</dd>
+ the caller (which is <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a> usually) to <code>close()</code> it. The <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a> is not required to
+ work after the <code>templateSource</code> was closed (<a href="#closeTemplateSource(java.lang.Object)"><code>closeTemplateSource(Object)</code></a>).</dd>
 <dt>Throws:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - if an I/O error occurs while accessing the stream.</dd>
 </dl>
diff --git a/docs/api/freemarker/cache/TemplateLoaderUtils.html b/docs/api/freemarker/cache/TemplateLoaderUtils.html
index 8b639d15..3d35f060 100644
--- a/docs/api/freemarker/cache/TemplateLoaderUtils.html
+++ b/docs/api/freemarker/cache/TemplateLoaderUtils.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateLoaderUtils (FreeMarker 2.3.34 API)</title>
+<title>TemplateLoaderUtils (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: TemplateLoaderUtils">
diff --git a/docs/api/freemarker/cache/TemplateLookupContext.html b/docs/api/freemarker/cache/TemplateLookupContext.html
index d67789ae..93b2e53e 100644
--- a/docs/api/freemarker/cache/TemplateLookupContext.html
+++ b/docs/api/freemarker/cache/TemplateLookupContext.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateLookupContext (FreeMarker 2.3.34 API)</title>
+<title>TemplateLookupContext (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: TemplateLookupContext">
@@ -81,8 +81,8 @@ loadScripts(document, 'script');</script>
 <hr>
 <div class="type-signature"><span class="modifiers">public abstract class </span><span class="element-name type-name-label">TemplateLookupContext</span>
 <span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span></div>
-<div class="block">Used as the parameter of <a href="TemplateLookupStrategy.html#lookup(freemarker.cache.TemplateLookupContext)"><code>TemplateLookupStrategy.lookup(TemplateLookupContext)</code></a>.
- You can't create instances of this, only receive them from FreeMarker.</div>
+<div class="block">Used as the parameter of <a href="TemplateLookupStrategy.html#lookup(freemarker.cache.TemplateLookupContext)"><code>TemplateLookupStrategy.lookup(TemplateLookupContext)</code></a>. You can't create instances of
+ this, only receive them from FreeMarker.</div>
 <dl class="notes">
 <dt>Since:</dt>
 <dd>2.3.22</dd>
@@ -128,7 +128,7 @@ loadScripts(document, 'script');</script>
 <div class="col-first even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code>abstract <a href="TemplateLookupResult.html" title="class in freemarker.cache">TemplateLookupResult</a></code></div>
 <div class="col-second even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#lookupWithAcquisitionStrategy(java.lang.String)">lookupWithAcquisitionStrategy</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;templateName)</code></div>
 <div class="col-last even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">
-<div class="block">Finds the template source based on its <em>normalized</em> name; handles <code>*</code> steps (so called acquisition),
+<div class="block">Finds the template source based on its <em>normalized</em> name; handles <code>*</code> steps (so-called acquisition),
  otherwise it just calls <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>.</div>
 </div>
 <div class="col-first odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code>abstract <a href="TemplateLookupResult.html" title="class in freemarker.cache">TemplateLookupResult</a></code></div>
@@ -160,17 +160,16 @@ loadScripts(document, 'script');</script>
 <h3>lookupWithAcquisitionStrategy</h3>
 <div class="member-signature"><span class="modifiers">public abstract</span>&nbsp;<span class="return-type"><a href="TemplateLookupResult.html" title="class in freemarker.cache">TemplateLookupResult</a></span>&nbsp;<span class="element-name">lookupWithAcquisitionStrategy</span>&#8203;<span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;templateNa [...]
                                                             throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
-<div class="block">Finds the template source based on its <em>normalized</em> name; handles <code>*</code> steps (so called acquisition),
+<div class="block">Finds the template source based on its <em>normalized</em> name; handles <code>*</code> steps (so-called acquisition),
  otherwise it just calls <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
-<dd><code>templateName</code> - Must be a normalized name, like <code>"foo/bar/baaz.ftl"</code>. A name is not normalized when, among
-            others, it starts with <code>/</code>, or contains <code>.</code> or <code>..</code> path steps, or it uses
-            backslash (<code>\</code>) instead of <code>/</code>. A normalized name might contains "*" path steps
-            (acquisition).</dd>
+<dd><code>templateName</code> - Must be a normalized name, like <code>"foo/bar/baaz.ftl"</code>. A name is not normalized when, among others,
+         it starts with <code>/</code>, or contains <code>.</code> or <code>..</code> path steps, or it uses backslash
+         (<code>\</code>) instead of <code>/</code>. A normalized name might contains "*" path steps (acquisition).</dd>
 <dt>Returns:</dt>
 <dd>The result of the lookup. Not <code>null</code>; check <a href="TemplateLookupResult.html#isPositive()"><code>TemplateLookupResult.isPositive()</code></a> to see if the
-         lookup has found anything.</dd>
+ lookup has found anything.</dd>
 <dt>Throws:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code></dd>
 </dl>
@@ -185,7 +184,7 @@ loadScripts(document, 'script');</script>
 <div class="block">Finds the template source based on its <em>normalized</em> name; tries localized variations going from most
  specific to less specific, and for each variation it delegates to <a href="#lookupWithAcquisitionStrategy(java.lang.String)"><code>lookupWithAcquisitionStrategy(String)</code></a>.
  If <code>templateLocale</code> is <code>null</code> (typically, because <a href="../template/Configuration.html#getLocalizedLookup()"><code>Configuration.getLocalizedLookup()</code></a> is
- <code>false</code>)), then it's the same as calling <a href="#lookupWithAcquisitionStrategy(java.lang.String)"><code>lookupWithAcquisitionStrategy(String)</code></a> directly. This is
+ <code>false</code>), then it's the same as calling <a href="#lookupWithAcquisitionStrategy(java.lang.String)"><code>lookupWithAcquisitionStrategy(String)</code></a> directly. This is
  the default strategy of FreeMarker (at least in 2.3.x), so for more information, see
  <a href="TemplateLookupStrategy.html#DEFAULT_2_3_0"><code>TemplateLookupStrategy.DEFAULT_2_3_0</code></a>.</div>
 <dl class="notes">
diff --git a/docs/api/freemarker/cache/TemplateLookupResult.html b/docs/api/freemarker/cache/TemplateLookupResult.html
index 1677b4bb..466ae90b 100644
--- a/docs/api/freemarker/cache/TemplateLookupResult.html
+++ b/docs/api/freemarker/cache/TemplateLookupResult.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateLookupResult (FreeMarker 2.3.34 API)</title>
+<title>TemplateLookupResult (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: TemplateLookupResult">
diff --git a/docs/api/freemarker/cache/TemplateLookupStrategy.html b/docs/api/freemarker/cache/TemplateLookupStrategy.html
index 3f6702ec..1fb85300 100644
--- a/docs/api/freemarker/cache/TemplateLookupStrategy.html
+++ b/docs/api/freemarker/cache/TemplateLookupStrategy.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateLookupStrategy (FreeMarker 2.3.34 API)</title>
+<title>TemplateLookupStrategy (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: TemplateLookupStrategy">
@@ -87,23 +87,27 @@ loadScripts(document, 'script');</script>
  were deduced from the requested name. Trying a name usually means calling
  <a href="TemplateLookupContext.html#lookupWithAcquisitionStrategy(java.lang.String)"><code>TemplateLookupContext.lookupWithAcquisitionStrategy(String)</code></a> with it and checking the value of
  <a href="TemplateLookupResult.html#isPositive()"><code>TemplateLookupResult.isPositive()</code></a>.
- 
- <p>
- Before you write your own lookup strategy, know that:
+
+ <p>Before you write your own lookup strategy, know that:
+
  <ul>
- <li>A template lookup strategy meant to operate solely with template names, not with <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>-s
- directly. Basically, it's a mapping between the template names that templates and API-s like
- <a href="../template/Configuration.html#getTemplate(java.lang.String)"><code>Configuration.getTemplate(String)</code></a> see, and those that the underlying <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> sees.
- <li>A template lookup strategy doesn't influence the template's name (<a href="../template/Template.html#getName()"><code>Template.getName()</code></a>), which is the
- normalized form of the template name as it was requested (with <a href="../template/Configuration.html#getTemplate(java.lang.String)"><code>Configuration.getTemplate(String)</code></a>, etc.). It
- only influences the so called source name of the template (<a href="../template/Template.html#getSourceName()"><code>Template.getSourceName()</code></a>). The template's name is
- used as the basis for resolving relative inclusions/imports in the template. The source name is pretty much only used
- in error messages as error location, and of course, to actually load the template "file".
- <li>Understand the impact of the last point if your template lookup strategy fiddles not only with the file name part
- of the template name, but also with the directory part. For example, one may want to map "foo.ftl" to "en/foo.ftl",
- "fr/foo.ftl", etc. That's legal, but the result is kind of like if you had several root directories ("en/", "fr/",
- etc.) that are layered over each other to form a single merged directory. (This is what's desirable in typical
- applications, yet it can be confusing.)
+   <li>A template lookup strategy meant to operate solely with template names, not with <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>-s
+   directly. Basically, it's a mapping between the template names that templates and API-s like
+   <a href="../template/Configuration.html#getTemplate(java.lang.String)"><code>Configuration.getTemplate(String)</code></a> see, and those that the underlying <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> sees.
+
+   <li>A template lookup strategy doesn't influence the template's name (<a href="../template/Template.html#getName()"><code>Template.getName()</code></a>), which is the
+   normalized form of the template name as it was requested (with <a href="../template/Configuration.html#getTemplate(java.lang.String)"><code>Configuration.getTemplate(String)</code></a>, etc.). It
+   only influences the so-called source name of the template (<a href="../template/Template.html#getSourceName()"><code>Template.getSourceName()</code></a>). The template's
+   name is
+   used as the basis for resolving relative inclusions/imports in the template. The source name is pretty much only
+  used
+   in error messages as error location, and of course, to actually load the template "file".
+
+   <li>Understand the impact of the last point if your template lookup strategy fiddles not only with the file name
+   part of the template name, but also with the directory part. For example, one may want to map "foo.ftl" to
+   "en/foo.ftl", "fr/foo.ftl", etc. That's legal, but the result is kind of like if you had several root
+   directories ("en/", "fr/", etc.) that are layered over each other to form a single merged directory. (This is
+   what's desirable in typical applications, yet it can be confusing.)
  </ul></div>
 <dl class="notes">
 <dt>Since:</dt>
@@ -126,8 +130,7 @@ loadScripts(document, 'script');</script>
 <div class="col-first even-row-color"><code>static <a href="TemplateLookupStrategy.html" title="class in freemarker.cache">TemplateLookupStrategy</a></code></div>
 <div class="col-second even-row-color"><code><span class="member-name-link"><a href="#DEFAULT_2_3_0">DEFAULT_2_3_0</a></span></code></div>
 <div class="col-last even-row-color">
-<div class="block">
- The default lookup strategy of FreeMarker.</div>
+<div class="block">The default lookup strategy of FreeMarker.</div>
 </div>
 </div>
 </section>
@@ -183,22 +186,19 @@ loadScripts(document, 'script');</script>
 <section class="detail" id="DEFAULT_2_3_0">
 <h3>DEFAULT_2_3_0</h3>
 <div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="TemplateLookupStrategy.html" title="class in freemarker.cache">TemplateLookupStrategy</a></span>&nbsp;<span class="element-name">DEFAULT_2_3_0</span></div>
-<div class="block"><p>
- The default lookup strategy of FreeMarker.
- 
- <p>
- Through an example: Assuming localized lookup is enabled and that a template is requested for the name
+<div class="block">The default lookup strategy of FreeMarker.
+
+ <p>Through an example: Assuming localized lookup is enabled and that a template is requested for the name
  <code>example.ftl</code> and <code>Locale("es", "ES", "Traditional_WIN")</code>, it will try the following template names,
  in this order: <code>"foo_en_AU_Traditional_WIN.ftl"</code>, <code>"foo_en_AU_Traditional.ftl"</code>,
  <code>"foo_en_AU.ftl"</code>, <code>"foo_en.ftl"</code>, <code>"foo.ftl"</code>. It stops at the first variation where it finds
  a template. (If the template name contains "*" steps, finding the template for the attempted localized variation
  happens with the template acquisition mechanism.) If localized lookup is disabled, it won't try to add any locale
  strings, so it just looks for <code>"foo.ftl"</code>.
- 
- <p>
- The generation of the localized name variation with the default lookup strategy, happens like this: It removes
- the file extension (the part starting with the <em>last</em> dot), then appends <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/Locale.html#toString()" title="class or interface in java.util" class="external-link"><code>Locale.toString()</code></a> after
- it, and puts back the extension. Then it starts to remove the parts from the end of the locale, considering
+
+ <p>The generation of the localized name variation with the default lookup strategy, happens like this: It
+ removes the file extension (the part starting with the <em>last</em> dot), then appends <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/Locale.html#toString()" title="class or interface in java.util" class="external-link"><code>Locale.toString()</code></a>
+ after it, and puts back the extension. Then it starts to remove the parts from the end of the locale, considering
  <code>"_"</code> as the separator between the parts. It won't remove parts that are not part of the locale string
  (like if the requested template name is <code>foo_bar.ftl</code>, it won't remove the <code>"_bar"</code>).</div>
 </section>
@@ -235,16 +235,16 @@ loadScripts(document, 'script');</script>
  documentation to understand lookup strategies more.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
-<dd><code>ctx</code> - Contains the parameters for which the matching template need to be found, and operations that
-            are needed to implement the strategy. Some of the important input parameters are:
-            <a href="TemplateLookupContext.html#getTemplateName()"><code>TemplateLookupContext.getTemplateName()</code></a>, <a href="TemplateLookupContext.html#getTemplateLocale()"><code>TemplateLookupContext.getTemplateLocale()</code></a>.
-            The most important operations are <a href="TemplateLookupContext.html#lookupWithAcquisitionStrategy(java.lang.String)"><code>TemplateLookupContext.lookupWithAcquisitionStrategy(String)</code></a>
-            and <a href="TemplateLookupContext.html#createNegativeLookupResult()"><code>TemplateLookupContext.createNegativeLookupResult()</code></a>. (Note that you deliberately can't
-            use <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>-s directly to implement lookup.)</dd>
+<dd><code>ctx</code> - Contains the parameters for which the matching template need to be found, and operations that are needed
+         to implement the strategy. Some of the important input parameters are:
+         <a href="TemplateLookupContext.html#getTemplateName()"><code>TemplateLookupContext.getTemplateName()</code></a>, <a href="TemplateLookupContext.html#getTemplateLocale()"><code>TemplateLookupContext.getTemplateLocale()</code></a>. The
+         most important operations are <a href="TemplateLookupContext.html#lookupWithAcquisitionStrategy(java.lang.String)"><code>TemplateLookupContext.lookupWithAcquisitionStrategy(String)</code></a> and
+         <a href="TemplateLookupContext.html#createNegativeLookupResult()"><code>TemplateLookupContext.createNegativeLookupResult()</code></a>. (Note that you deliberately can't use
+         <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>-s directly to implement lookup.)</dd>
 <dt>Returns:</dt>
 <dd>Usually the return value of <a href="TemplateLookupContext.html#lookupWithAcquisitionStrategy(java.lang.String)"><code>TemplateLookupContext.lookupWithAcquisitionStrategy(String)</code></a>, or
-         <code>TemplateLookupContext#createNegativeLookupResult()</code> if no matching template exists. Can't be
-         <code>null</code>.</dd>
+ <code>TemplateLookupContext#createNegativeLookupResult()</code> if no matching template exists. Can't be
+ <code>null</code>.</dd>
 <dt>Throws:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code></dd>
 </dl>
diff --git a/docs/api/freemarker/cache/TemplateNameFormat.html b/docs/api/freemarker/cache/TemplateNameFormat.html
index 50087ee2..4c4eb6b6 100644
--- a/docs/api/freemarker/cache/TemplateNameFormat.html
+++ b/docs/api/freemarker/cache/TemplateNameFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateNameFormat (FreeMarker 2.3.34 API)</title>
+<title>TemplateNameFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: TemplateNameFormat">
@@ -145,12 +145,11 @@ loadScripts(document, 'script');</script>
 <div class="block">The default template name format only when <a href="../template/Configuration.html#%3Cinit%3E(freemarker.template.Version)"><code>incompatible_improvements</code></a>
  is set to 2.4.0 (or higher). This is not the out-of-the-box default format of FreeMarker 2.4.x, because the
  default <code>incompatible_improvements</code> is still 2.3.0 there.
- 
- <p>
- Differences to the <a href="#DEFAULT_2_3_0"><code>DEFAULT_2_3_0</code></a> format:
- 
+
+ <p>Differences to the <a href="#DEFAULT_2_3_0"><code>DEFAULT_2_3_0</code></a> format:
+
  <ul>
- 
+
  <li>The scheme and the path need not be separated with <code>"://"</code> anymore, only with <code>":"</code>. This makes
  template names like <code>"classpath:foo.ftl"</code> interpreted as an absolute name with scheme <code>"classpath"</code>
  and absolute path "foo.ftl". The scheme name before the <code>":"</code> can't contain <code>"/"</code>, or else it's
@@ -159,16 +158,16 @@ loadScripts(document, 'script');</script>
  normalized to <code>myscheme://x</code>, but <code>myscehme://x</code> or <code>myscheme:/x</code> aren't changed by
  normalization. It's up the <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> to which the normalized names are passed to decide which of
  these scheme separation conventions are valid (maybe both).</li>
- 
+
  <li><code>":"</code> is not allowed in template names, except as the scheme separator (see previous point).
- 
+
  <li>Malformed paths throw <a href="../template/MalformedTemplateNameException.html" title="class in freemarker.template"><code>MalformedTemplateNameException</code></a> instead of acting like if the template wasn't
  found.
- 
+
  <li><code>"\"</code> (backslash) is not allowed in template names, and causes <a href="../template/MalformedTemplateNameException.html" title="class in freemarker.template"><code>MalformedTemplateNameException</code></a>.
  With <a href="#DEFAULT_2_3_0"><code>DEFAULT_2_3_0</code></a> you would certainly end up with a <a href="../template/TemplateNotFoundException.html" title="class in freemarker.template"><code>TemplateNotFoundException</code></a> (or worse,
  it would work, but steps like <code>".."</code> wouldn't be normalized by FreeMarker).
- 
+
  <li>Template names might end with <code>/</code>, like <code>"foo/"</code>, and the presence or lack of the terminating
  <code>/</code> is seen as significant. While their actual interpretation is up to the <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>,
  operations that manipulate template names assume that the last step refers to a "directory" as opposed to a
@@ -178,19 +177,19 @@ loadScripts(document, 'script');</script>
  <li><code>//</code> is normalized to <code>/</code>, except of course if it's in the scheme name terminator. Like
  <code>foo//bar///baaz.ftl</code> is normalized to <code>foo/bar/baaz.ftl</code>. (In general, 0 long step names aren't
  possible anymore.)</li>
- 
+
  <li>The <code>".."</code> bugs of the legacy normalizer are fixed: <code>".."</code> steps has removed the preceding
  <code>"."</code> or <code>"*"</code> or scheme steps, not treating them specially as they should be. Now these work as
  expected. Examples: <code>"a/./../c"</code> has become to <code>"a/c"</code>, now it will be <code>"c"</code>; <code>"a/b/*</code>
  <code>/../c"</code> has become to <code>"a/b/c"</code>, now it will be <code>"a/*</code><code>/c"</code>; <code>"scheme://.."</code> has
  become to <code>"scheme:/"</code>, now it will be <code>null</code> (<a href="../template/TemplateNotFoundException.html" title="class in freemarker.template"><code>TemplateNotFoundException</code></a>) for backing out of
  the root directory.</li>
- 
+
  <li>As now directory paths has to be handled as well, it recognizes terminating, leading, and lonely <code>".."</code>
  and <code>"."</code> steps. For example, <code>"foo/bar/.."</code> now becomes to <code>"foo/"</code></li>
- 
+
  <li>Multiple consecutive <code>*</code> steps are normalized to one</li>
- 
+
  </ul></div>
 </section>
 </li>
diff --git a/docs/api/freemarker/cache/TemplateSourceMatcher.html b/docs/api/freemarker/cache/TemplateSourceMatcher.html
index 5d4d052e..b745339d 100644
--- a/docs/api/freemarker/cache/TemplateSourceMatcher.html
+++ b/docs/api/freemarker/cache/TemplateSourceMatcher.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateSourceMatcher (FreeMarker 2.3.34 API)</title>
+<title>TemplateSourceMatcher (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: TemplateSourceMatcher">
diff --git a/docs/api/freemarker/cache/URLTemplateLoader.html b/docs/api/freemarker/cache/URLTemplateLoader.html
index 9f44d6ab..8d0cf625 100644
--- a/docs/api/freemarker/cache/URLTemplateLoader.html
+++ b/docs/api/freemarker/cache/URLTemplateLoader.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>URLTemplateLoader (FreeMarker 2.3.34 API)</title>
+<title>URLTemplateLoader (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: URLTemplateLoader">
@@ -152,8 +152,7 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
 <div class="col-first odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code>protected abstract <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/net/URL.html" title="class or interface in java.net" class="external-link">URL</a></code></div>
 <div class="col-second odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#getURL(java.lang.String)">getURL</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</code></div>
 <div class="col-last odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">
-<div class="block">Given a template name (plus potential locale decorations) retrieves
- an URL that points the template source.</div>
+<div class="block">Given a template name (plus potential locale decorations) retrieves an URL that points the template source.</div>
 </div>
 <div class="col-first even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a></code></div>
 <div class="col-second even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#getURLConnectionUsesCaches()">getURLConnectionUsesCaches</a></span>()</code></div>
@@ -208,38 +207,36 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
 <dt>Specified by:</dt>
 <dd><code><a href="TemplateLoader.html#findTemplateSource(java.lang.String)">findTemplateSource</a></code>&nbsp;in interface&nbsp;<code><a href="TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></dd>
 <dt>Parameters:</dt>
-<dd><code>name</code> - The name (template root directory relative path) of the template, already localized and normalized by
-            the <a href="TemplateCache.html" title="class in freemarker.cache"><code>cache</code></a>. It is completely up to the loader implementation to
-            interpret the name, however it should expect to receive hierarchical paths where path components are
-            separated by a slash (not backslash). Backslashes (or any other OS specific separator character) are
-            not considered as separators by FreeMarker, and thus they will not be replaced with slash before
-            passing to this method, so it's up to the template loader to handle them (say, by throwing an
-            exception that tells the user that the path (s)he has entered is invalid, as (s)he must use slash --
-            typical mistake of Windows users). The passed names are always considered relative to some
-            loader-defined root location (often referred as the "template root directory"), and will never start
-            with a slash, nor will they contain a path component consisting of either a single or a double dot --
-            these are all resolved by the template cache before passing the name to the loader. As a side effect,
-            paths that trivially reach outside template root directory, such as <code>../my.ftl</code>, will be
-            rejected by the template cache, so they never reach the template loader. Note again, that if the path
-            uses backslash as path separator instead of slash as (the template loader should not accept that), the
-            normalization will not properly happen, as FreeMarker (the cache) recognizes only the slashes as
-            separators.</dd>
+<dd><code>name</code> - The name (template root directory relative path) of the template, already localized and normalized by the
+         <a href="TemplateCache.html" title="class in freemarker.cache"><code>cache</code></a>. It is completely up to the loader implementation to
+         interpret the name, however it should expect to receive hierarchical paths where path components are
+         separated by a slash (not backslash). Backslashes (or any other OS specific separator character) are not
+         considered as separators by FreeMarker, and thus they will not be replaced with slash before passing to
+         this method, so it's up to the template loader to handle them (say, by throwing an exception that tells
+         the user that the path (s)he has entered is invalid, as (s)he must use slash -- typical mistake of
+         Windows users). The passed names are always considered relative to some loader-defined root location
+         (often referred as the "template root directory"), and will never start with a slash, nor will they
+         contain a path component consisting of either a single or a double dot -- these are all resolved by the
+         template cache before passing the name to the loader. As a side effect, paths that trivially reach
+         outside template root directory, such as <code>../my.ftl</code>, will be rejected by the template cache, so
+         they never reach the template loader. Note again, that if the path uses backslash as path separator
+         instead of slash as (the template loader should not accept that), the normalization will not properly
+         happen, as FreeMarker (the cache) recognizes only the slashes as separators.</dd>
 <dt>Returns:</dt>
 <dd>An object representing the template source, which can be supplied in subsequent calls to
-         <a href="TemplateLoader.html#getLastModified(java.lang.Object)"><code>TemplateLoader.getLastModified(Object)</code></a> and <a href="TemplateLoader.html#getReader(java.lang.Object,java.lang.String)"><code>TemplateLoader.getReader(Object, String)</code></a>, when those are called on the
-         same <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>. <code>null</code> must be returned if the source for the template doesn't exist;
-         don't throw exception then! The exact type of this object is up to the <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>
-         implementation. As this object is possibly used as hash key in caches, and is surly compared with another
-         template source for equality, <b>it must have a proper <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> and
-         <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link"><code>Object.hashCode()</code></a>) implementation</b>. Especially, template sources that refer to the same
-         physical source must be equivalent, otherwise template caching can become inefficient. This is only
-         expected from <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> when the compared template sources came from the same
-         <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> instance. Also, it must not influence the equality if the source is open or
-         closed (<a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
+ <a href="TemplateLoader.html#getLastModified(java.lang.Object)"><code>TemplateLoader.getLastModified(Object)</code></a> and <a href="TemplateLoader.html#getReader(java.lang.Object,java.lang.String)"><code>TemplateLoader.getReader(Object, String)</code></a>, when those are called on the same
+ <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>. <code>null</code> must be returned if the source for the template doesn't exist; don't throw
+ exception then! The exact type of this object is up to the <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> implementation. As this object
+ is possibly used as hash key in caches, and is surly compared with another template source for equality, <b>it
+ must have a proper <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> and <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link"><code>Object.hashCode()</code></a>) implementation</b>. Especially,
+ template sources that refer to the same physical source must be equivalent, otherwise template caching can become
+ inefficient. This is only expected from <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> when the compared template sources came
+ from the same <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> instance. Also, it must not influence the equality if the source is open or
+ closed (<a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
 <dt>Throws:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - When an error occurs that makes it impossible to find out if the template exists, or to access the
-             existing template. Don't throw exception if the template doesn't exist, instead return with
-             <code>null</code> then!</dd>
+         existing template. Don't throw exception if the template doesn't exist, instead return with <code>null</code>
+         then!</dd>
 </dl>
 </section>
 </li>
@@ -255,15 +252,14 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
 <dd><code><a href="TemplateLoader.html#getLastModified(java.lang.Object)">getLastModified</a></code>&nbsp;in interface&nbsp;<code><a href="TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></dd>
 <dt>Parameters:</dt>
 <dd><code>templateSource</code> - an object representing a template source (the template file), obtained through a prior call to
-            <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
-            <a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
+         <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
+         <a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
 <dt>Returns:</dt>
 <dd>The time of last modification for the specified template source, or -1 if the time is not known. This
-            value meant to be milliseconds since the epoch, but in fact FreeMarker doesn't care what it means, it
-            only cares if it changes, in which case the template needs to be reloaded (even if the value has
-            decreased). -1 is not special in that regard either; if you keep returning it, FreeMarker won't
-            reload the template (as far as it's not evicted from the cache from some other
-            reason). Note that <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Long.html#MIN_VALUE" title="class or interface in java.lang" class="external-link"><code>Long.MIN_VALUE</code></a> is reserved for internal use.</dd>
+ value meant to be milliseconds since the epoch, but in fact FreeMarker doesn't care what it means, it only cares
+ if it changes, in which case the template needs to be reloaded (even if the value has decreased). -1 is not
+ special in that regard either; if you keep returning it, FreeMarker won't reload the template (as far as it's not
+ evicted from the cache from some other reason). Note that <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Long.html#MIN_VALUE" title="class or interface in java.lang" class="external-link"><code>Long.MIN_VALUE</code></a> is reserved for internal use.</dd>
 </dl>
 </section>
 </li>
@@ -279,31 +275,31 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
  reads the template from its beginning. Before this method is called for the second time (or later), its caller
  must close the previously returned <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a>, and it must not use it anymore. That is, this method is not
  required to support multiple concurrent readers for the same source <code>templateSource</code> object.
- 
+
  <p>
  Typically, this method is called if the template is missing from the cache, or if after calling
  <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a> and <a href="TemplateLoader.html#getLastModified(java.lang.Object)"><code>TemplateLoader.getLastModified(Object)</code></a> it was determined that the cached copy
  of the template is stale. Then, if it turns out that the <code>encoding</code> parameter used doesn't match the actual
  template content (based on the <code>#ftl encoding=...</code> header), this method will be called for a second time
  with the correct <code>encoding</code> parameter value.
- 
+
  <p>
- Unlike <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>, this method must not tolerate if the template is not found, and
- must throw <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link"><code>IOException</code></a> in that case.</div>
+ Unlike <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>, this method must not tolerate if the template is not found, and must
+ throw <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link"><code>IOException</code></a> in that case.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="TemplateLoader.html#getReader(java.lang.Object,java.lang.String)">getReader</a></code>&nbsp;in interface&nbsp;<code><a href="TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></dd>
 <dt>Parameters:</dt>
 <dd><code>templateSource</code> - an object representing a template source, obtained through a prior call to
-            <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
-            <a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
-<dd><code>encoding</code> - the character encoding used to translate source bytes to characters. Some loaders may not have access
-            to the byte representation of the template stream, and instead directly obtain a character stream.
-            These loaders should ignore the encoding parameter.</dd>
+         <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
+         <a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
+<dd><code>encoding</code> - the character encoding used to translate source bytes to characters. Some loaders may not have access to
+         the byte representation of the template stream, and instead directly obtain a character stream. These
+         loaders should ignore the encoding parameter.</dd>
 <dt>Returns:</dt>
 <dd>A <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a> representing the template character stream; not <code>null</code>. It's the responsibility of
-         the caller (which is <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a> usually) to <code>close()</code> it. The <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a> is not
-         required to work after the <code>templateSource</code> was closed (<a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
+ the caller (which is <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a> usually) to <code>close()</code> it. The <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a> is not required to
+ work after the <code>templateSource</code> was closed (<a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
 <dt>Throws:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - if an I/O error occurs while accessing the stream.</dd>
 </dl>
@@ -346,11 +342,11 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name">setURLConnectionUsesCaches</span>&#8203;<span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;urlConnectionUsesCaches)</span></div>
 <div class="block">Sets if <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/net/URLConnection.html#setUseCaches(boolean)" title="class or interface in java.net" class="external-link"><code>URLConnection.setUseCaches(boolean)</code></a> will be called, and with what value. By default this is
  <code>null</code>; see the behavior then below. The recommended value is <code>false</code>, so that FreeMarker can always
- reliably detect when a template was changed. The default is <code>null</code> only for backward compatibility,
- and certainly will be changed to <code>false</code> in 2.4.0. As FreeMarker has its own template cache with its
- own update delay setting (<a href="../template/Configuration.html#setTemplateUpdateDelay(int)"><code>Configuration.setTemplateUpdateDelay(int)</code></a>), setting this to <code>false</code>
- shouldn't cause performance problems.
- 
+ reliably detect when a template was changed. The default is <code>null</code> only for backward compatibility, and
+ certainly will be changed to <code>false</code> in 2.4.0. As FreeMarker has its own template cache with its own update
+ delay setting (<a href="../template/Configuration.html#setTemplateUpdateDelay(int)"><code>Configuration.setTemplateUpdateDelay(int)</code></a>), setting this to <code>false</code> shouldn't cause
+ performance problems.
+
  <p>Regarding <code>null</code> value: By default then <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/net/URLConnection.html#setUseCaches(boolean)" title="class or interface in java.net" class="external-link"><code>URLConnection.setUseCaches(boolean)</code></a> won't be called,
  and so the default of the <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/net/URLConnection.html" title="class or interface in java.net" class="external-link"><code>URLConnection</code></a> subclass will be in effect (usually <code>true</code>). That's the
  2.3.0-compatible mode. However, if <a href="../template/Configuration.html#getIncompatibleImprovements()"><code>Configuration.getIncompatibleImprovements()</code></a> is at least 2.3.21, then
@@ -366,14 +362,17 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
 <section class="detail" id="getURL(java.lang.String)">
 <h3>getURL</h3>
 <div class="member-signature"><span class="modifiers">protected abstract</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/net/URL.html" title="class or interface in java.net" class="external-link">URL</a></span>&nbsp;<span class="element-name">getURL</span>&#8203;<span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class [...]
-<div class="block">Given a template name (plus potential locale decorations) retrieves
- an URL that points the template source.</div>
+<div class="block">Given a template name (plus potential locale decorations) retrieves an URL that points the template source.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
-<dd><code>name</code> - the name of the sought template, including the locale
- decorations.</dd>
+<dd><code>name</code> - the name of the sought template, including the locale decorations; same as the parameter to
+         <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>; see rules there.</dd>
 <dt>Returns:</dt>
 <dd>an URL that points to the template source, or <code>null</code> if the template does not exist.</dd>
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/UncheckedIOException.html" title="class or interface in java.io" class="external-link">UncheckedIOException</a></code> - Throw this instead if <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link"><code>IOException</code></a>, and it will be unwrapper and re-thrown as is (since
+         FreeMarker 2.3.35). At least by <a href="#findTemplateSource(java.lang.String)"><code>findTemplateSource(String)</code></a>, which is where it's normally
+         called from.</dd>
 </dl>
 </section>
 </li>
@@ -386,9 +385,8 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
 <dt>Parameters:</dt>
 <dd><code>prefix</code> - the path prefix to canonicalize</dd>
 <dt>Returns:</dt>
-<dd>the canonicalized prefix. All backslashes are replaced with
- forward slashes, and a trailing slash is appended if the original
- prefix wasn't empty and didn't already end with a slash.</dd>
+<dd>the canonicalized prefix. All backslashes are replaced with forward slashes, and a trailing slash is
+ appended if the original prefix wasn't empty and didn't already end with a slash.</dd>
 </dl>
 </section>
 </li>
diff --git a/docs/api/freemarker/cache/URLTemplateSource.html b/docs/api/freemarker/cache/URLTemplateSource.html
index d966cf60..cee49ca6 100644
--- a/docs/api/freemarker/cache/URLTemplateSource.html
+++ b/docs/api/freemarker/cache/URLTemplateSource.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>URLTemplateSource (FreeMarker 2.3.34 API)</title>
+<title>URLTemplateSource (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: URLTemplateSource">
diff --git a/docs/api/freemarker/cache/WebappTemplateLoader.html b/docs/api/freemarker/cache/WebappTemplateLoader.html
index 4b4b47ba..9e22f64e 100644
--- a/docs/api/freemarker/cache/WebappTemplateLoader.html
+++ b/docs/api/freemarker/cache/WebappTemplateLoader.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>WebappTemplateLoader (FreeMarker 2.3.34 API)</title>
+<title>WebappTemplateLoader (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache, class: WebappTemplateLoader">
@@ -89,8 +89,13 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
 <div class="block">A <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> that uses streams reachable through <code>ServletContext.getResource(String)</code> as its source
  of templates.
 
- <p>Note that this is for the legacy "javax" Servlet API; for Jakarta (that is, in modern Servlet containers), use
- <code>freemarker.ext.jakarta.servlet.WebappTemplateLoader</code> instead (since 2.3.33).</div>
+ <p>Since FreeMarker 2.3.35 this checks if the provided template name backs out from the base package, and if so
+ will throw <a href="../template/MalformedTemplateNameException.html" title="class in freemarker.template"><code>MalformedTemplateNameException</code></a>. This check is normally done by the <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a>, but see
+ in the description of <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> why it's better to also check it here.
+
+ <p>Note that there are two variants of this class: One for the legacy "javax" Servlet API in the
+ <a href="package-summary.html"><code>freemarker.cache</code></a> package, and another for the newer Jakarta Servlet API in the
+ <code>freemarker.ext</code><code>.jakarta.servlet</code> package (since 2.3.33). Use the variant that fits your Servlet container!</div>
 </section>
 <section class="summary">
 <ul class="summary-list">
@@ -195,13 +200,11 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
 <section class="detail" id="&lt;init&gt;(javax.servlet.ServletContext)">
 <h3>WebappTemplateLoader</h3>
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name">WebappTemplateLoader</span>&#8203;<span class="parameters">(javax.servlet.ServletContext&nbsp;servletContext)</span></div>
-<div class="block">Creates a template loader that will use the specified servlet context to load the resources. It will use
- the base path of <code>"/"</code> meaning templates will be resolved relative to the servlet context root
- location.</div>
+<div class="block">Creates a template loader that will use the specified servlet context to load the resources. It will use the base
+ path of <code>"/"</code> meaning templates will be resolved relative to the servlet context root location.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
-<dd><code>servletContext</code> - the servlet context whose <code>ServletContext.getResource(String)</code> will be used to load the
-            templates.</dd>
+<dd><code>servletContext</code> - the servlet context whose <code>ServletContext.getResource(String)</code> will be used to load the templates.</dd>
 </dl>
 </section>
 </li>
@@ -216,8 +219,7 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
  the underlying operating system.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
-<dd><code>servletContext</code> - the servlet context whose <code>ServletContext.getResource(String)</code> will be used to load the
-            templates.</dd>
+<dd><code>servletContext</code> - the servlet context whose <code>ServletContext.getResource(String)</code> will be used to load the templates.</dd>
 <dd><code>subdirPath</code> - the base path to template resources.</dd>
 </dl>
 </section>
@@ -242,38 +244,36 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
 <dt>Specified by:</dt>
 <dd><code><a href="TemplateLoader.html#findTemplateSource(java.lang.String)">findTemplateSource</a></code>&nbsp;in interface&nbsp;<code><a href="TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></dd>
 <dt>Parameters:</dt>
-<dd><code>name</code> - The name (template root directory relative path) of the template, already localized and normalized by
-            the <a href="TemplateCache.html" title="class in freemarker.cache"><code>cache</code></a>. It is completely up to the loader implementation to
-            interpret the name, however it should expect to receive hierarchical paths where path components are
-            separated by a slash (not backslash). Backslashes (or any other OS specific separator character) are
-            not considered as separators by FreeMarker, and thus they will not be replaced with slash before
-            passing to this method, so it's up to the template loader to handle them (say, by throwing an
-            exception that tells the user that the path (s)he has entered is invalid, as (s)he must use slash --
-            typical mistake of Windows users). The passed names are always considered relative to some
-            loader-defined root location (often referred as the "template root directory"), and will never start
-            with a slash, nor will they contain a path component consisting of either a single or a double dot --
-            these are all resolved by the template cache before passing the name to the loader. As a side effect,
-            paths that trivially reach outside template root directory, such as <code>../my.ftl</code>, will be
-            rejected by the template cache, so they never reach the template loader. Note again, that if the path
-            uses backslash as path separator instead of slash as (the template loader should not accept that), the
-            normalization will not properly happen, as FreeMarker (the cache) recognizes only the slashes as
-            separators.</dd>
+<dd><code>name</code> - The name (template root directory relative path) of the template, already localized and normalized by the
+         <a href="TemplateCache.html" title="class in freemarker.cache"><code>cache</code></a>. It is completely up to the loader implementation to
+         interpret the name, however it should expect to receive hierarchical paths where path components are
+         separated by a slash (not backslash). Backslashes (or any other OS specific separator character) are not
+         considered as separators by FreeMarker, and thus they will not be replaced with slash before passing to
+         this method, so it's up to the template loader to handle them (say, by throwing an exception that tells
+         the user that the path (s)he has entered is invalid, as (s)he must use slash -- typical mistake of
+         Windows users). The passed names are always considered relative to some loader-defined root location
+         (often referred as the "template root directory"), and will never start with a slash, nor will they
+         contain a path component consisting of either a single or a double dot -- these are all resolved by the
+         template cache before passing the name to the loader. As a side effect, paths that trivially reach
+         outside template root directory, such as <code>../my.ftl</code>, will be rejected by the template cache, so
+         they never reach the template loader. Note again, that if the path uses backslash as path separator
+         instead of slash as (the template loader should not accept that), the normalization will not properly
+         happen, as FreeMarker (the cache) recognizes only the slashes as separators.</dd>
 <dt>Returns:</dt>
 <dd>An object representing the template source, which can be supplied in subsequent calls to
-         <a href="TemplateLoader.html#getLastModified(java.lang.Object)"><code>TemplateLoader.getLastModified(Object)</code></a> and <a href="TemplateLoader.html#getReader(java.lang.Object,java.lang.String)"><code>TemplateLoader.getReader(Object, String)</code></a>, when those are called on the
-         same <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>. <code>null</code> must be returned if the source for the template doesn't exist;
-         don't throw exception then! The exact type of this object is up to the <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>
-         implementation. As this object is possibly used as hash key in caches, and is surly compared with another
-         template source for equality, <b>it must have a proper <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> and
-         <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link"><code>Object.hashCode()</code></a>) implementation</b>. Especially, template sources that refer to the same
-         physical source must be equivalent, otherwise template caching can become inefficient. This is only
-         expected from <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> when the compared template sources came from the same
-         <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> instance. Also, it must not influence the equality if the source is open or
-         closed (<a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
+ <a href="TemplateLoader.html#getLastModified(java.lang.Object)"><code>TemplateLoader.getLastModified(Object)</code></a> and <a href="TemplateLoader.html#getReader(java.lang.Object,java.lang.String)"><code>TemplateLoader.getReader(Object, String)</code></a>, when those are called on the same
+ <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>. <code>null</code> must be returned if the source for the template doesn't exist; don't throw
+ exception then! The exact type of this object is up to the <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> implementation. As this object
+ is possibly used as hash key in caches, and is surly compared with another template source for equality, <b>it
+ must have a proper <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> and <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link"><code>Object.hashCode()</code></a>) implementation</b>. Especially,
+ template sources that refer to the same physical source must be equivalent, otherwise template caching can become
+ inefficient. This is only expected from <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link"><code>Object.equals(Object)</code></a> when the compared template sources came
+ from the same <a href="TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> instance. Also, it must not influence the equality if the source is open or
+ closed (<a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
 <dt>Throws:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - When an error occurs that makes it impossible to find out if the template exists, or to access the
-             existing template. Don't throw exception if the template doesn't exist, instead return with
-             <code>null</code> then!</dd>
+         existing template. Don't throw exception if the template doesn't exist, instead return with <code>null</code>
+         then!</dd>
 </dl>
 </section>
 </li>
@@ -289,15 +289,14 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
 <dd><code><a href="TemplateLoader.html#getLastModified(java.lang.Object)">getLastModified</a></code>&nbsp;in interface&nbsp;<code><a href="TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></dd>
 <dt>Parameters:</dt>
 <dd><code>templateSource</code> - an object representing a template source (the template file), obtained through a prior call to
-            <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
-            <a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
+         <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
+         <a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
 <dt>Returns:</dt>
 <dd>The time of last modification for the specified template source, or -1 if the time is not known. This
-            value meant to be milliseconds since the epoch, but in fact FreeMarker doesn't care what it means, it
-            only cares if it changes, in which case the template needs to be reloaded (even if the value has
-            decreased). -1 is not special in that regard either; if you keep returning it, FreeMarker won't
-            reload the template (as far as it's not evicted from the cache from some other
-            reason). Note that <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Long.html#MIN_VALUE" title="class or interface in java.lang" class="external-link"><code>Long.MIN_VALUE</code></a> is reserved for internal use.</dd>
+ value meant to be milliseconds since the epoch, but in fact FreeMarker doesn't care what it means, it only cares
+ if it changes, in which case the template needs to be reloaded (even if the value has decreased). -1 is not
+ special in that regard either; if you keep returning it, FreeMarker won't reload the template (as far as it's not
+ evicted from the cache from some other reason). Note that <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Long.html#MIN_VALUE" title="class or interface in java.lang" class="external-link"><code>Long.MIN_VALUE</code></a> is reserved for internal use.</dd>
 </dl>
 </section>
 </li>
@@ -313,31 +312,31 @@ implements <a href="TemplateLoader.html" title="interface in freemarker.cache">T
  reads the template from its beginning. Before this method is called for the second time (or later), its caller
  must close the previously returned <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a>, and it must not use it anymore. That is, this method is not
  required to support multiple concurrent readers for the same source <code>templateSource</code> object.
- 
+
  <p>
  Typically, this method is called if the template is missing from the cache, or if after calling
  <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a> and <a href="TemplateLoader.html#getLastModified(java.lang.Object)"><code>TemplateLoader.getLastModified(Object)</code></a> it was determined that the cached copy
  of the template is stale. Then, if it turns out that the <code>encoding</code> parameter used doesn't match the actual
  template content (based on the <code>#ftl encoding=...</code> header), this method will be called for a second time
  with the correct <code>encoding</code> parameter value.
- 
+
  <p>
- Unlike <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>, this method must not tolerate if the template is not found, and
- must throw <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link"><code>IOException</code></a> in that case.</div>
+ Unlike <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>, this method must not tolerate if the template is not found, and must
+ throw <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link"><code>IOException</code></a> in that case.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="TemplateLoader.html#getReader(java.lang.Object,java.lang.String)">getReader</a></code>&nbsp;in interface&nbsp;<code><a href="TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></dd>
 <dt>Parameters:</dt>
 <dd><code>templateSource</code> - an object representing a template source, obtained through a prior call to
-            <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
-            <a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
-<dd><code>encoding</code> - the character encoding used to translate source bytes to characters. Some loaders may not have access
-            to the byte representation of the template stream, and instead directly obtain a character stream.
-            These loaders should ignore the encoding parameter.</dd>
+         <a href="TemplateLoader.html#findTemplateSource(java.lang.String)"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
+         <a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
+<dd><code>encoding</code> - the character encoding used to translate source bytes to characters. Some loaders may not have access to
+         the byte representation of the template stream, and instead directly obtain a character stream. These
+         loaders should ignore the encoding parameter.</dd>
 <dt>Returns:</dt>
 <dd>A <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a> representing the template character stream; not <code>null</code>. It's the responsibility of
-         the caller (which is <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a> usually) to <code>close()</code> it. The <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a> is not
-         required to work after the <code>templateSource</code> was closed (<a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
+ the caller (which is <a href="TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a> usually) to <code>close()</code> it. The <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Reader.html" title="class or interface in java.io" class="external-link"><code>Reader</code></a> is not required to
+ work after the <code>templateSource</code> was closed (<a href="TemplateLoader.html#closeTemplateSource(java.lang.Object)"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
 <dt>Throws:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - if an I/O error occurs while accessing the stream.</dd>
 </dl>
diff --git a/docs/api/freemarker/cache/package-summary.html b/docs/api/freemarker/cache/package-summary.html
index 9f34799c..0d1fe557 100644
--- a/docs/api/freemarker/cache/package-summary.html
+++ b/docs/api/freemarker/cache/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>freemarker.cache (FreeMarker 2.3.34 API)</title>
+<title>freemarker.cache (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.cache">
@@ -70,8 +70,8 @@ loadScripts(document, 'script');</script>
 <div class="table-header col-last">Description</div>
 <div class="col-first even-row-color"><a href="CacheStorage.html" title="interface in freemarker.cache">CacheStorage</a></div>
 <div class="col-last even-row-color">
-<div class="block">Cache storage abstracts away the storage aspects of a cache - associating
- an object with a key, retrieval and removal via the key.</div>
+<div class="block">Cache storage abstracts away the storage aspects of a cache - associating an object with a key, retrieval and removal
+ via the key.</div>
 </div>
 <div class="col-first odd-row-color"><a href="CacheStorageWithGetSize.html" title="interface in freemarker.cache">CacheStorageWithGetSize</a></div>
 <div class="col-last odd-row-color">
@@ -79,8 +79,8 @@ loadScripts(document, 'script');</script>
 </div>
 <div class="col-first even-row-color"><a href="ConcurrentCacheStorage.html" title="interface in freemarker.cache">ConcurrentCacheStorage</a></div>
 <div class="col-last even-row-color">
-<div class="block">An optional interface for cache storage that knows whether it can be 
- concurrently accessible without synchronization.</div>
+<div class="block">An optional interface for cache storage that knows whether it can be concurrently accessible without
+ synchronization.</div>
 </div>
 <div class="col-first odd-row-color"><a href="StatefulTemplateLoader.html" title="interface in freemarker.cache">StatefulTemplateLoader</a></div>
 <div class="col-last odd-row-color">
@@ -89,9 +89,8 @@ loadScripts(document, 'script');</script>
 </div>
 <div class="col-first even-row-color"><a href="TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></div>
 <div class="col-last even-row-color">
-<div class="block">FreeMarker loads template "files" through objects that implement this interface,
- thus the templates need not be real files, and can come from any kind of data source
- (like classpath, servlet context, database, etc).</div>
+<div class="block">FreeMarker loads template "files" through objects that implement this interface, thus the templates need not be real
+ files, and can come from any kind of data source (like classpath, servlet context, database, etc).</div>
 </div>
 </div>
 </li>
@@ -186,7 +185,7 @@ loadScripts(document, 'script');</script>
 </div>
 <div class="col-first even-row-color"><a href="TemplateCache.MaybeMissingTemplate.html" title="class in freemarker.cache">TemplateCache.MaybeMissingTemplate</a></div>
 <div class="col-last even-row-color">
-<div class="block">Used for the return value of <a href="TemplateCache.html#getTemplate(java.lang.String,java.util.Locale,java.lang.Object,java.lang.String,boolean)"><code>TemplateCache.getTemplate(String, Locale, Object, String, boolean)</code></a>.</div>
+<div class="block">Return value of <a href="TemplateCache.html#getTemplate(java.lang.String,java.util.Locale,java.lang.Object,java.lang.String,boolean)"><code>TemplateCache.getTemplate(String, Locale, Object, String, boolean)</code></a>.</div>
 </div>
 <div class="col-first odd-row-color"><a href="TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></div>
 <div class="col-last odd-row-color">
diff --git a/docs/api/freemarker/cache/package-tree.html b/docs/api/freemarker/cache/package-tree.html
index 65d32c5d..d6998d45 100644
--- a/docs/api/freemarker/cache/package-tree.html
+++ b/docs/api/freemarker/cache/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>freemarker.cache Class Hierarchy (FreeMarker 2.3.34 API)</title>
+<title>freemarker.cache Class Hierarchy (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: freemarker.cache">
diff --git a/docs/api/freemarker/core/AbstractJSONLikeFormat.html b/docs/api/freemarker/core/AbstractJSONLikeFormat.html
index 1abc782b..6a62743e 100644
--- a/docs/api/freemarker/core/AbstractJSONLikeFormat.html
+++ b/docs/api/freemarker/core/AbstractJSONLikeFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>AbstractJSONLikeFormat (FreeMarker 2.3.34 API)</title>
+<title>AbstractJSONLikeFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: AbstractJSONLikeFormat">
diff --git a/docs/api/freemarker/core/AliasTemplateDateFormatFactory.html b/docs/api/freemarker/core/AliasTemplateDateFormatFactory.html
index 9542fb18..8b5c0f5f 100644
--- a/docs/api/freemarker/core/AliasTemplateDateFormatFactory.html
+++ b/docs/api/freemarker/core/AliasTemplateDateFormatFactory.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>AliasTemplateDateFormatFactory (FreeMarker 2.3.34 API)</title>
+<title>AliasTemplateDateFormatFactory (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: AliasTemplateDateFormatFactory">
@@ -166,13 +166,13 @@ loadScripts(document, 'script');</script>
 <dl class="notes">
 <dt>Parameters:</dt>
 <dd><code>defaultTargetFormatString</code> - The format string this format will be an alias to if there's no locale-specific format string for the
-            requested locale in <code>localizedTargetFormatStrings</code></dd>
-<dd><code>localizedTargetFormatStrings</code> - Maps <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/Locale.html" title="class or interface in java.util" class="external-link"><code>Locale</code></a>-s to format strings. If the desired locale doesn't occur in the map, a less
-            specific locale is tried, repeatedly until only the language part remains. For example, if locale is
-            <code>new Locale("en", "US", "Linux")</code>, then these keys will be attempted untol a match is found, in
-            this order: <code>new Locale("en", "US", "Linux")</code>, <code>new Locale("en", "US")</code>,
-            <code>new Locale("en")</code>. If there's still no matching key, the value of the
-            <code>targetFormatString</code> will be used.</dd>
+         requested locale in <code>localizedTargetFormatStrings</code>. Not <code>null</code>.</dd>
+<dd><code>localizedTargetFormatStrings</code> - Maps <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/Locale.html" title="class or interface in java.util" class="external-link"><code>Locale</code></a>-s to format strings (maybe <code>null</code>). If the desired locale doesn't occur in the
+         map, a less specific locale is tried, repeatedly until only the language part remains. For example, if
+         locale is <code>new Locale("en", "US", "Linux")</code>, then these keys will be attempted until a match is
+         found, in this order: <code>new Locale("en", "US", "Linux")</code>, <code>new Locale("en", "US")</code>,
+         <code>new Locale("en")</code>. If there's still no matching key, the value of the <code>targetFormatString</code>
+         will be used.</dd>
 </dl>
 </section>
 </li>
diff --git a/docs/api/freemarker/core/AliasTemplateNumberFormatFactory.html b/docs/api/freemarker/core/AliasTemplateNumberFormatFactory.html
index 5c1a7695..c60ad4e8 100644
--- a/docs/api/freemarker/core/AliasTemplateNumberFormatFactory.html
+++ b/docs/api/freemarker/core/AliasTemplateNumberFormatFactory.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>AliasTemplateNumberFormatFactory (FreeMarker 2.3.34 API)</title>
+<title>AliasTemplateNumberFormatFactory (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: AliasTemplateNumberFormatFactory">
@@ -163,13 +163,13 @@ loadScripts(document, 'script');</script>
 <dl class="notes">
 <dt>Parameters:</dt>
 <dd><code>defaultTargetFormatString</code> - The format string this format will be an alias to if there's no locale-specific format string for the
-            requested locale in <code>localizedTargetFormatStrings</code></dd>
-<dd><code>localizedTargetFormatStrings</code> - Maps <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/Locale.html" title="class or interface in java.util" class="external-link"><code>Locale</code></a>-s to format strings. If the desired locale doesn't occur in the map, a less
-            specific locale is tried, repeatedly until only the language part remains. For example, if locale is
-            <code>new Locale("en", "US", "Linux")</code>, then these keys will be attempted untol a match is found, in
-            this order: <code>new Locale("en", "US", "Linux")</code>, <code>new Locale("en", "US")</code>,
-            <code>new Locale("en")</code>. If there's still no matching key, the value of the
-            <code>targetFormatString</code> will be used.</dd>
+         requested locale in <code>localizedTargetFormatStrings</code>. Not <code>null</code>.</dd>
+<dd><code>localizedTargetFormatStrings</code> - Maps <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/Locale.html" title="class or interface in java.util" class="external-link"><code>Locale</code></a>-s to format strings (maybe <code>null</code>). If the desired locale doesn't occur in the
+         map, a less specific locale is tried, repeatedly until only the language part remains. For example, if
+         locale is <code>new Locale("en", "US", "Linux")</code>, then these keys will be attempted until a match is
+         found, in this order: <code>new Locale("en", "US", "Linux")</code>, <code>new Locale("en", "US")</code>,
+         <code>new Locale("en")</code>. If there's still no matching key, the value of the <code>targetFormatString</code>
+         will be used.</dd>
 </dl>
 </section>
 </li>
diff --git a/docs/api/freemarker/core/ArithmeticEngine.BigDecimalEngine.html b/docs/api/freemarker/core/ArithmeticEngine.BigDecimalEngine.html
index 1b89564b..79160d90 100644
--- a/docs/api/freemarker/core/ArithmeticEngine.BigDecimalEngine.html
+++ b/docs/api/freemarker/core/ArithmeticEngine.BigDecimalEngine.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>ArithmeticEngine.BigDecimalEngine (FreeMarker 2.3.34 API)</title>
+<title>ArithmeticEngine.BigDecimalEngine (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: ArithmeticEngine, class: BigDecimalEngine">
@@ -169,7 +169,7 @@ loadScripts(document, 'script');</script>
 </div>
 <div class="inherited-list">
 <h3 id="methods.inherited.from.class.freemarker.core.ArithmeticEngine">Methods inherited from class&nbsp;freemarker.core.<a href="ArithmeticEngine.html" title="class in freemarker.core">ArithmeticEngine</a></h3>
-<code><a href="ArithmeticEngine.html#setMaxScale(int)">setMaxScale</a>, <a href="ArithmeticEngine.html#setMinScale(int)">setMinScale</a>, <a href="ArithmeticEngine.html#setRoundingPolicy(int)">setRoundingPolicy</a></code></div>
+<code><a href="ArithmeticEngine.html#hexadecimalToNumber(java.lang.String)">hexadecimalToNumber</a>, <a href="ArithmeticEngine.html#setMaxScale(int)">setMaxScale</a>, <a href="ArithmeticEngine.html#setMinScale(int)">setMinScale</a>, <a href="ArithmeticEngine.html#setRoundingPolicy(int)">setRoundingPolicy</a></code></div>
 <div class="inherited-list">
 <h3 id="methods.inherited.from.class.java.lang.Object">Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
 <code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#finalize()" title="class or  [...]
diff --git a/docs/api/freemarker/core/ArithmeticEngine.ConservativeEngine.html b/docs/api/freemarker/core/ArithmeticEngine.ConservativeEngine.html
index cf1811bf..68f0dccd 100644
--- a/docs/api/freemarker/core/ArithmeticEngine.ConservativeEngine.html
+++ b/docs/api/freemarker/core/ArithmeticEngine.ConservativeEngine.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>ArithmeticEngine.ConservativeEngine (FreeMarker 2.3.34 API)</title>
+<title>ArithmeticEngine.ConservativeEngine (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: ArithmeticEngine, class: ConservativeEngine">
@@ -88,18 +88,18 @@ loadScripts(document, 'script');</script>
 <div class="type-signature"><span class="modifiers">public static class </span><span class="element-name type-name-label">ArithmeticEngine.ConservativeEngine</span>
 <span class="extends-implements">extends <a href="ArithmeticEngine.html" title="class in freemarker.core">ArithmeticEngine</a></span></div>
 <div class="block">An arithmetic engine that conservatively widens the operation arguments
- to extent that they can hold the result of the operation. Widening 
+ to extent that they can hold the result of the operation. Widening
  conversions occur in following situations:
  <ul>
  <li>byte and short are always widened to int (alike to Java language).</li>
- <li>To preserve magnitude: when operands are of different types, the 
+ <li>To preserve magnitude: when operands are of different types, the
  result type is the type of the wider operand.</li>
  <li>to avoid overflows: if add, subtract, or multiply would overflow on
- integer types, the result is widened from int to long, or from long to 
+ integer types, the result is widened from int to long, or from long to
  BigInteger.</li>
- <li>to preserve fractional part: if a division of integer types would 
- have a fractional part, int and long are converted to double, and 
- BigInteger is converted to BigDecimal. An operation on a float and a 
+ <li>to preserve fractional part: if a division of integer types would
+ have a fractional part, int and long are converted to double, and
+ BigInteger is converted to BigDecimal. An operation on a float and a
  long results in a double. An operation on a float or double and a
  BigInteger results in a BigDecimal.</li>
  </ul></div>
@@ -182,7 +182,7 @@ loadScripts(document, 'script');</script>
 </div>
 <div class="inherited-list">
 <h3 id="methods.inherited.from.class.freemarker.core.ArithmeticEngine">Methods inherited from class&nbsp;freemarker.core.<a href="ArithmeticEngine.html" title="class in freemarker.core">ArithmeticEngine</a></h3>
-<code><a href="ArithmeticEngine.html#setMaxScale(int)">setMaxScale</a>, <a href="ArithmeticEngine.html#setMinScale(int)">setMinScale</a>, <a href="ArithmeticEngine.html#setRoundingPolicy(int)">setRoundingPolicy</a></code></div>
+<code><a href="ArithmeticEngine.html#hexadecimalToNumber(java.lang.String)">hexadecimalToNumber</a>, <a href="ArithmeticEngine.html#setMaxScale(int)">setMaxScale</a>, <a href="ArithmeticEngine.html#setMinScale(int)">setMinScale</a>, <a href="ArithmeticEngine.html#setRoundingPolicy(int)">setRoundingPolicy</a></code></div>
 <div class="inherited-list">
 <h3 id="methods.inherited.from.class.java.lang.Object">Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
 <code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#finalize()" title="class or  [...]
diff --git a/docs/api/freemarker/core/ArithmeticEngine.html b/docs/api/freemarker/core/ArithmeticEngine.html
index fd30c644..4991fc9d 100644
--- a/docs/api/freemarker/core/ArithmeticEngine.html
+++ b/docs/api/freemarker/core/ArithmeticEngine.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>ArithmeticEngine (FreeMarker 2.3.34 API)</title>
+<title>ArithmeticEngine (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: ArithmeticEngine">
@@ -86,7 +86,7 @@ loadScripts(document, 'script');</script>
 <div class="type-signature"><span class="modifiers">public abstract class </span><span class="element-name type-name-label">ArithmeticEngine</span>
 <span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span></div>
 <div class="block">Used for implementing the arithmetic operations and number comparisons in the template language. The concrete
- implementation is plugged into the configuration with the <code>arithmetical_engine</code> setting. 
+ implementation is plugged into the configuration with the <code>arithmetical_engine</code> setting.
  (See <a href="Configurable.html#setArithmeticEngine(freemarker.core.ArithmeticEngine)"><code>Configurable.setArithmeticEngine(ArithmeticEngine)</code></a>.)</div>
 </section>
 <section class="summary">
@@ -184,34 +184,39 @@ loadScripts(document, 'script');</script>
 <div class="col-second even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#divide(java.lang.Number,java.lang.Number)">divide</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a>&nbsp;first,
  <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a>&nbsp;second)</code></div>
 <div class="col-last even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code>abstract <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a></code></div>
-<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#modulus(java.lang.Number,java.lang.Number)">modulus</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a>&nbsp;first,
- <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a>&nbsp;second)</code></div>
-<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">&nbsp;</div>
+<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a></code></div>
+<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#hexadecimalToNumber(java.lang.String)">hexadecimalToNumber</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;s)</code></div>
+<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
+<div class="block">Parses a hexadecimal number like <code>"0xCAFEBABE"</code>.</div>
+</div>
 <div class="col-first even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code>abstract <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a></code></div>
-<div class="col-second even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#multiply(java.lang.Number,java.lang.Number)">multiply</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a>&nbsp;first,
+<div class="col-second even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#modulus(java.lang.Number,java.lang.Number)">modulus</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a>&nbsp;first,
  <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a>&nbsp;second)</code></div>
 <div class="col-last even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>void</code></div>
-<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#setMaxScale(int)">setMaxScale</a></span>&#8203;(int&nbsp;maxScale)</code></div>
-<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
-<div class="block">Sets the maximal scale to use when multiplying BigDecimal numbers.</div>
-</div>
+<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code>abstract <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a></code></div>
+<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#multiply(java.lang.Number,java.lang.Number)">multiply</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a>&nbsp;first,
+ <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a>&nbsp;second)</code></div>
+<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">&nbsp;</div>
 <div class="col-first even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>void</code></div>
-<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#setMinScale(int)">setMinScale</a></span>&#8203;(int&nbsp;minScale)</code></div>
+<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#setMaxScale(int)">setMaxScale</a></span>&#8203;(int&nbsp;maxScale)</code></div>
 <div class="col-last even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
-<div class="block">Sets the minimal scale to use when dividing BigDecimal numbers.</div>
+<div class="block">Sets the maximal scale to use when multiplying BigDecimal numbers.</div>
 </div>
 <div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>void</code></div>
-<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#setRoundingPolicy(int)">setRoundingPolicy</a></span>&#8203;(int&nbsp;roundingPolicy)</code></div>
-<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code>abstract <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a></code></div>
-<div class="col-second even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#subtract(java.lang.Number,java.lang.Number)">subtract</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a>&nbsp;first,
- <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a>&nbsp;second)</code></div>
-<div class="col-last even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">&nbsp;</div>
+<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#setMinScale(int)">setMinScale</a></span>&#8203;(int&nbsp;minScale)</code></div>
+<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
+<div class="block">Sets the minimal scale to use when dividing BigDecimal numbers.</div>
+</div>
+<div class="col-first even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>void</code></div>
+<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#setRoundingPolicy(int)">setRoundingPolicy</a></span>&#8203;(int&nbsp;roundingPolicy)</code></div>
+<div class="col-last even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">&nbsp;</div>
 <div class="col-first odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code>abstract <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a></code></div>
-<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#toNumber(java.lang.String)">toNumber</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;s)</code></div>
-<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">
+<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#subtract(java.lang.Number,java.lang.Number)">subtract</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a>&nbsp;first,
+ <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a>&nbsp;second)</code></div>
+<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code>abstract <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a></code></div>
+<div class="col-second even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#toNumber(java.lang.String)">toNumber</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;s)</code></div>
+<div class="col-last even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">
 <div class="block">Should be able to parse all FTL numerical literals, Java Double toString results, and XML Schema numbers.</div>
 </div>
 </div>
@@ -373,6 +378,30 @@ loadScripts(document, 'script');</script>
 </section>
 </li>
 <li>
+<section class="detail" id="hexadecimalToNumber(java.lang.String)">
+<h3>hexadecimalToNumber</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a></span>&nbsp;<span class="element-name">hexadecimalToNumber</span>&#8203;<span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.la [...]
+<div class="block">Parses a hexadecimal number like <code>"0xCAFEBABE"</code>. The template language parser restricts what needs to be
+ supported here:
+ <ul>
+     <li>Parsing must be case-insensitive</li>
+     <li>There's never a sign (plus or minus); if there's a minus sign, that will be handled outside this
+     method</li>
+     <li>The string always starts with <code>0x</code> (or <code>0X</code>), so you can safely ignore the first 2
+     characters</li>
+     <li>There's an arbitrary number of digits</li>
+     <li>Only whole numbers need to be supported (there's never a <code>.</code> in the string)</li>
+ </ul>
+
+ <p>Default implementation in <a href="ArithmeticEngine.html" title="class in freemarker.core"><code>ArithmeticEngine</code></a> chooses the smallest type that can still represent the
+ number (always positive) without loss: <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link"><code>Integer</code></a>, <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Long.html" title="class or interface in java.lang" class="external-link"><code>Long</code></a>, <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/math/BigInteger.htm [...]
+<dl class="notes">
+<dt>Since:</dt>
+<dd>2.3.35</dd>
+</dl>
+</section>
+</li>
+<li>
 <section class="detail" id="setMinScale(int)">
 <h3>setMinScale</h3>
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name">setMinScale</span>&#8203;<span class="parameters">(int&nbsp;minScale)</span></div>
@@ -384,7 +413,7 @@ loadScripts(document, 'script');</script>
 <section class="detail" id="setMaxScale(int)">
 <h3>setMaxScale</h3>
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name">setMaxScale</span>&#8203;<span class="parameters">(int&nbsp;maxScale)</span></div>
-<div class="block">Sets the maximal scale to use when multiplying BigDecimal numbers. 
+<div class="block">Sets the maximal scale to use when multiplying BigDecimal numbers.
  Default value is 100.</div>
 </section>
 </li>
diff --git a/docs/api/freemarker/core/BugException.html b/docs/api/freemarker/core/BugException.html
index 5057ea20..0a9a89b3 100644
--- a/docs/api/freemarker/core/BugException.html
+++ b/docs/api/freemarker/core/BugException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>BugException (FreeMarker 2.3.34 API)</title>
+<title>BugException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: BugException">
diff --git a/docs/api/freemarker/core/BuiltInForNodeEx.html b/docs/api/freemarker/core/BuiltInForNodeEx.html
index e35d85a1..d239a456 100644
--- a/docs/api/freemarker/core/BuiltInForNodeEx.html
+++ b/docs/api/freemarker/core/BuiltInForNodeEx.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>BuiltInForNodeEx (FreeMarker 2.3.34 API)</title>
+<title>BuiltInForNodeEx (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: BuiltInForNodeEx">
@@ -157,15 +157,29 @@ loadScripts(document, 'script');</script>
  freemarker.core.Expression&nbsp;replacement,
  freemarker.core.Expression.ReplacemenetState&nbsp;replacementState)</code></div>
 <div class="col-last even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
-<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#getCanonicalForm()">getCanonicalForm</a></span>()</code></div>
-<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>protected <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a></code></div>
-<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#getNumberMethodArg(java.util.List,int)">getNumberMethodArg</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&nbsp;args,
+<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>protected boolean</code></div>
+<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#getBooleanMethodArg(java.util.List,int)">getBooleanMethodArg</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&nbsp;args,
  int&nbsp;argIdx)</code></div>
-<div class="col-last even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
+<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
+<div class="block">Gets a method argument and checks if it's a boolean; it does NOT check if <code>args</code> is big enough.</div>
+</div>
+<div class="col-first even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
+<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#getCanonicalForm()">getCanonicalForm</a></span>()</code></div>
+<div class="col-last even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">&nbsp;</div>
+<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>protected <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a></code></div>
+<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#getNumberMethodArg(java.util.List,int)">getNumberMethodArg</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&nbsp;args,
+ int&nbsp;argIdx)</code></div>
+<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
 <div class="block">Gets a method argument and checks if it's a number; it does NOT check if <code>args</code> is big enough.</div>
 </div>
+<div class="col-first even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>protected boolean</code></div>
+<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#getOptBooleanMethodArg(java.util.List,int,boolean)">getOptBooleanMethodArg</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&nbsp;args,
+ int&nbsp;argIdx,
+ boolean&nbsp;defaultValue)</code></div>
+<div class="col-last even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
+<div class="block">Same as <a href="#getBooleanMethodArg(java.util.List,int)"><code>getBooleanMethodArg(java.util.List, int)</code></a>, but checks if <code>args</code> is big enough, and returns <code>defaultValue</code>
+ if it isn't.</div>
+</div>
 <div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>protected <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a></code></div>
 <div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#getOptNumberMethodArg(java.util.List,int)">getOptNumberMethodArg</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&nbsp;args,
  int&nbsp;argIdx)</code></div>
@@ -374,6 +388,34 @@ loadScripts(document, 'script');</script>
 </section>
 </li>
 <li>
+<section class="detail" id="getOptBooleanMethodArg(java.util.List,int,boolean)">
+<h3>getOptBooleanMethodArg</h3>
+<div class="member-signature"><span class="modifiers">protected final</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name">getOptBooleanMethodArg</span>&#8203;<span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&nbsp;args,
+ int&nbsp;argIdx,
+ boolean&nbsp;defaultValue)</span>
+                                        throws <span class="exceptions"><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></span></div>
+<div class="block">Same as <a href="#getBooleanMethodArg(java.util.List,int)"><code>getBooleanMethodArg(java.util.List, int)</code></a>, but checks if <code>args</code> is big enough, and returns <code>defaultValue</code>
+ if it isn't.</div>
+<dl class="notes">
+<dt>Throws:</dt>
+<dd><code><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getBooleanMethodArg(java.util.List,int)">
+<h3>getBooleanMethodArg</h3>
+<div class="member-signature"><span class="modifiers">protected final</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name">getBooleanMethodArg</span>&#8203;<span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&nbsp;args,
+ int&nbsp;argIdx)</span>
+                                     throws <span class="exceptions"><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></span></div>
+<div class="block">Gets a method argument and checks if it's a boolean; it does NOT check if <code>args</code> is big enough.</div>
+<dl class="notes">
+<dt>Throws:</dt>
+<dd><code><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</section>
+</li>
+<li>
 <section class="detail" id="newMethodArgInvalidValueException(int,java.lang.Object[])">
 <h3>newMethodArgInvalidValueException</h3>
 <div class="member-signature"><span class="modifiers">protected final</span>&nbsp;<span class="return-type"><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></span>&nbsp;<span class="element-name">newMethodArgInvalidValueException</span>&#8203;<span class="parameters">(int&nbsp;argIdx,
diff --git a/docs/api/freemarker/core/CFormat.html b/docs/api/freemarker/core/CFormat.html
index ce8998bb..7fecea0c 100644
--- a/docs/api/freemarker/core/CFormat.html
+++ b/docs/api/freemarker/core/CFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>CFormat (FreeMarker 2.3.34 API)</title>
+<title>CFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: CFormat">
diff --git a/docs/api/freemarker/core/CSSOutputFormat.html b/docs/api/freemarker/core/CSSOutputFormat.html
index a08582da..16ba8982 100644
--- a/docs/api/freemarker/core/CSSOutputFormat.html
+++ b/docs/api/freemarker/core/CSSOutputFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>CSSOutputFormat (FreeMarker 2.3.34 API)</title>
+<title>CSSOutputFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: CSSOutputFormat">
diff --git a/docs/api/freemarker/core/CallPlaceCustomDataInitializationException.html b/docs/api/freemarker/core/CallPlaceCustomDataInitializationException.html
index 23f6db3c..5bbef721 100644
--- a/docs/api/freemarker/core/CallPlaceCustomDataInitializationException.html
+++ b/docs/api/freemarker/core/CallPlaceCustomDataInitializationException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>CallPlaceCustomDataInitializationException (FreeMarker 2.3.34 API)</title>
+<title>CallPlaceCustomDataInitializationException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: CallPlaceCustomDataInitializationException">
diff --git a/docs/api/freemarker/core/CombinedMarkupOutputFormat.html b/docs/api/freemarker/core/CombinedMarkupOutputFormat.html
index 8d39b5d7..dc3b4eb4 100644
--- a/docs/api/freemarker/core/CombinedMarkupOutputFormat.html
+++ b/docs/api/freemarker/core/CombinedMarkupOutputFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>CombinedMarkupOutputFormat (FreeMarker 2.3.34 API)</title>
+<title>CombinedMarkupOutputFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: CombinedMarkupOutputFormat">
diff --git a/docs/api/freemarker/core/CommandLine.html b/docs/api/freemarker/core/CommandLine.html
deleted file mode 100644
index 22a76aaf..00000000
--- a/docs/api/freemarker/core/CommandLine.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<!DOCTYPE HTML>
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (16) -->
-<title>CommandLine (FreeMarker 2.3.34 API)</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="declaration: package: freemarker.core, class: CommandLine">
-<meta name="generator" content="javadoc/ClassWriterImpl">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-<script type="text/javascript" src="../../script-dir/jquery-3.5.1.min.js"></script>
-<script type="text/javascript" src="../../script-dir/jquery-ui.min.js"></script>
-</head>
-<body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../";
-loadScripts(document, 'script');</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
-<nav role="navigation">
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar.top">
-<div class="skip-nav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
-<li><a href="../../index.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="nav-bar-cell1-rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="sub-nav">
-<div>
-<ul class="sub-nav-list">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="sub-nav-list">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<div class="nav-list-search"><label for="search">SEARCH:</label>
-<input type="text" id="search" value="search" disabled="disabled">
-<input type="reset" id="reset" value="reset" disabled="disabled">
-</div>
-</div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<span class="skip-nav" id="skip.navbar.top">
-<!--   -->
-</span></nav>
-</header>
-<div class="flex-content">
-<main role="main">
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">freemarker.core</a></div>
-<h1 title="Class CommandLine" class="title">Class CommandLine</h1>
-</div>
-<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance">freemarker.core.CommandLine</div>
-</div>
-<section class="description">
-<hr>
-<div class="type-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
-</span><span class="modifiers">public class </span><span class="element-name type-name-label">CommandLine</span>
-<span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span></div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
-<div class="deprecation-comment">Will be removed (main method in a library, often classified as CWE-489 "Leftover Debug Code").</div>
-</div>
-<div class="block">FreeMarker command-line utility, the Main-Class of <code>freemarker.jar</code>.
- Currently it just prints the version number.</div>
-</section>
-<section class="summary">
-<ul class="summary-list">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<li>
-<section class="constructor-summary" id="constructor.summary">
-<h2>Constructor Summary</h2>
-<div class="caption"><span>Constructors</span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Constructor</div>
-<div class="table-header col-last">Description</div>
-<div class="col-constructor-name even-row-color"><code><span class="member-name-link"><a href="#%3Cinit%3E()">CommandLine</a></span>()</code></div>
-<div class="col-last even-row-color">
-<div class="block"><span class="deprecated-label">Deprecated.</span></div>
-&nbsp;</div>
-</div>
-</section>
-</li>
-<!-- ========== METHOD SUMMARY =========== -->
-<li>
-<section class="method-summary" id="method.summary">
-<h2>Method Summary</h2>
-<div id="method-summary-table">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab1" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab( [...]
-<div id="method-summary-table.tabpanel" role="tabpanel">
-<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
-<div class="table-header col-first">Modifier and Type</div>
-<div class="table-header col-second">Method</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table-tab1 method-summary-table-tab6 method-summary-table-tab4 method-summary-table"><code>static void</code></div>
-<div class="col-second even-row-color method-summary-table-tab1 method-summary-table-tab6 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#main(java.lang.String%5B%5D)">main</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>[]&nbsp;args)</code></div>
-<div class="col-last even-row-color method-summary-table-tab1 method-summary-table-tab6 method-summary-table-tab4 method-summary-table">
-<div class="block"><span class="deprecated-label">Deprecated.</span></div>
-&nbsp;</div>
-</div>
-</div>
-</div>
-<div class="inherited-list">
-<h3 id="methods.inherited.from.class.java.lang.Object">Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
-<code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#finalize()" title="class or  [...]
-</section>
-</li>
-</ul>
-</section>
-<section class="details">
-<ul class="details-list">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<li>
-<section class="constructor-details" id="constructor.detail">
-<h2>Constructor Details</h2>
-<ul class="member-list">
-<li>
-<section class="detail" id="&lt;init&gt;()">
-<h3>CommandLine</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name">CommandLine</span>()</div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-</section>
-</li>
-</ul>
-</section>
-</li>
-<!-- ============ METHOD DETAIL ========== -->
-<li>
-<section class="method-details" id="method.detail">
-<h2>Method Details</h2>
-<ul class="member-list">
-<li>
-<section class="detail" id="main(java.lang.String[])">
-<h3>main</h3>
-<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name">main</span>&#8203;<span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>[]&nbsp;args)</span></div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-</section>
-</li>
-</ul>
-</section>
-</li>
-</ul>
-</section>
-<!-- ========= END OF CLASS DATA ========= -->
-</main>
-</div>
-</div>
-</body>
-</html>
diff --git a/docs/api/freemarker/core/CommonMarkupOutputFormat.html b/docs/api/freemarker/core/CommonMarkupOutputFormat.html
index 756f8244..990eeea3 100644
--- a/docs/api/freemarker/core/CommonMarkupOutputFormat.html
+++ b/docs/api/freemarker/core/CommonMarkupOutputFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>CommonMarkupOutputFormat (FreeMarker 2.3.34 API)</title>
+<title>CommonMarkupOutputFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: CommonMarkupOutputFormat">
diff --git a/docs/api/freemarker/core/CommonTemplateMarkupOutputModel.html b/docs/api/freemarker/core/CommonTemplateMarkupOutputModel.html
index e755216b..08865128 100644
--- a/docs/api/freemarker/core/CommonTemplateMarkupOutputModel.html
+++ b/docs/api/freemarker/core/CommonTemplateMarkupOutputModel.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>CommonTemplateMarkupOutputModel (FreeMarker 2.3.34 API)</title>
+<title>CommonTemplateMarkupOutputModel (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: CommonTemplateMarkupOutputModel">
diff --git a/docs/api/freemarker/core/Configurable.SettingValueAssignmentException.html b/docs/api/freemarker/core/Configurable.SettingValueAssignmentException.html
index b006d181..ed7867ac 100644
--- a/docs/api/freemarker/core/Configurable.SettingValueAssignmentException.html
+++ b/docs/api/freemarker/core/Configurable.SettingValueAssignmentException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>Configurable.SettingValueAssignmentException (FreeMarker 2.3.34 API)</title>
+<title>Configurable.SettingValueAssignmentException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: Configurable, class: SettingValueAssignmentException">
diff --git a/docs/api/freemarker/core/Configurable.UnknownSettingException.html b/docs/api/freemarker/core/Configurable.UnknownSettingException.html
index d38a7afe..0c3f2b86 100644
--- a/docs/api/freemarker/core/Configurable.UnknownSettingException.html
+++ b/docs/api/freemarker/core/Configurable.UnknownSettingException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>Configurable.UnknownSettingException (FreeMarker 2.3.34 API)</title>
+<title>Configurable.UnknownSettingException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: Configurable, class: UnknownSettingException">
diff --git a/docs/api/freemarker/core/Configurable.html b/docs/api/freemarker/core/Configurable.html
index 69bee7a0..2aa2465f 100644
--- a/docs/api/freemarker/core/Configurable.html
+++ b/docs/api/freemarker/core/Configurable.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>Configurable (FreeMarker 2.3.34 API)</title>
+<title>Configurable (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: Configurable">
diff --git a/docs/api/freemarker/core/CustomAttribute.html b/docs/api/freemarker/core/CustomAttribute.html
index 34474981..db4b498a 100644
--- a/docs/api/freemarker/core/CustomAttribute.html
+++ b/docs/api/freemarker/core/CustomAttribute.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>CustomAttribute (FreeMarker 2.3.34 API)</title>
+<title>CustomAttribute (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: CustomAttribute">
diff --git a/docs/api/freemarker/core/DefaultTruncateBuiltinAlgorithm.html b/docs/api/freemarker/core/DefaultTruncateBuiltinAlgorithm.html
index 56f5a785..a3429578 100644
--- a/docs/api/freemarker/core/DefaultTruncateBuiltinAlgorithm.html
+++ b/docs/api/freemarker/core/DefaultTruncateBuiltinAlgorithm.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>DefaultTruncateBuiltinAlgorithm (FreeMarker 2.3.34 API)</title>
+<title>DefaultTruncateBuiltinAlgorithm (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: DefaultTruncateBuiltinAlgorithm">
diff --git a/docs/api/freemarker/core/DirectiveCallPlace.html b/docs/api/freemarker/core/DirectiveCallPlace.html
index ba772450..f22712c7 100644
--- a/docs/api/freemarker/core/DirectiveCallPlace.html
+++ b/docs/api/freemarker/core/DirectiveCallPlace.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>DirectiveCallPlace (FreeMarker 2.3.34 API)</title>
+<title>DirectiveCallPlace (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, interface: DirectiveCallPlace">
diff --git a/docs/api/freemarker/core/Environment.Namespace.html b/docs/api/freemarker/core/Environment.Namespace.html
index b7f115eb..1dee9cd6 100644
--- a/docs/api/freemarker/core/Environment.Namespace.html
+++ b/docs/api/freemarker/core/Environment.Namespace.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>Environment.Namespace (FreeMarker 2.3.34 API)</title>
+<title>Environment.Namespace (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: Environment, class: Namespace">
diff --git a/docs/api/freemarker/core/Environment.html b/docs/api/freemarker/core/Environment.html
index f3753d6c..9f9a583c 100644
--- a/docs/api/freemarker/core/Environment.html
+++ b/docs/api/freemarker/core/Environment.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>Environment (FreeMarker 2.3.34 API)</title>
+<title>Environment (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: Environment">
diff --git a/docs/api/freemarker/core/FreeMarkerTree.html b/docs/api/freemarker/core/FreeMarkerTree.html
index adb15090..43ecf525 100644
--- a/docs/api/freemarker/core/FreeMarkerTree.html
+++ b/docs/api/freemarker/core/FreeMarkerTree.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>FreeMarkerTree (FreeMarker 2.3.34 API)</title>
+<title>FreeMarkerTree (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: FreeMarkerTree">
diff --git a/docs/api/freemarker/core/HTMLOutputFormat.html b/docs/api/freemarker/core/HTMLOutputFormat.html
index 084a32ed..70610964 100644
--- a/docs/api/freemarker/core/HTMLOutputFormat.html
+++ b/docs/api/freemarker/core/HTMLOutputFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>HTMLOutputFormat (FreeMarker 2.3.34 API)</title>
+<title>HTMLOutputFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: HTMLOutputFormat">
diff --git a/docs/api/freemarker/core/InvalidFormatParametersException.html b/docs/api/freemarker/core/InvalidFormatParametersException.html
index 9e603a6d..ff7df38e 100644
--- a/docs/api/freemarker/core/InvalidFormatParametersException.html
+++ b/docs/api/freemarker/core/InvalidFormatParametersException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>InvalidFormatParametersException (FreeMarker 2.3.34 API)</title>
+<title>InvalidFormatParametersException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: InvalidFormatParametersException">
diff --git a/docs/api/freemarker/core/InvalidFormatStringException.html b/docs/api/freemarker/core/InvalidFormatStringException.html
index 4e61cb28..f8a44efd 100644
--- a/docs/api/freemarker/core/InvalidFormatStringException.html
+++ b/docs/api/freemarker/core/InvalidFormatStringException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>InvalidFormatStringException (FreeMarker 2.3.34 API)</title>
+<title>InvalidFormatStringException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: InvalidFormatStringException">
diff --git a/docs/api/freemarker/core/InvalidReferenceException.html b/docs/api/freemarker/core/InvalidReferenceException.html
index 7ef45efe..ec807a6b 100644
--- a/docs/api/freemarker/core/InvalidReferenceException.html
+++ b/docs/api/freemarker/core/InvalidReferenceException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>InvalidReferenceException (FreeMarker 2.3.34 API)</title>
+<title>InvalidReferenceException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: InvalidReferenceException">
diff --git a/docs/api/freemarker/core/JSONCFormat.html b/docs/api/freemarker/core/JSONCFormat.html
index 8cf0836a..b06e054e 100644
--- a/docs/api/freemarker/core/JSONCFormat.html
+++ b/docs/api/freemarker/core/JSONCFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>JSONCFormat (FreeMarker 2.3.34 API)</title>
+<title>JSONCFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: JSONCFormat">
diff --git a/docs/api/freemarker/core/JSONOutputFormat.html b/docs/api/freemarker/core/JSONOutputFormat.html
index 55be1a59..1ba3c04d 100644
--- a/docs/api/freemarker/core/JSONOutputFormat.html
+++ b/docs/api/freemarker/core/JSONOutputFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>JSONOutputFormat (FreeMarker 2.3.34 API)</title>
+<title>JSONOutputFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: JSONOutputFormat">
diff --git a/docs/api/freemarker/core/JavaCFormat.html b/docs/api/freemarker/core/JavaCFormat.html
index bae4a699..95410d10 100644
--- a/docs/api/freemarker/core/JavaCFormat.html
+++ b/docs/api/freemarker/core/JavaCFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>JavaCFormat (FreeMarker 2.3.34 API)</title>
+<title>JavaCFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: JavaCFormat">
diff --git a/docs/api/freemarker/core/JavaScriptCFormat.html b/docs/api/freemarker/core/JavaScriptCFormat.html
index ff2dd624..05d147c9 100644
--- a/docs/api/freemarker/core/JavaScriptCFormat.html
+++ b/docs/api/freemarker/core/JavaScriptCFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>JavaScriptCFormat (FreeMarker 2.3.34 API)</title>
+<title>JavaScriptCFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: JavaScriptCFormat">
diff --git a/docs/api/freemarker/core/JavaScriptOrJSONCFormat.html b/docs/api/freemarker/core/JavaScriptOrJSONCFormat.html
index 689b452b..a899f71b 100644
--- a/docs/api/freemarker/core/JavaScriptOrJSONCFormat.html
+++ b/docs/api/freemarker/core/JavaScriptOrJSONCFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>JavaScriptOrJSONCFormat (FreeMarker 2.3.34 API)</title>
+<title>JavaScriptOrJSONCFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: JavaScriptOrJSONCFormat">
diff --git a/docs/api/freemarker/core/JavaScriptOutputFormat.html b/docs/api/freemarker/core/JavaScriptOutputFormat.html
index a8d01f02..4ac9548c 100644
--- a/docs/api/freemarker/core/JavaScriptOutputFormat.html
+++ b/docs/api/freemarker/core/JavaScriptOutputFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>JavaScriptOutputFormat (FreeMarker 2.3.34 API)</title>
+<title>JavaScriptOutputFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: JavaScriptOutputFormat">
diff --git a/docs/api/freemarker/core/LegacyCFormat.html b/docs/api/freemarker/core/LegacyCFormat.html
index b0c54afc..e9e44b8e 100644
--- a/docs/api/freemarker/core/LegacyCFormat.html
+++ b/docs/api/freemarker/core/LegacyCFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>LegacyCFormat (FreeMarker 2.3.34 API)</title>
+<title>LegacyCFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: LegacyCFormat">
diff --git a/docs/api/freemarker/core/MarkupOutputFormat.html b/docs/api/freemarker/core/MarkupOutputFormat.html
index 888e519f..0cddf33e 100644
--- a/docs/api/freemarker/core/MarkupOutputFormat.html
+++ b/docs/api/freemarker/core/MarkupOutputFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>MarkupOutputFormat (FreeMarker 2.3.34 API)</title>
+<title>MarkupOutputFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: MarkupOutputFormat">
diff --git a/docs/api/freemarker/core/NonBooleanException.html b/docs/api/freemarker/core/NonBooleanException.html
index e7ddb2e8..69f09a3e 100644
--- a/docs/api/freemarker/core/NonBooleanException.html
+++ b/docs/api/freemarker/core/NonBooleanException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>NonBooleanException (FreeMarker 2.3.34 API)</title>
+<title>NonBooleanException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: NonBooleanException">
diff --git a/docs/api/freemarker/core/NonDateException.html b/docs/api/freemarker/core/NonDateException.html
index 2f7529d8..c71aa1e9 100644
--- a/docs/api/freemarker/core/NonDateException.html
+++ b/docs/api/freemarker/core/NonDateException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>NonDateException (FreeMarker 2.3.34 API)</title>
+<title>NonDateException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: NonDateException">
diff --git a/docs/api/freemarker/core/NonExtendedHashException.html b/docs/api/freemarker/core/NonExtendedHashException.html
index b5e25201..7492e9d9 100644
--- a/docs/api/freemarker/core/NonExtendedHashException.html
+++ b/docs/api/freemarker/core/NonExtendedHashException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>NonExtendedHashException (FreeMarker 2.3.34 API)</title>
+<title>NonExtendedHashException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: NonExtendedHashException">
diff --git a/docs/api/freemarker/core/NonExtendedNodeException.html b/docs/api/freemarker/core/NonExtendedNodeException.html
index c9d1f8fe..58f41cd9 100644
--- a/docs/api/freemarker/core/NonExtendedNodeException.html
+++ b/docs/api/freemarker/core/NonExtendedNodeException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>NonExtendedNodeException (FreeMarker 2.3.34 API)</title>
+<title>NonExtendedNodeException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: NonExtendedNodeException">
diff --git a/docs/api/freemarker/core/NonHashException.html b/docs/api/freemarker/core/NonHashException.html
index c5246102..10840a75 100644
--- a/docs/api/freemarker/core/NonHashException.html
+++ b/docs/api/freemarker/core/NonHashException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>NonHashException (FreeMarker 2.3.34 API)</title>
+<title>NonHashException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: NonHashException">
diff --git a/docs/api/freemarker/core/NonMarkupOutputException.html b/docs/api/freemarker/core/NonMarkupOutputException.html
index 379e27d9..b063f5fd 100644
--- a/docs/api/freemarker/core/NonMarkupOutputException.html
+++ b/docs/api/freemarker/core/NonMarkupOutputException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>NonMarkupOutputException (FreeMarker 2.3.34 API)</title>
+<title>NonMarkupOutputException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: NonMarkupOutputException">
diff --git a/docs/api/freemarker/core/NonMethodException.html b/docs/api/freemarker/core/NonMethodException.html
index 2faaef26..d1da8e53 100644
--- a/docs/api/freemarker/core/NonMethodException.html
+++ b/docs/api/freemarker/core/NonMethodException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>NonMethodException (FreeMarker 2.3.34 API)</title>
+<title>NonMethodException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: NonMethodException">
diff --git a/docs/api/freemarker/core/NonNodeException.html b/docs/api/freemarker/core/NonNodeException.html
index 9fbd9265..e2f609a7 100644
--- a/docs/api/freemarker/core/NonNodeException.html
+++ b/docs/api/freemarker/core/NonNodeException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>NonNodeException (FreeMarker 2.3.34 API)</title>
+<title>NonNodeException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: NonNodeException">
diff --git a/docs/api/freemarker/core/NonNumericalException.html b/docs/api/freemarker/core/NonNumericalException.html
index ca16c801..328ebf48 100644
--- a/docs/api/freemarker/core/NonNumericalException.html
+++ b/docs/api/freemarker/core/NonNumericalException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>NonNumericalException (FreeMarker 2.3.34 API)</title>
+<title>NonNumericalException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: NonNumericalException">
diff --git a/docs/api/freemarker/core/NonSequenceException.html b/docs/api/freemarker/core/NonSequenceException.html
index 3b76239c..570f4076 100644
--- a/docs/api/freemarker/core/NonSequenceException.html
+++ b/docs/api/freemarker/core/NonSequenceException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>NonSequenceException (FreeMarker 2.3.34 API)</title>
+<title>NonSequenceException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: NonSequenceException">
diff --git a/docs/api/freemarker/core/NonSequenceOrCollectionException.html b/docs/api/freemarker/core/NonSequenceOrCollectionException.html
index 4688441f..422f9bbf 100644
--- a/docs/api/freemarker/core/NonSequenceOrCollectionException.html
+++ b/docs/api/freemarker/core/NonSequenceOrCollectionException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>NonSequenceOrCollectionException (FreeMarker 2.3.34 API)</title>
+<title>NonSequenceOrCollectionException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: NonSequenceOrCollectionException">
diff --git a/docs/api/freemarker/core/NonStringException.html b/docs/api/freemarker/core/NonStringException.html
index acb2c857..e831eedf 100644
--- a/docs/api/freemarker/core/NonStringException.html
+++ b/docs/api/freemarker/core/NonStringException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>NonStringException (FreeMarker 2.3.34 API)</title>
+<title>NonStringException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: NonStringException">
diff --git a/docs/api/freemarker/core/NonStringOrTemplateOutputException.html b/docs/api/freemarker/core/NonStringOrTemplateOutputException.html
index f53e298c..1452cf92 100644
--- a/docs/api/freemarker/core/NonStringOrTemplateOutputException.html
+++ b/docs/api/freemarker/core/NonStringOrTemplateOutputException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>NonStringOrTemplateOutputException (FreeMarker 2.3.34 API)</title>
+<title>NonStringOrTemplateOutputException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: NonStringOrTemplateOutputException">
diff --git a/docs/api/freemarker/core/OptInTemplateClassResolver.html b/docs/api/freemarker/core/OptInTemplateClassResolver.html
index bcf1ed36..3e33e0c8 100644
--- a/docs/api/freemarker/core/OptInTemplateClassResolver.html
+++ b/docs/api/freemarker/core/OptInTemplateClassResolver.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>OptInTemplateClassResolver (FreeMarker 2.3.34 API)</title>
+<title>OptInTemplateClassResolver (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: OptInTemplateClassResolver">
@@ -86,8 +86,7 @@ loadScripts(document, 'script');</script>
 <div class="type-signature"><span class="modifiers">public class </span><span class="element-name type-name-label">OptInTemplateClassResolver</span>
 <span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>
 implements <a href="TemplateClassResolver.html" title="interface in freemarker.core">TemplateClassResolver</a></span></div>
-<div class="block">A <a href="TemplateClassResolver.html" title="interface in freemarker.core"><code>TemplateClassResolver</code></a> that resolves only the classes whose name 
- was specified in the constructor.</div>
+<div class="block">A <a href="TemplateClassResolver.html" title="interface in freemarker.core"><code>TemplateClassResolver</code></a> that resolves only the classes whose name was specified in the constructor.</div>
 </section>
 <section class="summary">
 <ul class="summary-list">
@@ -137,8 +136,8 @@ implements <a href="TemplateClassResolver.html" title="interface in freemarker.c
 <div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>protected <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
 <div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#safeGetTemplateName(freemarker.template.Template)">safeGetTemplateName</a></span>&#8203;(<a href="../template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template)</code></div>
 <div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
-<div class="block">Extract the template name from the template object which will be matched
- against the trusted template names and pattern.</div>
+<div class="block">Extract the template name from the template object which will be matched against the trusted template names and
+ pattern.</div>
 </div>
 </div>
 </div>
@@ -165,26 +164,22 @@ implements <a href="TemplateClassResolver.html" title="interface in freemarker.c
 <div class="block">Creates a new instance.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
-<dd><code>allowedClasses</code> - the <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/Set.html" title="class or interface in java.util" class="external-link"><code>Set</code></a> of <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link"><code>String</code></a>-s that contains
-     the full-qualified names of the allowed classes.
-     Can be <code>null</code> (means not class is allowed).</dd>
-<dd><code>trustedTemplates</code> - the <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link"><code>List</code></a> of <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link"><code>String</code></a>-s that contains
-     template names (i.e., template root directory relative paths)
-     and prefix patterns (like <code>"include/*"</code>) of templates
-     for which <a href="TemplateClassResolver.html#SAFER_RESOLVER"><code>TemplateClassResolver.SAFER_RESOLVER</code></a> will be 
-     used (which is not as safe as <a href="OptInTemplateClassResolver.html" title="class in freemarker.core"><code>OptInTemplateClassResolver</code></a>).
-     The list items need not start with <code>"/"</code> (if they are, it
-     will be removed). List items ending with <code>"*"</code> are treated
-     as prefixes (i.e. <code>"foo*"</code> matches <code>"foobar"</code>,
-     <code>"foo/bar/baaz"</code>, <code>"foowhatever/bar/baaz"</code>,
-     etc.). The <code>"*"</code> has no special meaning anywhere else.
-     The matched template name is the name (template root directory
-     relative path) of the template that directly (lexically) contains the
-     operation (like <code>?new</code>) that wants to get the class. Thus,
-     if a trusted template includes a non-trusted template, the
-     <code>allowedClasses</code> restriction will apply in the included
-     template.
-     This parameter can be <code>null</code> (means no trusted templates).</dd>
+<dd><code>allowedClasses</code> - the <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/Set.html" title="class or interface in java.util" class="external-link"><code>Set</code></a> of <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link"><code>String</code></a>-s that contains the full-qualified names of the allowed classes. Can
+         be
+         <code>null</code> (means not class is allowed).</dd>
+<dd><code>trustedTemplates</code> - the <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link"><code>List</code></a> of <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link"><code>String</code></a>-s that contains template names (i.e., template root directory relative
+         paths) and prefix patterns (like <code>"include/*"</code>) of templates for which
+         <a href="TemplateClassResolver.html#SAFER_RESOLVER"><code>TemplateClassResolver.SAFER_RESOLVER</code></a> will be used (which is not as safe as
+         <a href="OptInTemplateClassResolver.html" title="class in freemarker.core"><code>OptInTemplateClassResolver</code></a>). The list items need not start with <code>"/"</code> (if they are, it
+         will be removed). List items ending with <code>"*"</code> are treated as prefixes (i.e.
+         <code>"foo*"</code> matches <code>"foobar"</code>,
+         <code>"foo/bar/baaz"</code>, <code>"foowhatever/bar/baaz"</code>,
+         etc.). The <code>"*"</code> has no special meaning anywhere else. The matched template name is the name
+         (template root directory relative path) of the template that directly (lexically) contains the operation
+         (like <code>?new</code>) that wants to get the class. Thus, if a trusted template includes a non-trusted
+         template, the
+         <code>allowedClasses</code> restriction will apply in the included
+         template. This parameter can be <code>null</code> (means no trusted templates).</dd>
 </dl>
 </section>
 </li>
@@ -224,8 +219,8 @@ implements <a href="TemplateClassResolver.html" title="interface in freemarker.c
 <section class="detail" id="safeGetTemplateName(freemarker.template.Template)">
 <h3>safeGetTemplateName</h3>
 <div class="member-signature"><span class="modifiers">protected</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name">safeGetTemplateName</span>&#8203;<span class="parameters">(<a href="../template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template)</span></div>
-<div class="block">Extract the template name from the template object which will be matched
- against the trusted template names and pattern.</div>
+<div class="block">Extract the template name from the template object which will be matched against the trusted template names and
+ pattern.</div>
 </section>
 </li>
 </ul>
diff --git a/docs/api/freemarker/core/OutputFormat.html b/docs/api/freemarker/core/OutputFormat.html
index c693def8..3b09150c 100644
--- a/docs/api/freemarker/core/OutputFormat.html
+++ b/docs/api/freemarker/core/OutputFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>OutputFormat (FreeMarker 2.3.34 API)</title>
+<title>OutputFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: OutputFormat">
diff --git a/docs/api/freemarker/core/ParseException.html b/docs/api/freemarker/core/ParseException.html
index 6eb3f87e..1cba1f92 100644
--- a/docs/api/freemarker/core/ParseException.html
+++ b/docs/api/freemarker/core/ParseException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>ParseException (FreeMarker 2.3.34 API)</title>
+<title>ParseException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: ParseException">
@@ -386,261 +386,264 @@ loadScripts(document, 'script');</script>
 <div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#HASH_INTERPOLATION_OPENING">HASH_INTERPOLATION_OPENING</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#ID">ID</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#HEX_INTEGER">HEX_INTEGER</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#ID_START_CHAR">ID_START_CHAR</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#ID">ID</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#IF">IF</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#ID_START_CHAR">ID_START_CHAR</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#IMPORT">IMPORT</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#IF">IF</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#IN">IN</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#IMPORT">IMPORT</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#IN_PAREN">IN_PAREN</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#IN">IN</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#INTEGER">INTEGER</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#IN_PAREN">IN_PAREN</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#ITEMS">ITEMS</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#INTEGER">INTEGER</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#KEEP_GOING">KEEP_GOING</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#ITEMS">ITEMS</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#LAMBDA_ARROW">LAMBDA_ARROW</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#KEEP_GOING">KEEP_GOING</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#LESS_THAN">LESS_THAN</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#LAMBDA_ARROW">LAMBDA_ARROW</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#LESS_THAN_EQUALS">LESS_THAN_EQUALS</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#LESS_THAN">LESS_THAN</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><code>int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#lineNumber">lineNumber</a></span></code></div>
+<div class="col-first even-row-color"><code>static int</code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#LESS_THAN_EQUALS">LESS_THAN_EQUALS</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
-<div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#LIST">LIST</a></span></code></div>
+<div class="col-first odd-row-color"><code>int</code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#lineNumber">lineNumber</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#LOCALASSIGN">LOCALASSIGN</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#LIST">LIST</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#LONE_LESS_THAN_OR_DASH">LONE_LESS_THAN_OR_DASH</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#LOCALASSIGN">LOCALASSIGN</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#LTRIM">LTRIM</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#LONE_LESS_THAN_OR_DASH">LONE_LESS_THAN_OR_DASH</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#MACRO">MACRO</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#LTRIM">LTRIM</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#MAYBE_END">MAYBE_END</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#MACRO">MACRO</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#MINUS">MINUS</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#MAYBE_END">MAYBE_END</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#MINUS_EQUALS">MINUS_EQUALS</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#MINUS">MINUS</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#MINUS_MINUS">MINUS_MINUS</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#MINUS_EQUALS">MINUS_EQUALS</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#MOD_EQUALS">MOD_EQUALS</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#MINUS_MINUS">MINUS_MINUS</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#NAMED_PARAMETER_EXPRESSION">NAMED_PARAMETER_EXPRESSION</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#MOD_EQUALS">MOD_EQUALS</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#NATURAL_GT">NATURAL_GT</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#NAMED_PARAMETER_EXPRESSION">NAMED_PARAMETER_EXPRESSION</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#NATURAL_GTE">NATURAL_GTE</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#NATURAL_GT">NATURAL_GT</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#NESTED">NESTED</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#NATURAL_GTE">NATURAL_GTE</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#NO_DIRECTIVE">NO_DIRECTIVE</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#NESTED">NESTED</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#NO_PARSE">NO_PARSE</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#NO_DIRECTIVE">NO_DIRECTIVE</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#NO_SPACE_EXPRESSION">NO_SPACE_EXPRESSION</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#NO_PARSE">NO_PARSE</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#NOAUTOESC">NOAUTOESC</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#NO_SPACE_EXPRESSION">NO_SPACE_EXPRESSION</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#NOESCAPE">NOESCAPE</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#NOAUTOESC">NOAUTOESC</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#NON_ESCAPED_ID_START_CHAR">NON_ESCAPED_ID_START_CHAR</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#NOESCAPE">NOESCAPE</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#NOPARSE">NOPARSE</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#NON_ESCAPED_ID_START_CHAR">NON_ESCAPED_ID_START_CHAR</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#NOT_EQUALS">NOT_EQUALS</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#NOPARSE">NOPARSE</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#NOTRIM">NOTRIM</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#NOT_EQUALS">NOT_EQUALS</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#ON">ON</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#NOTRIM">NOTRIM</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#OPEN_BRACKET">OPEN_BRACKET</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#ON">ON</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#OPEN_MISPLACED_INTERPOLATION">OPEN_MISPLACED_INTERPOLATION</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#OPEN_BRACKET">OPEN_BRACKET</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#OPEN_PAREN">OPEN_PAREN</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#OPEN_MISPLACED_INTERPOLATION">OPEN_MISPLACED_INTERPOLATION</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#OPENING_CURLY_BRACKET">OPENING_CURLY_BRACKET</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#OPEN_PAREN">OPEN_PAREN</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#OR">OR</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#OPENING_CURLY_BRACKET">OPENING_CURLY_BRACKET</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#OUTPUTFORMAT">OUTPUTFORMAT</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#OR">OR</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#PERCENT">PERCENT</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#OUTPUTFORMAT">OUTPUTFORMAT</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#PLUS">PLUS</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#PERCENT">PERCENT</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#PLUS_EQUALS">PLUS_EQUALS</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#PLUS">PLUS</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#PLUS_PLUS">PLUS_PLUS</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#PLUS_EQUALS">PLUS_EQUALS</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#RAW_STRING">RAW_STRING</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#PLUS_PLUS">PLUS_PLUS</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#RECOVER">RECOVER</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#RAW_STRING">RAW_STRING</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#RECURSE">RECURSE</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#RECOVER">RECOVER</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#RETURN">RETURN</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#RECURSE">RECURSE</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#RTRIM">RTRIM</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#RETURN">RETURN</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#SEMICOLON">SEMICOLON</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#RTRIM">RTRIM</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#SEP">SEP</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#SEMICOLON">SEMICOLON</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#SETTING">SETTING</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#SEP">SEP</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#SIMPLE_NESTED">SIMPLE_NESTED</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#SETTING">SETTING</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#SIMPLE_RECURSE">SIMPLE_RECURSE</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#SIMPLE_NESTED">SIMPLE_NESTED</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#SIMPLE_RETURN">SIMPLE_RETURN</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#SIMPLE_RECURSE">SIMPLE_RECURSE</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><code>protected boolean</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#specialConstructor">specialConstructor</a></span></code></div>
-<div class="col-last even-row-color">
+<div class="col-first even-row-color"><code>static int</code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#SIMPLE_RETURN">SIMPLE_RETURN</a></span></code></div>
+<div class="col-last even-row-color">&nbsp;</div>
+<div class="col-first odd-row-color"><code>protected boolean</code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#specialConstructor">specialConstructor</a></span></code></div>
+<div class="col-last odd-row-color">
 <div class="block"><span class="deprecated-label">Deprecated.</span>
 <div class="deprecation-comment">Will be remove without replacement in 2.4.</div>
 </div>
 </div>
-<div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#SQUARE_BRACKET_INTERPOLATION_OPENING">SQUARE_BRACKET_INTERPOLATION_OPENING</a></span></code></div>
-<div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#START_TAG">START_TAG</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#SQUARE_BRACKET_INTERPOLATION_OPENING">SQUARE_BRACKET_INTERPOLATION_OPENING</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#STATIC_TEXT_FALSE_ALARM">STATIC_TEXT_FALSE_ALARM</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#START_TAG">START_TAG</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#STATIC_TEXT_NON_WS">STATIC_TEXT_NON_WS</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#STATIC_TEXT_FALSE_ALARM">STATIC_TEXT_FALSE_ALARM</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#STATIC_TEXT_WS">STATIC_TEXT_WS</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#STATIC_TEXT_NON_WS">STATIC_TEXT_NON_WS</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#STOP">STOP</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#STATIC_TEXT_WS">STATIC_TEXT_WS</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#STRING_LITERAL">STRING_LITERAL</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#STOP">STOP</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#SWITCH">SWITCH</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#STRING_LITERAL">STRING_LITERAL</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#TERMINATING_EXCLAM">TERMINATING_EXCLAM</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#SWITCH">SWITCH</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#TERMINATING_WHITESPACE">TERMINATING_WHITESPACE</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#TERMINATING_EXCLAM">TERMINATING_EXCLAM</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#TERSE_COMMENT">TERSE_COMMENT</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#TERMINATING_WHITESPACE">TERMINATING_WHITESPACE</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#TERSE_COMMENT_END">TERSE_COMMENT_END</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#TERSE_COMMENT">TERSE_COMMENT</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#TIMES">TIMES</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#TERSE_COMMENT_END">TERSE_COMMENT_END</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#TIMES_EQUALS">TIMES_EQUALS</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#TIMES">TIMES</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
-<div class="col-first odd-row-color"><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>[]</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#tokenImage">tokenImage</a></span></code></div>
-<div class="col-last odd-row-color">
+<div class="col-first odd-row-color"><code>static int</code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#TIMES_EQUALS">TIMES_EQUALS</a></span></code></div>
+<div class="col-last odd-row-color">&nbsp;</div>
+<div class="col-first even-row-color"><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>[]</code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#tokenImage">tokenImage</a></span></code></div>
+<div class="col-last even-row-color">
 <div class="block">This is a reference to the "tokenImage" array of the generated
  parser within which the parse error occurred.</div>
 </div>
-<div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#TRANSFORM">TRANSFORM</a></span></code></div>
-<div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#TRIM">TRIM</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#TRANSFORM">TRANSFORM</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#TRIVIAL_FTL_HEADER">TRIVIAL_FTL_HEADER</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#TRIM">TRIM</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#TRUE">TRUE</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#TRIVIAL_FTL_HEADER">TRIVIAL_FTL_HEADER</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#UNIFIED_CALL">UNIFIED_CALL</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#TRUE">TRUE</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#UNIFIED_CALL_END">UNIFIED_CALL_END</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#UNIFIED_CALL">UNIFIED_CALL</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#UNKNOWN_DIRECTIVE">UNKNOWN_DIRECTIVE</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#UNIFIED_CALL_END">UNIFIED_CALL_END</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#USING">USING</a></span></code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#UNKNOWN_DIRECTIVE">UNKNOWN_DIRECTIVE</a></span></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#VISIT">VISIT</a></span></code></div>
+<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#USING">USING</a></span></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
+<div class="col-first odd-row-color"><code>static int</code></div>
+<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#VISIT">VISIT</a></span></code></div>
+<div class="col-last odd-row-color">&nbsp;</div>
 </div>
 </section>
 </li>
@@ -1818,6 +1821,16 @@ loadScripts(document, 'script');</script>
 </section>
 </li>
 <li>
+<section class="detail" id="HEX_INTEGER">
+<h3>HEX_INTEGER</h3>
+<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">HEX_INTEGER</span></div>
+<dl class="notes">
+<dt>See Also:</dt>
+<dd><a href="../../constant-values.html#freemarker.core.ParseException.HEX_INTEGER">Constant Field Values</a></dd>
+</dl>
+</section>
+</li>
+<li>
 <section class="detail" id="DOT">
 <h3>DOT</h3>
 <div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">DOT</span></div>
diff --git a/docs/api/freemarker/core/ParserConfiguration.html b/docs/api/freemarker/core/ParserConfiguration.html
index f89f9647..e647dd30 100644
--- a/docs/api/freemarker/core/ParserConfiguration.html
+++ b/docs/api/freemarker/core/ParserConfiguration.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>ParserConfiguration (FreeMarker 2.3.34 API)</title>
+<title>ParserConfiguration (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, interface: ParserConfiguration">
diff --git a/docs/api/freemarker/core/ParsingNotSupportedException.html b/docs/api/freemarker/core/ParsingNotSupportedException.html
index 100eab12..2dbe0fb4 100644
--- a/docs/api/freemarker/core/ParsingNotSupportedException.html
+++ b/docs/api/freemarker/core/ParsingNotSupportedException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>ParsingNotSupportedException (FreeMarker 2.3.34 API)</title>
+<title>ParsingNotSupportedException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: ParsingNotSupportedException">
diff --git a/docs/api/freemarker/core/PlainTextOutputFormat.html b/docs/api/freemarker/core/PlainTextOutputFormat.html
index a92b07cc..f51185af 100644
--- a/docs/api/freemarker/core/PlainTextOutputFormat.html
+++ b/docs/api/freemarker/core/PlainTextOutputFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>PlainTextOutputFormat (FreeMarker 2.3.34 API)</title>
+<title>PlainTextOutputFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: PlainTextOutputFormat">
diff --git a/docs/api/freemarker/core/RTFOutputFormat.html b/docs/api/freemarker/core/RTFOutputFormat.html
index 6570a235..4fec020c 100644
--- a/docs/api/freemarker/core/RTFOutputFormat.html
+++ b/docs/api/freemarker/core/RTFOutputFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>RTFOutputFormat (FreeMarker 2.3.34 API)</title>
+<title>RTFOutputFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: RTFOutputFormat">
diff --git a/docs/api/freemarker/core/StopException.html b/docs/api/freemarker/core/StopException.html
index aca570e3..5461054e 100644
--- a/docs/api/freemarker/core/StopException.html
+++ b/docs/api/freemarker/core/StopException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>StopException (FreeMarker 2.3.34 API)</title>
+<title>StopException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: StopException">
diff --git a/docs/api/freemarker/core/TemplateClassResolver.html b/docs/api/freemarker/core/TemplateClassResolver.html
index 6249183c..e87cc4f5 100644
--- a/docs/api/freemarker/core/TemplateClassResolver.html
+++ b/docs/api/freemarker/core/TemplateClassResolver.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateClassResolver (FreeMarker 2.3.34 API)</title>
+<title>TemplateClassResolver (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, interface: TemplateClassResolver">
diff --git a/docs/api/freemarker/core/TemplateCombinedMarkupOutputModel.html b/docs/api/freemarker/core/TemplateCombinedMarkupOutputModel.html
index 0f72bd03..f96060c6 100644
--- a/docs/api/freemarker/core/TemplateCombinedMarkupOutputModel.html
+++ b/docs/api/freemarker/core/TemplateCombinedMarkupOutputModel.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateCombinedMarkupOutputModel (FreeMarker 2.3.34 API)</title>
+<title>TemplateCombinedMarkupOutputModel (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: TemplateCombinedMarkupOutputModel">
diff --git a/docs/api/freemarker/core/TemplateConfiguration.html b/docs/api/freemarker/core/TemplateConfiguration.html
index 2fb3364d..8d2d2c95 100644
--- a/docs/api/freemarker/core/TemplateConfiguration.html
+++ b/docs/api/freemarker/core/TemplateConfiguration.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateConfiguration (FreeMarker 2.3.34 API)</title>
+<title>TemplateConfiguration (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: TemplateConfiguration">
diff --git a/docs/api/freemarker/core/TemplateDateFormat.html b/docs/api/freemarker/core/TemplateDateFormat.html
index 019aad33..57c502bf 100644
--- a/docs/api/freemarker/core/TemplateDateFormat.html
+++ b/docs/api/freemarker/core/TemplateDateFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateDateFormat (FreeMarker 2.3.34 API)</title>
+<title>TemplateDateFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: TemplateDateFormat">
diff --git a/docs/api/freemarker/core/TemplateDateFormatFactory.html b/docs/api/freemarker/core/TemplateDateFormatFactory.html
index 535ff9a3..922a85e0 100644
--- a/docs/api/freemarker/core/TemplateDateFormatFactory.html
+++ b/docs/api/freemarker/core/TemplateDateFormatFactory.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateDateFormatFactory (FreeMarker 2.3.34 API)</title>
+<title>TemplateDateFormatFactory (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: TemplateDateFormatFactory">
diff --git a/docs/api/freemarker/core/TemplateFormatUtil.html b/docs/api/freemarker/core/TemplateFormatUtil.html
index c2731284..aeb291a7 100644
--- a/docs/api/freemarker/core/TemplateFormatUtil.html
+++ b/docs/api/freemarker/core/TemplateFormatUtil.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateFormatUtil (FreeMarker 2.3.34 API)</title>
+<title>TemplateFormatUtil (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: TemplateFormatUtil">
diff --git a/docs/api/freemarker/core/TemplateHTMLOutputModel.html b/docs/api/freemarker/core/TemplateHTMLOutputModel.html
index 4768c17c..0720c2e9 100644
--- a/docs/api/freemarker/core/TemplateHTMLOutputModel.html
+++ b/docs/api/freemarker/core/TemplateHTMLOutputModel.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateHTMLOutputModel (FreeMarker 2.3.34 API)</title>
+<title>TemplateHTMLOutputModel (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: TemplateHTMLOutputModel">
diff --git a/docs/api/freemarker/core/TemplateMarkupOutputModel.html b/docs/api/freemarker/core/TemplateMarkupOutputModel.html
index 29ce4d73..74469385 100644
--- a/docs/api/freemarker/core/TemplateMarkupOutputModel.html
+++ b/docs/api/freemarker/core/TemplateMarkupOutputModel.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateMarkupOutputModel (FreeMarker 2.3.34 API)</title>
+<title>TemplateMarkupOutputModel (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, interface: TemplateMarkupOutputModel">
diff --git a/docs/api/freemarker/core/TemplateNumberFormat.html b/docs/api/freemarker/core/TemplateNumberFormat.html
index 2080f40b..6875d32f 100644
--- a/docs/api/freemarker/core/TemplateNumberFormat.html
+++ b/docs/api/freemarker/core/TemplateNumberFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateNumberFormat (FreeMarker 2.3.34 API)</title>
+<title>TemplateNumberFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: TemplateNumberFormat">
diff --git a/docs/api/freemarker/core/TemplateNumberFormatFactory.html b/docs/api/freemarker/core/TemplateNumberFormatFactory.html
index f580ba6b..d7845471 100644
--- a/docs/api/freemarker/core/TemplateNumberFormatFactory.html
+++ b/docs/api/freemarker/core/TemplateNumberFormatFactory.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateNumberFormatFactory (FreeMarker 2.3.34 API)</title>
+<title>TemplateNumberFormatFactory (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: TemplateNumberFormatFactory">
diff --git a/docs/api/freemarker/core/TemplateProcessingTracer.TracedElement.html b/docs/api/freemarker/core/TemplateProcessingTracer.TracedElement.html
index ec7cce10..84b522a9 100644
--- a/docs/api/freemarker/core/TemplateProcessingTracer.TracedElement.html
+++ b/docs/api/freemarker/core/TemplateProcessingTracer.TracedElement.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateProcessingTracer.TracedElement (FreeMarker 2.3.34 API)</title>
+<title>TemplateProcessingTracer.TracedElement (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, interface: TemplateProcessingTracer, interface: TracedElement">
diff --git a/docs/api/freemarker/core/TemplateProcessingTracer.html b/docs/api/freemarker/core/TemplateProcessingTracer.html
index e11b4e19..79ff1fa6 100644
--- a/docs/api/freemarker/core/TemplateProcessingTracer.html
+++ b/docs/api/freemarker/core/TemplateProcessingTracer.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateProcessingTracer (FreeMarker 2.3.34 API)</title>
+<title>TemplateProcessingTracer (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, interface: TemplateProcessingTracer">
diff --git a/docs/api/freemarker/core/TemplateRTFOutputModel.html b/docs/api/freemarker/core/TemplateRTFOutputModel.html
index f414b87a..424661d0 100644
--- a/docs/api/freemarker/core/TemplateRTFOutputModel.html
+++ b/docs/api/freemarker/core/TemplateRTFOutputModel.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateRTFOutputModel (FreeMarker 2.3.34 API)</title>
+<title>TemplateRTFOutputModel (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: TemplateRTFOutputModel">
diff --git a/docs/api/freemarker/core/TemplateValueFormat.html b/docs/api/freemarker/core/TemplateValueFormat.html
index 71eae4dd..e0bc22dd 100644
--- a/docs/api/freemarker/core/TemplateValueFormat.html
+++ b/docs/api/freemarker/core/TemplateValueFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateValueFormat (FreeMarker 2.3.34 API)</title>
+<title>TemplateValueFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: TemplateValueFormat">
diff --git a/docs/api/freemarker/core/TemplateValueFormatException.html b/docs/api/freemarker/core/TemplateValueFormatException.html
index 3ac4fb05..8ad7d642 100644
--- a/docs/api/freemarker/core/TemplateValueFormatException.html
+++ b/docs/api/freemarker/core/TemplateValueFormatException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateValueFormatException (FreeMarker 2.3.34 API)</title>
+<title>TemplateValueFormatException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: TemplateValueFormatException">
diff --git a/docs/api/freemarker/core/TemplateValueFormatFactory.html b/docs/api/freemarker/core/TemplateValueFormatFactory.html
index 15442ad6..5439edb9 100644
--- a/docs/api/freemarker/core/TemplateValueFormatFactory.html
+++ b/docs/api/freemarker/core/TemplateValueFormatFactory.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateValueFormatFactory (FreeMarker 2.3.34 API)</title>
+<title>TemplateValueFormatFactory (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: TemplateValueFormatFactory">
diff --git a/docs/api/freemarker/core/TemplateXHTMLOutputModel.html b/docs/api/freemarker/core/TemplateXHTMLOutputModel.html
index b5275e2e..2d86fee0 100644
--- a/docs/api/freemarker/core/TemplateXHTMLOutputModel.html
+++ b/docs/api/freemarker/core/TemplateXHTMLOutputModel.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateXHTMLOutputModel (FreeMarker 2.3.34 API)</title>
+<title>TemplateXHTMLOutputModel (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: TemplateXHTMLOutputModel">
diff --git a/docs/api/freemarker/core/TemplateXMLOutputModel.html b/docs/api/freemarker/core/TemplateXMLOutputModel.html
index db60bd20..30033da8 100644
--- a/docs/api/freemarker/core/TemplateXMLOutputModel.html
+++ b/docs/api/freemarker/core/TemplateXMLOutputModel.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TemplateXMLOutputModel (FreeMarker 2.3.34 API)</title>
+<title>TemplateXMLOutputModel (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: TemplateXMLOutputModel">
diff --git a/docs/api/freemarker/core/TruncateBuiltinAlgorithm.html b/docs/api/freemarker/core/TruncateBuiltinAlgorithm.html
index 32a98560..b6cf8f5e 100644
--- a/docs/api/freemarker/core/TruncateBuiltinAlgorithm.html
+++ b/docs/api/freemarker/core/TruncateBuiltinAlgorithm.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>TruncateBuiltinAlgorithm (FreeMarker 2.3.34 API)</title>
+<title>TruncateBuiltinAlgorithm (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: TruncateBuiltinAlgorithm">
diff --git a/docs/api/freemarker/core/UndefinedCustomFormatException.html b/docs/api/freemarker/core/UndefinedCustomFormatException.html
index 17b099bc..e9f1f7c7 100644
--- a/docs/api/freemarker/core/UndefinedCustomFormatException.html
+++ b/docs/api/freemarker/core/UndefinedCustomFormatException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>UndefinedCustomFormatException (FreeMarker 2.3.34 API)</title>
+<title>UndefinedCustomFormatException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: UndefinedCustomFormatException">
diff --git a/docs/api/freemarker/core/UndefinedOutputFormat.html b/docs/api/freemarker/core/UndefinedOutputFormat.html
index 83dff7a5..d34e0fb2 100644
--- a/docs/api/freemarker/core/UndefinedOutputFormat.html
+++ b/docs/api/freemarker/core/UndefinedOutputFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>UndefinedOutputFormat (FreeMarker 2.3.34 API)</title>
+<title>UndefinedOutputFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: UndefinedOutputFormat">
diff --git a/docs/api/freemarker/core/UnexpectedTypeException.html b/docs/api/freemarker/core/UnexpectedTypeException.html
index 1e4e28c6..c3ac4665 100644
--- a/docs/api/freemarker/core/UnexpectedTypeException.html
+++ b/docs/api/freemarker/core/UnexpectedTypeException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>UnexpectedTypeException (FreeMarker 2.3.34 API)</title>
+<title>UnexpectedTypeException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: UnexpectedTypeException">
diff --git a/docs/api/freemarker/core/UnformattableValueException.html b/docs/api/freemarker/core/UnformattableValueException.html
index cc9dbae6..4857b38d 100644
--- a/docs/api/freemarker/core/UnformattableValueException.html
+++ b/docs/api/freemarker/core/UnformattableValueException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>UnformattableValueException (FreeMarker 2.3.34 API)</title>
+<title>UnformattableValueException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: UnformattableValueException">
diff --git a/docs/api/freemarker/core/UnknownDateTypeFormattingUnsupportedException.html b/docs/api/freemarker/core/UnknownDateTypeFormattingUnsupportedException.html
index 9f6c2146..8cd7b77c 100644
--- a/docs/api/freemarker/core/UnknownDateTypeFormattingUnsupportedException.html
+++ b/docs/api/freemarker/core/UnknownDateTypeFormattingUnsupportedException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>UnknownDateTypeFormattingUnsupportedException (FreeMarker 2.3.34 API)</title>
+<title>UnknownDateTypeFormattingUnsupportedException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: UnknownDateTypeFormattingUnsupportedException">
diff --git a/docs/api/freemarker/core/UnknownDateTypeParsingUnsupportedException.html b/docs/api/freemarker/core/UnknownDateTypeParsingUnsupportedException.html
index 5c927785..3cda5a18 100644
--- a/docs/api/freemarker/core/UnknownDateTypeParsingUnsupportedException.html
+++ b/docs/api/freemarker/core/UnknownDateTypeParsingUnsupportedException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>UnknownDateTypeParsingUnsupportedException (FreeMarker 2.3.34 API)</title>
+<title>UnknownDateTypeParsingUnsupportedException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: UnknownDateTypeParsingUnsupportedException">
diff --git a/docs/api/freemarker/core/UnparsableValueException.html b/docs/api/freemarker/core/UnparsableValueException.html
index a194473f..78dd6aba 100644
--- a/docs/api/freemarker/core/UnparsableValueException.html
+++ b/docs/api/freemarker/core/UnparsableValueException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>UnparsableValueException (FreeMarker 2.3.34 API)</title>
+<title>UnparsableValueException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: UnparsableValueException">
diff --git a/docs/api/freemarker/core/UnregisteredOutputFormatException.html b/docs/api/freemarker/core/UnregisteredOutputFormatException.html
index 0e562cf7..c4ce3aa0 100644
--- a/docs/api/freemarker/core/UnregisteredOutputFormatException.html
+++ b/docs/api/freemarker/core/UnregisteredOutputFormatException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>UnregisteredOutputFormatException (FreeMarker 2.3.34 API)</title>
+<title>UnregisteredOutputFormatException (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: UnregisteredOutputFormatException">
diff --git a/docs/api/freemarker/core/XHTMLOutputFormat.html b/docs/api/freemarker/core/XHTMLOutputFormat.html
index bfee1ca9..87a15cbd 100644
--- a/docs/api/freemarker/core/XHTMLOutputFormat.html
+++ b/docs/api/freemarker/core/XHTMLOutputFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>XHTMLOutputFormat (FreeMarker 2.3.34 API)</title>
+<title>XHTMLOutputFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: XHTMLOutputFormat">
diff --git a/docs/api/freemarker/core/XMLOutputFormat.html b/docs/api/freemarker/core/XMLOutputFormat.html
index 5df0f692..b334e3d9 100644
--- a/docs/api/freemarker/core/XMLOutputFormat.html
+++ b/docs/api/freemarker/core/XMLOutputFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>XMLOutputFormat (FreeMarker 2.3.34 API)</title>
+<title>XMLOutputFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: XMLOutputFormat">
diff --git a/docs/api/freemarker/core/XSCFormat.html b/docs/api/freemarker/core/XSCFormat.html
index 05019178..cdf9ff1a 100644
--- a/docs/api/freemarker/core/XSCFormat.html
+++ b/docs/api/freemarker/core/XSCFormat.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>XSCFormat (FreeMarker 2.3.34 API)</title>
+<title>XSCFormat (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core, class: XSCFormat">
diff --git a/docs/api/freemarker/core/package-summary.html b/docs/api/freemarker/core/package-summary.html
index 75e40a6c..e4368542 100644
--- a/docs/api/freemarker/core/package-summary.html
+++ b/docs/api/freemarker/core/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>freemarker.core (FreeMarker 2.3.34 API)</title>
+<title>freemarker.core (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: freemarker.core">
@@ -140,176 +140,171 @@ loadScripts(document, 'script');</script>
 <div class="col-last even-row-color">
 <div class="block">Represents two markup formats nested into each other.</div>
 </div>
-<div class="col-first odd-row-color"><a href="CommandLine.html" title="class in freemarker.core">CommandLine</a></div>
-<div class="col-last odd-row-color">Deprecated.
-<div class="deprecation-comment">Will be removed (main method in a library, often classified as CWE-489 "Leftover Debug Code").</div>
-</div>
-<div class="col-first even-row-color"><a href="CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;MO extends <a href="CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&gt;</div>
-<div class="col-last even-row-color">
+<div class="col-first odd-row-color"><a href="CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;MO extends <a href="CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&gt;</div>
+<div class="col-last odd-row-color">
 <div class="block">Common superclass for implementing <a href="MarkupOutputFormat.html" title="class in freemarker.core"><code>MarkupOutputFormat</code></a>-s that use a <a href="CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a>
  subclass.</div>
 </div>
-<div class="col-first odd-row-color"><a href="CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;MO extends <a href="CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;MO&gt;&gt;</div>
-<div class="col-last odd-row-color">
+<div class="col-first even-row-color"><a href="CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;MO extends <a href="CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;MO&gt;&gt;</div>
+<div class="col-last even-row-color">
 <div class="block">Common superclass for implementing <a href="TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s that belong to a
  <a href="CommonMarkupOutputFormat.html" title="class in freemarker.core"><code>CommonMarkupOutputFormat</code></a> subclass format.</div>
 </div>
-<div class="col-first even-row-color"><a href="Configurable.html" title="class in freemarker.core">Configurable</a></div>
-<div class="col-last even-row-color">
+<div class="col-first odd-row-color"><a href="Configurable.html" title="class in freemarker.core">Configurable</a></div>
+<div class="col-last odd-row-color">
 <div class="block">This is a common superclass of <a href="../template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>,
  <a href="../template/Template.html" title="class in freemarker.template"><code>Template</code></a>, and <a href="Environment.html" title="class in freemarker.core"><code>Environment</code></a> classes.</div>
 </div>
-<div class="col-first odd-row-color"><a href="CSSOutputFormat.html" title="class in freemarker.core">CSSOutputFormat</a></div>
-<div class="col-last odd-row-color">
+<div class="col-first even-row-color"><a href="CSSOutputFormat.html" title="class in freemarker.core">CSSOutputFormat</a></div>
+<div class="col-last even-row-color">
 <div class="block">Represents the CSS output format (MIME type "text/css", name "CSS").</div>
 </div>
-<div class="col-first even-row-color"><a href="CustomAttribute.html" title="class in freemarker.core">CustomAttribute</a></div>
-<div class="col-last even-row-color">
+<div class="col-first odd-row-color"><a href="CustomAttribute.html" title="class in freemarker.core">CustomAttribute</a></div>
+<div class="col-last odd-row-color">
 <div class="block">A class that allows one to associate custom data with a <a href="../template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>, a <a href="../template/Template.html" title="class in freemarker.template"><code>Template</code></a>, or
  <a href="Environment.html" title="class in freemarker.core"><code>Environment</code></a>.</div>
 </div>
-<div class="col-first odd-row-color"><a href="DefaultTruncateBuiltinAlgorithm.html" title="class in freemarker.core">DefaultTruncateBuiltinAlgorithm</a></div>
-<div class="col-last odd-row-color">
+<div class="col-first even-row-color"><a href="DefaultTruncateBuiltinAlgorithm.html" title="class in freemarker.core">DefaultTruncateBuiltinAlgorithm</a></div>
+<div class="col-last even-row-color">
 <div class="block">The default <a href="TruncateBuiltinAlgorithm.html" title="class in freemarker.core"><code>TruncateBuiltinAlgorithm</code></a> implementation; see
  <a href="Configurable.html#setTruncateBuiltinAlgorithm(freemarker.core.TruncateBuiltinAlgorithm)"><code>Configurable.setTruncateBuiltinAlgorithm(TruncateBuiltinAlgorithm)</code></a>.</div>
 </div>
-<div class="col-first even-row-color"><a href="Environment.html" title="class in freemarker.core">Environment</a></div>
-<div class="col-last even-row-color">
+<div class="col-first odd-row-color"><a href="Environment.html" title="class in freemarker.core">Environment</a></div>
+<div class="col-last odd-row-color">
 <div class="block">Object that represents the runtime environment during template processing.</div>
 </div>
-<div class="col-first odd-row-color"><a href="FreeMarkerTree.html" title="class in freemarker.core">FreeMarkerTree</a></div>
-<div class="col-last odd-row-color">Deprecated.
+<div class="col-first even-row-color"><a href="FreeMarkerTree.html" title="class in freemarker.core">FreeMarkerTree</a></div>
+<div class="col-last even-row-color">Deprecated.
 <div class="deprecation-comment">Will be removed, as Swing classes aren't accessible on Google App Engine.</div>
 </div>
-<div class="col-first even-row-color"><a href="HTMLOutputFormat.html" title="class in freemarker.core">HTMLOutputFormat</a></div>
-<div class="col-last even-row-color">
+<div class="col-first odd-row-color"><a href="HTMLOutputFormat.html" title="class in freemarker.core">HTMLOutputFormat</a></div>
+<div class="col-last odd-row-color">
 <div class="block">Represents the HTML output format (MIME type "text/html", name "HTML").</div>
 </div>
-<div class="col-first odd-row-color"><a href="JavaCFormat.html" title="class in freemarker.core">JavaCFormat</a></div>
-<div class="col-last odd-row-color">
+<div class="col-first even-row-color"><a href="JavaCFormat.html" title="class in freemarker.core">JavaCFormat</a></div>
+<div class="col-last even-row-color">
 <div class="block"><a href="JavaCFormat.html#NAME">"Java"</a> <a href="CFormat.html" title="class in freemarker.core"><code>CFormat</code></a>.</div>
 </div>
-<div class="col-first even-row-color"><a href="JavaScriptCFormat.html" title="class in freemarker.core">JavaScriptCFormat</a></div>
-<div class="col-last even-row-color">
+<div class="col-first odd-row-color"><a href="JavaScriptCFormat.html" title="class in freemarker.core">JavaScriptCFormat</a></div>
+<div class="col-last odd-row-color">
 <div class="block"><a href="JavaScriptCFormat.html#NAME">"JavaScript"</a> <a href="CFormat.html" title="class in freemarker.core"><code>CFormat</code></a>, to be used when generating JavaScript (and not JSON), except, in most cases
  <a href="JavaScriptOrJSONCFormat.html" title="class in freemarker.core"><code>JavaScriptOrJSONCFormat</code></a> is recommended over this.</div>
 </div>
-<div class="col-first odd-row-color"><a href="JavaScriptOrJSONCFormat.html" title="class in freemarker.core">JavaScriptOrJSONCFormat</a></div>
-<div class="col-last odd-row-color">
+<div class="col-first even-row-color"><a href="JavaScriptOrJSONCFormat.html" title="class in freemarker.core">JavaScriptOrJSONCFormat</a></div>
+<div class="col-last even-row-color">
 <div class="block"><a href="JavaScriptOrJSONCFormat.html#NAME">"JavaScript or JSON"</a> <a href="CFormat.html" title="class in freemarker.core"><code>CFormat</code></a>; for generating output that's compatible with both JSON and JavaScript.</div>
 </div>
-<div class="col-first even-row-color"><a href="JavaScriptOutputFormat.html" title="class in freemarker.core">JavaScriptOutputFormat</a></div>
-<div class="col-last even-row-color">
+<div class="col-first odd-row-color"><a href="JavaScriptOutputFormat.html" title="class in freemarker.core">JavaScriptOutputFormat</a></div>
+<div class="col-last odd-row-color">
 <div class="block">Represents the JavaScript output format (MIME type "application/javascript", name "JavaScript").</div>
 </div>
-<div class="col-first odd-row-color"><a href="JSONCFormat.html" title="class in freemarker.core">JSONCFormat</a></div>
-<div class="col-last odd-row-color">
+<div class="col-first even-row-color"><a href="JSONCFormat.html" title="class in freemarker.core">JSONCFormat</a></div>
+<div class="col-last even-row-color">
 <div class="block"><a href="JSONCFormat.html#NAME">"JSON"</a> <a href="CFormat.html" title="class in freemarker.core"><code>CFormat</code></a>; to be used when generating JSON (and not JavaScript), except, in most cases
  <a href="JavaScriptOrJSONCFormat.html" title="class in freemarker.core"><code>JavaScriptOrJSONCFormat</code></a> is recommended over this.</div>
 </div>
-<div class="col-first even-row-color"><a href="JSONOutputFormat.html" title="class in freemarker.core">JSONOutputFormat</a></div>
-<div class="col-last even-row-color">
+<div class="col-first odd-row-color"><a href="JSONOutputFormat.html" title="class in freemarker.core">JSONOutputFormat</a></div>
+<div class="col-last odd-row-color">
 <div class="block">Represents the JSON output format (MIME type "application/json", name "JSON").</div>
 </div>
-<div class="col-first odd-row-color"><a href="LegacyCFormat.html" title="class in freemarker.core">LegacyCFormat</a></div>
-<div class="col-last odd-row-color">
+<div class="col-first even-row-color"><a href="LegacyCFormat.html" title="class in freemarker.core">LegacyCFormat</a></div>
+<div class="col-last even-row-color">
 <div class="block">Corresponds to the behavior of <code>?c</code> before <a href="../template/Configuration.html#VERSION_2_3_32">2.3.32</a> (when there
  were no <a href="CFormat.html" title="class in freemarker.core"><code>CFormat</code></a>-s yet).</div>
 </div>
-<div class="col-first even-row-color"><a href="MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;MO extends <a href="TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&gt;</div>
-<div class="col-last even-row-color">
+<div class="col-first odd-row-color"><a href="MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;MO extends <a href="TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&gt;</div>
+<div class="col-last odd-row-color">
 <div class="block">Superclass of <a href="OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>-s that represent a "markup" format, which is any format where certain character
  sequences have special meaning, and thus may need escaping.</div>
 </div>
-<div class="col-first odd-row-color"><a href="OptInTemplateClassResolver.html" title="class in freemarker.core">OptInTemplateClassResolver</a></div>
-<div class="col-last odd-row-color">
-<div class="block">A <a href="TemplateClassResolver.html" title="interface in freemarker.core"><code>TemplateClassResolver</code></a> that resolves only the classes whose name 
- was specified in the constructor.</div>
-</div>
-<div class="col-first even-row-color"><a href="OutputFormat.html" title="class in freemarker.core">OutputFormat</a></div>
+<div class="col-first even-row-color"><a href="OptInTemplateClassResolver.html" title="class in freemarker.core">OptInTemplateClassResolver</a></div>
 <div class="col-last even-row-color">
-<div class="block">Represents an output format.</div>
+<div class="block">A <a href="TemplateClassResolver.html" title="interface in freemarker.core"><code>TemplateClassResolver</code></a> that resolves only the classes whose name was specified in the constructor.</div>
 </div>
-<div class="col-first odd-row-color"><a href="PlainTextOutputFormat.html" title="class in freemarker.core">PlainTextOutputFormat</a></div>
+<div class="col-first odd-row-color"><a href="OutputFormat.html" title="class in freemarker.core">OutputFormat</a></div>
 <div class="col-last odd-row-color">
-<div class="block">Represents the plain text output format (MIME type "text/plain", name "plainText").</div>
+<div class="block">Represents an output format.</div>
 </div>
-<div class="col-first even-row-color"><a href="RTFOutputFormat.html" title="class in freemarker.core">RTFOutputFormat</a></div>
+<div class="col-first even-row-color"><a href="PlainTextOutputFormat.html" title="class in freemarker.core">PlainTextOutputFormat</a></div>
 <div class="col-last even-row-color">
-<div class="block">Represents the Rich Text Format output format (MIME type "application/rtf", name "RTF").</div>
+<div class="block">Represents the plain text output format (MIME type "text/plain", name "plainText").</div>
 </div>
-<div class="col-first odd-row-color"><a href="TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a></div>
+<div class="col-first odd-row-color"><a href="RTFOutputFormat.html" title="class in freemarker.core">RTFOutputFormat</a></div>
 <div class="col-last odd-row-color">
-<div class="block">Stores combined markup to be printed; used with <a href="CombinedMarkupOutputFormat.html" title="class in freemarker.core"><code>CombinedMarkupOutputFormat</code></a>.</div>
+<div class="block">Represents the Rich Text Format output format (MIME type "application/rtf", name "RTF").</div>
 </div>
-<div class="col-first even-row-color"><a href="TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></div>
+<div class="col-first even-row-color"><a href="TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a></div>
 <div class="col-last even-row-color">
+<div class="block">Stores combined markup to be printed; used with <a href="CombinedMarkupOutputFormat.html" title="class in freemarker.core"><code>CombinedMarkupOutputFormat</code></a>.</div>
+</div>
+<div class="col-first odd-row-color"><a href="TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></div>
+<div class="col-last odd-row-color">
 <div class="block">Used for customizing the configuration settings for individual <a href="../template/Template.html" title="class in freemarker.template"><code>Template</code></a>-s (or rather groups of templates),
  relatively to the common setting values coming from the <a href="../template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
 </div>
-<div class="col-first odd-row-color"><a href="TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></div>
-<div class="col-last odd-row-color">
+<div class="col-first even-row-color"><a href="TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></div>
+<div class="col-last even-row-color">
 <div class="block">Represents a date/time/dateTime format; used in templates for formatting and parsing with that format.</div>
 </div>
-<div class="col-first even-row-color"><a href="TemplateDateFormatFactory.html" title="class in freemarker.core">TemplateDateFormatFactory</a></div>
-<div class="col-last even-row-color">
+<div class="col-first odd-row-color"><a href="TemplateDateFormatFactory.html" title="class in freemarker.core">TemplateDateFormatFactory</a></div>
+<div class="col-last odd-row-color">
 <div class="block">Factory for a certain kind of date/time/dateTime formatting (<a href="TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a>).</div>
 </div>
-<div class="col-first odd-row-color"><a href="TemplateFormatUtil.html" title="class in freemarker.core">TemplateFormatUtil</a></div>
-<div class="col-last odd-row-color">
+<div class="col-first even-row-color"><a href="TemplateFormatUtil.html" title="class in freemarker.core">TemplateFormatUtil</a></div>
+<div class="col-last even-row-color">
 <div class="block">Utility classes for implementing <a href="TemplateValueFormat.html" title="class in freemarker.core"><code>TemplateValueFormat</code></a>-s.</div>
 </div>
-<div class="col-first even-row-color"><a href="TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a></div>
-<div class="col-last even-row-color">
+<div class="col-first odd-row-color"><a href="TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a></div>
+<div class="col-last odd-row-color">
 <div class="block">Stores HTML markup to be printed; used with <a href="HTMLOutputFormat.html" title="class in freemarker.core"><code>HTMLOutputFormat</code></a>.</div>
 </div>
-<div class="col-first odd-row-color"><a href="TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></div>
-<div class="col-last odd-row-color">
+<div class="col-first even-row-color"><a href="TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></div>
+<div class="col-last even-row-color">
 <div class="block">Represents a number format; used in templates for formatting and parsing with that format.</div>
 </div>
-<div class="col-first even-row-color"><a href="TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</a></div>
-<div class="col-last even-row-color">
+<div class="col-first odd-row-color"><a href="TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</a></div>
+<div class="col-last odd-row-color">
 <div class="block">Factory for a certain kind of number formatting (<a href="TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>).</div>
 </div>
-<div class="col-first odd-row-color"><a href="TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a></div>
-<div class="col-last odd-row-color">
+<div class="col-first even-row-color"><a href="TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a></div>
+<div class="col-last even-row-color">
 <div class="block">Stores RTF markup to be printed; used with <a href="RTFOutputFormat.html" title="class in freemarker.core"><code>RTFOutputFormat</code></a>.</div>
 </div>
-<div class="col-first even-row-color"><a href="TemplateValueFormat.html" title="class in freemarker.core">TemplateValueFormat</a></div>
-<div class="col-last even-row-color">
+<div class="col-first odd-row-color"><a href="TemplateValueFormat.html" title="class in freemarker.core">TemplateValueFormat</a></div>
+<div class="col-last odd-row-color">
 <div class="block">Superclass of all value format objects; objects that convert values to strings, or parse strings.</div>
 </div>
-<div class="col-first odd-row-color"><a href="TemplateValueFormatFactory.html" title="class in freemarker.core">TemplateValueFormatFactory</a></div>
-<div class="col-last odd-row-color">
+<div class="col-first even-row-color"><a href="TemplateValueFormatFactory.html" title="class in freemarker.core">TemplateValueFormatFactory</a></div>
+<div class="col-last even-row-color">
 <div class="block">Superclass of all format factories.</div>
 </div>
-<div class="col-first even-row-color"><a href="TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a></div>
-<div class="col-last even-row-color">
+<div class="col-first odd-row-color"><a href="TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a></div>
+<div class="col-last odd-row-color">
 <div class="block">Stores HTML markup to be printed; used with <a href="HTMLOutputFormat.html" title="class in freemarker.core"><code>HTMLOutputFormat</code></a>.</div>
 </div>
-<div class="col-first odd-row-color"><a href="TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a></div>
-<div class="col-last odd-row-color">
+<div class="col-first even-row-color"><a href="TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a></div>
+<div class="col-last even-row-color">
 <div class="block">Stores XML markup to be printed; used with <a href="XMLOutputFormat.html" title="class in freemarker.core"><code>XMLOutputFormat</code></a>.</div>
 </div>
-<div class="col-first even-row-color"><a href="TruncateBuiltinAlgorithm.html" title="class in freemarker.core">TruncateBuiltinAlgorithm</a></div>
-<div class="col-last even-row-color">
+<div class="col-first odd-row-color"><a href="TruncateBuiltinAlgorithm.html" title="class in freemarker.core">TruncateBuiltinAlgorithm</a></div>
+<div class="col-last odd-row-color">
 <div class="block">Used for implementing the "truncate" family of built-ins.</div>
 </div>
-<div class="col-first odd-row-color"><a href="UndefinedOutputFormat.html" title="class in freemarker.core">UndefinedOutputFormat</a></div>
-<div class="col-last odd-row-color">
+<div class="col-first even-row-color"><a href="UndefinedOutputFormat.html" title="class in freemarker.core">UndefinedOutputFormat</a></div>
+<div class="col-last even-row-color">
 <div class="block">Represents the output format used when the template output format is undecided.</div>
 </div>
-<div class="col-first even-row-color"><a href="XHTMLOutputFormat.html" title="class in freemarker.core">XHTMLOutputFormat</a></div>
-<div class="col-last even-row-color">
+<div class="col-first odd-row-color"><a href="XHTMLOutputFormat.html" title="class in freemarker.core">XHTMLOutputFormat</a></div>
+<div class="col-last odd-row-color">
 <div class="block">Represents the XML output format (MIME type "application/xhtml+xml", name "XHTML"); this behaves identically to
  <a href="HTMLOutputFormat.html" title="class in freemarker.core"><code>HTMLOutputFormat</code></a>, except that the name an the MIME Type differs.</div>
 </div>
-<div class="col-first odd-row-color"><a href="XMLOutputFormat.html" title="class in freemarker.core">XMLOutputFormat</a></div>
-<div class="col-last odd-row-color">
+<div class="col-first even-row-color"><a href="XMLOutputFormat.html" title="class in freemarker.core">XMLOutputFormat</a></div>
+<div class="col-last even-row-color">
 <div class="block">Represents the XML output format (MIME type "application/xml", name "XML").</div>
 </div>
-<div class="col-first even-row-color"><a href="XSCFormat.html" title="class in freemarker.core">XSCFormat</a></div>
-<div class="col-last even-row-color">
+<div class="col-first odd-row-color"><a href="XSCFormat.html" title="class in freemarker.core">XSCFormat</a></div>
+<div class="col-last odd-row-color">
 <div class="block"><a href="XSCFormat.html#NAME">"XS"</a> <a href="CFormat.html" title="class in freemarker.core"><code>CFormat</code></a>, for outputting XML that follows the conventions of XML Schema.</div>
 </div>
 </div>
diff --git a/docs/api/freemarker/core/package-tree.html b/docs/api/freemarker/core/package-tree.html
index 334f0c0f..e83cfadb 100644
--- a/docs/api/freemarker/core/package-tree.html
+++ b/docs/api/freemarker/core/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (16) -->
-<title>freemarker.core Class Hierarchy (FreeMarker 2.3.34 API)</title>
+<title>freemarker.core Class Hierarchy (FreeMarker 2.3.35 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: freemarker.core">
@@ -82,7 +82,6 @@ loadScripts(document, 'script');</script>
 <li class="circle">freemarker.core.<a href="XSCFormat.html" title="class in freemarker.core"><span class="type-name-link">XSCFormat</span></a></li>
 </ul>
 </li>
-<li class="circle">freemarker.core.<a href="CommandLine.html" title="class in freemarker.core"><span class="type-name-link">CommandLine</span></a></li>
 <li class="circle">freemarker.core.<a href="CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><span class="type-name-link">CommonTemplateMarkupOutputModel</span></a>&lt;MO&gt; (implements freemarker.core.<a href="TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;MO&gt;)
 <ul>
 <li class="circle">freemarker.core.<a href="TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core"><span class="type-name-link">TemplateCombinedMarkupOutputModel</span></a></li>
diff --git a/docs/api/freemarker/debug/Breakpoint.html b/docs/api/freemarker/debug/Breakpoint.html
deleted file mode 100644
index c286c1d2..00000000
--- a/docs/api/freemarker/debug/Breakpoint.html
+++ /dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE HTML>
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (16) -->
-<title>Breakpoint (FreeMarker 2.3.34 API)</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="declaration: package: freemarker.debug, class: Breakpoint">
-<meta name="generator" content="javadoc/ClassWriterImpl">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-<script type="text/javascript" src="../../script-dir/jquery-3.5.1.min.js"></script>
-<script type="text/javascript" src="../../script-dir/jquery-ui.min.js"></script>
-</head>
-<body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../";
-loadScripts(document, 'script');</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
-<nav role="navigation">
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar.top">
-<div class="skip-nav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
-<li><a href="../../index.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="nav-bar-cell1-rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="sub-nav">
-<div>
-<ul class="sub-nav-list">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="sub-nav-list">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<div class="nav-list-search"><label for="search">SEARCH:</label>
-<input type="text" id="search" value="search" disabled="disabled">
-<input type="reset" id="reset" value="reset" disabled="disabled">
-</div>
-</div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<span class="skip-nav" id="skip.navbar.top">
-<!--   -->
-</span></nav>
-</header>
-<div class="flex-content">
-<main role="main">
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">freemarker.debug</a></div>
-<h1 title="Class Breakpoint" class="title">Class Breakpoint</h1>
-</div>
-<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance">freemarker.debug.Breakpoint</div>
-</div>
-<section class="description">
-<dl class="notes">
-<dt>All Implemented Interfaces:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a></code></dd>
-</dl>
-<hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name type-name-label">Breakpoint</span>
-<span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>
-implements <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a>, <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a></span></div>
-<div class="block">Represents a breakpoint location consisting of a template name and a line number.</div>
-<dl class="notes">
-<dt>See Also:</dt>
-<dd><a href="../../serialized-form.html#freemarker.debug.Breakpoint">Serialized Form</a></dd>
-</dl>
-</section>
-<section class="summary">
-<ul class="summary-list">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<li>
-<section class="constructor-summary" id="constructor.summary">
-<h2>Constructor Summary</h2>
-<div class="caption"><span>Constructors</span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Constructor</div>
-<div class="table-header col-last">Description</div>
-<div class="col-constructor-name even-row-color"><code><span class="member-name-link"><a href="#%3Cinit%3E(java.lang.String,int)">Breakpoint</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;templateName,
- int&nbsp;line)</code></div>
-<div class="col-last even-row-color">
-<div class="block">Creates a new breakpoint.</div>
-</div>
-</div>
-</section>
-</li>
-<!-- ========== METHOD SUMMARY =========== -->
-<li>
-<section class="method-summary" id="method.summary">
-<h2>Method Summary</h2>
-<div id="method-summary-table">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab( [...]
-<div id="method-summary-table.tabpanel" role="tabpanel">
-<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
-<div class="table-header col-first">Modifier and Type</div>
-<div class="table-header col-second">Method</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>int</code></div>
-<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#compareTo(java.lang.Object)">compareTo</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&nbsp;o)</code></div>
-<div class="col-last even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>boolean</code></div>
-<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#equals(java.lang.Object)">equals</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&nbsp;o)</code></div>
-<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>int</code></div>
-<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#getLine()">getLine</a></span>()</code></div>
-<div class="col-last even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
-<div class="block">Returns the line number of the breakpoint</div>
-</div>
-<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
-<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#getLocationString()">getLocationString</a></span>()</code></div>
-<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
-<div class="block">Returns the template name and the line number separated with a colon</div>
-</div>
-<div class="col-first even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
-<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#getTemplateName()">getTemplateName</a></span>()</code></div>
-<div class="col-last even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
-<div class="block">Returns the template name of the breakpoint</div>
-</div>
-<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>int</code></div>
-<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#hashCode()">hashCode</a></span>()</code></div>
-<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">&nbsp;</div>
-</div>
-</div>
-</div>
-<div class="inherited-list">
-<h3 id="methods.inherited.from.class.java.lang.Object">Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
-<code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in [...]
-</section>
-</li>
-</ul>
-</section>
-<section class="details">
-<ul class="details-list">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<li>
-<section class="constructor-details" id="constructor.detail">
-<h2>Constructor Details</h2>
-<ul class="member-list">
-<li>
-<section class="detail" id="&lt;init&gt;(java.lang.String,int)">
-<h3>Breakpoint</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name">Breakpoint</span>&#8203;<span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;templateName,
- int&nbsp;line)</span></div>
-<div class="block">Creates a new breakpoint.</div>
-<dl class="notes">
-<dt>Parameters:</dt>
-<dd><code>templateName</code> - the name of the template</dd>
-<dd><code>line</code> - the line number in the template where to put the breakpoint</dd>
-</dl>
-</section>
-</li>
-</ul>
-</section>
-</li>
-<!-- ============ METHOD DETAIL ========== -->
-<li>
-<section class="method-details" id="method.detail">
-<h2>Method Details</h2>
-<ul class="member-list">
-<li>
-<section class="detail" id="getLine()">
-<h3>getLine</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">getLine</span>()</div>
-<div class="block">Returns the line number of the breakpoint</div>
-</section>
-</li>
-<li>
-<section class="detail" id="getTemplateName()">
-<h3>getTemplateName</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name">getTemplateName</span>()</div>
-<div class="block">Returns the template name of the breakpoint</div>
-</section>
-</li>
-<li>
-<section class="detail" id="hashCode()">
-<h3>hashCode</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">hashCode</span>()</div>
-<dl class="notes">
-<dt>Overrides:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a></code>&nbsp;in class&nbsp;<code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="equals(java.lang.Object)">
-<h3>equals</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name">equals</span>&#8203;<span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&nbsp;o)</span></div>
-<dl class="notes">
-<dt>Overrides:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a></code>&nbsp;in class&nbsp;<code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="compareTo(java.lang.Object)">
-<h3>compareTo</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">compareTo</span>&#8203;<span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&nbsp;o)</span></div>
-<dl class="notes">
-<dt>Specified by:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Comparable.html#compareTo(T)" title="class or interface in java.lang" class="external-link">compareTo</a></code>&nbsp;in interface&nbsp;<code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="getLocationString()">
-<h3>getLocationString</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name">getLocationString</span>()</div>
-<div class="block">Returns the template name and the line number separated with a colon</div>
-</section>
-</li>
-</ul>
-</section>
-</li>
-</ul>
-</section>
-<!-- ========= END OF CLASS DATA ========= -->
-</main>
-</div>
-</div>
-</body>
-</html>
diff --git a/docs/api/freemarker/debug/DebugModel.html b/docs/api/freemarker/debug/DebugModel.html
deleted file mode 100644
index 281595df..00000000
--- a/docs/api/freemarker/debug/DebugModel.html
+++ /dev/null
@@ -1,546 +0,0 @@
-<!DOCTYPE HTML>
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (16) -->
-<title>DebugModel (FreeMarker 2.3.34 API)</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="declaration: package: freemarker.debug, interface: DebugModel">
-<meta name="generator" content="javadoc/ClassWriterImpl">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-<script type="text/javascript" src="../../script-dir/jquery-3.5.1.min.js"></script>
-<script type="text/javascript" src="../../script-dir/jquery-ui.min.js"></script>
-</head>
-<body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../";
-loadScripts(document, 'script');</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
-<nav role="navigation">
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar.top">
-<div class="skip-nav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
-<li><a href="../../index.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="nav-bar-cell1-rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="sub-nav">
-<div>
-<ul class="sub-nav-list">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="sub-nav-list">
-<li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<div class="nav-list-search"><label for="search">SEARCH:</label>
-<input type="text" id="search" value="search" disabled="disabled">
-<input type="reset" id="reset" value="reset" disabled="disabled">
-</div>
-</div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<span class="skip-nav" id="skip.navbar.top">
-<!--   -->
-</span></nav>
-</header>
-<div class="flex-content">
-<main role="main">
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">freemarker.debug</a></div>
-<h1 title="Interface DebugModel" class="title">Interface DebugModel</h1>
-</div>
-<section class="description">
-<dl class="notes">
-<dt>All Superinterfaces:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/Remote.html" title="class or interface in java.rmi" class="external-link">Remote</a></code></dd>
-</dl>
-<dl class="notes">
-<dt>All Known Subinterfaces:</dt>
-<dd><code><a href="DebuggedEnvironment.html" title="interface in freemarker.debug">DebuggedEnvironment</a></code></dd>
-</dl>
-<hr>
-<div class="type-signature"><span class="modifiers">public interface </span><span class="element-name type-name-label">DebugModel</span><span class="extends-implements">
-extends <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/Remote.html" title="class or interface in java.rmi" class="external-link">Remote</a></span></div>
-<div class="block">Represents the debugger-side mirror of a TemplateModel object, a Template
- object, or a Configuration object. The Environment objects are also represented
- by instances of this model, although not directly but through a separate
- subinterface <a href="DebuggedEnvironment.html" title="interface in freemarker.debug"><code>DebuggedEnvironment</code></a>. The interface is a union of
- almost all of FreeMarker template models with identical method signatures.
- For purposes of optimizing network traffic there are bulk retrieval methods
- for sequences and hashes, as well as a <a href="#getModelTypes()"><code>getModelTypes()</code></a> method that
- returns a bit mask of various <code>TYPE_xxx</code> constants flagging which
- template models are implemented by the mirrored object.</div>
-</section>
-<section class="summary">
-<ul class="summary-list">
-<!-- =========== FIELD SUMMARY =========== -->
-<li>
-<section class="field-summary" id="field.summary">
-<h2>Field Summary</h2>
-<div class="caption"><span>Fields</span></div>
-<div class="summary-table three-column-summary">
-<div class="table-header col-first">Modifier and Type</div>
-<div class="table-header col-second">Field</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#TYPE_BOOLEAN">TYPE_BOOLEAN</a></span></code></div>
-<div class="col-last even-row-color">&nbsp;</div>
-<div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#TYPE_COLLECTION">TYPE_COLLECTION</a></span></code></div>
-<div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#TYPE_CONFIGURATION">TYPE_CONFIGURATION</a></span></code></div>
-<div class="col-last even-row-color">&nbsp;</div>
-<div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#TYPE_DATE">TYPE_DATE</a></span></code></div>
-<div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#TYPE_ENVIRONMENT">TYPE_ENVIRONMENT</a></span></code></div>
-<div class="col-last even-row-color">&nbsp;</div>
-<div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#TYPE_HASH">TYPE_HASH</a></span></code></div>
-<div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#TYPE_HASH_EX">TYPE_HASH_EX</a></span></code></div>
-<div class="col-last even-row-color">&nbsp;</div>
-<div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#TYPE_METHOD">TYPE_METHOD</a></span></code></div>
-<div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#TYPE_METHOD_EX">TYPE_METHOD_EX</a></span></code></div>
-<div class="col-last even-row-color">&nbsp;</div>
-<div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#TYPE_NUMBER">TYPE_NUMBER</a></span></code></div>
-<div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#TYPE_SCALAR">TYPE_SCALAR</a></span></code></div>
-<div class="col-last even-row-color">&nbsp;</div>
-<div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#TYPE_SEQUENCE">TYPE_SEQUENCE</a></span></code></div>
-<div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#TYPE_TEMPLATE">TYPE_TEMPLATE</a></span></code></div>
-<div class="col-last even-row-color">&nbsp;</div>
-<div class="col-first odd-row-color"><code>static int</code></div>
-<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#TYPE_TRANSFORM">TYPE_TRANSFORM</a></span></code></div>
-<div class="col-last odd-row-color">&nbsp;</div>
-</div>
-</section>
-</li>
-<!-- ========== METHOD SUMMARY =========== -->
-<li>
-<section class="method-summary" id="method.summary">
-<h2>Method Summary</h2>
-<div id="method-summary-table">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab( [...]
-<div id="method-summary-table.tabpanel" role="tabpanel">
-<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
-<div class="table-header col-first">Modifier and Type</div>
-<div class="table-header col-second">Method</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><a href="DebugModel.html" title="interface in freemarker.debug">DebugModel</a></code></div>
-<div class="col-second even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#get(int)">get</a></span>&#8203;(int&nbsp;index)</code></div>
-<div class="col-last even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><a href="DebugModel.html" title="interface in freemarker.debug">DebugModel</a>[]</code></div>
-<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#get(int,int)">get</a></span>&#8203;(int&nbsp;fromIndex,
- int&nbsp;toIndex)</code></div>
-<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><a href="DebugModel.html" title="interface in freemarker.debug">DebugModel</a></code></div>
-<div class="col-second even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#get(java.lang.String)">get</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;key)</code></div>
-<div class="col-last even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><a href="DebugModel.html" title="interface in freemarker.debug">DebugModel</a>[]</code></div>
-<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#get(java.lang.String%5B%5D)">get</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>[]&nbsp;keys)</code></div>
-<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code>boolean</code></div>
-<div class="col-second even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#getAsBoolean()">getAsBoolean</a></span>()</code></div>
-<div class="col-last even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/Date.html" title="class or interface in java.util" class="external-link">Date</a></code></div>
-<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#getAsDate()">getAsDate</a></span>()</code></div>
-<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a></code></div>
-<div class="col-second even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#getAsNumber()">getAsNumber</a></span>()</code></div>
-<div class="col-last even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
-<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#getAsString()">getAsString</a></span>()</code></div>
-<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><a href="DebugModel.html" title="interface in freemarker.debug">DebugModel</a>[]</code></div>
-<div class="col-second even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#getCollection()">getCollection</a></span>()</code></div>
-<div class="col-last even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code>int</code></div>
-<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#getDateType()">getDateType</a></span>()</code></div>
-<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code>int</code></div>
-<div class="col-second even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#getModelTypes()">getModelTypes</a></span>()</code></div>
-<div class="col-last even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>[]</code></div>
-<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#keys()">keys</a></span>()</code></div>
-<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code>int</code></div>
-<div class="col-second even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#size()">size</a></span>()</code></div>
-<div class="col-last even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">&nbsp;</div>
-</div>
-</div>
-</div>
-</section>
-</li>
-</ul>
-</section>
-<section class="details">
-<ul class="details-list">
-<!-- ============ FIELD DETAIL =========== -->
-<li>
-<section class="field-details" id="field.detail">
-<h2>Field Details</h2>
-<ul class="member-list">
-<li>
-<section class="detail" id="TYPE_SCALAR">
-<h3>TYPE_SCALAR</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">TYPE_SCALAR</span></div>
-<dl class="notes">
-<dt>See Also:</dt>
-<dd><a href="../../constant-values.html#freemarker.debug.DebugModel.TYPE_SCALAR">Constant Field Values</a></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="TYPE_NUMBER">
-<h3>TYPE_NUMBER</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">TYPE_NUMBER</span></div>
-<dl class="notes">
-<dt>See Also:</dt>
-<dd><a href="../../constant-values.html#freemarker.debug.DebugModel.TYPE_NUMBER">Constant Field Values</a></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="TYPE_DATE">
-<h3>TYPE_DATE</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">TYPE_DATE</span></div>
-<dl class="notes">
-<dt>See Also:</dt>
-<dd><a href="../../constant-values.html#freemarker.debug.DebugModel.TYPE_DATE">Constant Field Values</a></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="TYPE_BOOLEAN">
-<h3>TYPE_BOOLEAN</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">TYPE_BOOLEAN</span></div>
-<dl class="notes">
-<dt>See Also:</dt>
-<dd><a href="../../constant-values.html#freemarker.debug.DebugModel.TYPE_BOOLEAN">Constant Field Values</a></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="TYPE_SEQUENCE">
-<h3>TYPE_SEQUENCE</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">TYPE_SEQUENCE</span></div>
-<dl class="notes">
-<dt>See Also:</dt>
-<dd><a href="../../constant-values.html#freemarker.debug.DebugModel.TYPE_SEQUENCE">Constant Field Values</a></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="TYPE_COLLECTION">
-<h3>TYPE_COLLECTION</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">TYPE_COLLECTION</span></div>
-<dl class="notes">
-<dt>See Also:</dt>
-<dd><a href="../../constant-values.html#freemarker.debug.DebugModel.TYPE_COLLECTION">Constant Field Values</a></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="TYPE_HASH">
-<h3>TYPE_HASH</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">TYPE_HASH</span></div>
-<dl class="notes">
-<dt>See Also:</dt>
-<dd><a href="../../constant-values.html#freemarker.debug.DebugModel.TYPE_HASH">Constant Field Values</a></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="TYPE_HASH_EX">
-<h3>TYPE_HASH_EX</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">TYPE_HASH_EX</span></div>
-<dl class="notes">
-<dt>See Also:</dt>
-<dd><a href="../../constant-values.html#freemarker.debug.DebugModel.TYPE_HASH_EX">Constant Field Values</a></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="TYPE_METHOD">
-<h3>TYPE_METHOD</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">TYPE_METHOD</span></div>
-<dl class="notes">
-<dt>See Also:</dt>
-<dd><a href="../../constant-values.html#freemarker.debug.DebugModel.TYPE_METHOD">Constant Field Values</a></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="TYPE_METHOD_EX">
-<h3>TYPE_METHOD_EX</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">TYPE_METHOD_EX</span></div>
-<dl class="notes">
-<dt>See Also:</dt>
-<dd><a href="../../constant-values.html#freemarker.debug.DebugModel.TYPE_METHOD_EX">Constant Field Values</a></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="TYPE_TRANSFORM">
-<h3>TYPE_TRANSFORM</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">TYPE_TRANSFORM</span></div>
-<dl class="notes">
-<dt>See Also:</dt>
-<dd><a href="../../constant-values.html#freemarker.debug.DebugModel.TYPE_TRANSFORM">Constant Field Values</a></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="TYPE_ENVIRONMENT">
-<h3>TYPE_ENVIRONMENT</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">TYPE_ENVIRONMENT</span></div>
-<dl class="notes">
-<dt>See Also:</dt>
-<dd><a href="../../constant-values.html#freemarker.debug.DebugModel.TYPE_ENVIRONMENT">Constant Field Values</a></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="TYPE_TEMPLATE">
-<h3>TYPE_TEMPLATE</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">TYPE_TEMPLATE</span></div>
-<dl class="notes">
-<dt>See Also:</dt>
-<dd><a href="../../constant-values.html#freemarker.debug.DebugModel.TYPE_TEMPLATE">Constant Field Values</a></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="TYPE_CONFIGURATION">
-<h3>TYPE_CONFIGURATION</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">TYPE_CONFIGURATION</span></div>
-<dl class="notes">
-<dt>See Also:</dt>
-<dd><a href="../../constant-values.html#freemarker.debug.DebugModel.TYPE_CONFIGURATION">Constant Field Values</a></dd>
-</dl>
-</section>
-</li>
-</ul>
-</section>
-</li>
-<!-- ============ METHOD DETAIL ========== -->
-<li>
-<section class="method-details" id="method.detail">
-<h2>Method Details</h2>
-<ul class="member-list">
-<li>
-<section class="detail" id="getAsString()">
-<h3>getAsString</h3>
-<div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name">getAsString</span>()
-            throws <span class="exceptions"><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a>,
-<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></span></div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="getAsNumber()">
-<h3>getAsNumber</h3>
-<div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a></span>&nbsp;<span class="element-name">getAsNumber</span>()
-            throws <span class="exceptions"><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a>,
-<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></span></div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="getAsBoolean()">
-<h3>getAsBoolean</h3>
-<div class="member-signature"><span class="return-type">boolean</span>&nbsp;<span class="element-name">getAsBoolean</span>()
-              throws <span class="exceptions"><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a>,
-<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></span></div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="getAsDate()">
-<h3>getAsDate</h3>
-<div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/Date.html" title="class or interface in java.util" class="external-link">Date</a></span>&nbsp;<span class="element-name">getAsDate</span>()
-        throws <span class="exceptions"><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a>,
-<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></span></div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="getDateType()">
-<h3>getDateType</h3>
-<div class="member-signature"><span class="return-type">int</span>&nbsp;<span class="element-name">getDateType</span>()
-         throws <span class="exceptions"><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a>,
-<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></span></div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="size()">
-<h3>size</h3>
-<div class="member-signature"><span class="return-type">int</span>&nbsp;<span class="element-name">size</span>()
-  throws <span class="exceptions"><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a>,
-<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></span></div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="get(int)">
-<h3>get</h3>
-<div class="member-signature"><span class="return-type"><a href="DebugModel.html" title="interface in freemarker.debug">DebugModel</a></span>&nbsp;<span class="element-name">get</span>&#8203;<span class="parameters">(int&nbsp;index)</span>
-        throws <span class="exceptions"><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a>,
-<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></span></div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="get(int,int)">
-<h3>get</h3>
-<div class="member-signature"><span class="return-type"><a href="DebugModel.html" title="interface in freemarker.debug">DebugModel</a>[]</span>&nbsp;<span class="element-name">get</span>&#8203;<span class="parameters">(int&nbsp;fromIndex,
- int&nbsp;toIndex)</span>
-          throws <span class="exceptions"><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a>,
-<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></span></div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="get(java.lang.String)">
-<h3>get</h3>
-<div class="member-signature"><span class="return-type"><a href="DebugModel.html" title="interface in freemarker.debug">DebugModel</a></span>&nbsp;<span class="element-name">get</span>&#8203;<span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;key)</span>
-        throws <span class="exceptions"><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a>,
-<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></span></div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="get(java.lang.String[])">
-<h3>get</h3>
-<div class="member-signature"><span class="return-type"><a href="DebugModel.html" title="interface in freemarker.debug">DebugModel</a>[]</span>&nbsp;<span class="element-name">get</span>&#8203;<span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>[]&nbsp;keys)</span>
-          throws <span class="exceptions"><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a>,
-<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></span></div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="getCollection()">
-<h3>getCollection</h3>
-<div class="member-signature"><span class="return-type"><a href="DebugModel.html" title="interface in freemarker.debug">DebugModel</a>[]</span>&nbsp;<span class="element-name">getCollection</span>()
-                    throws <span class="exceptions"><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a>,
-<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></span></div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="keys()">
-<h3>keys</h3>
-<div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>[]</span>&nbsp;<span class="element-name">keys</span>()
-       throws <span class="exceptions"><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a>,
-<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></span></div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="../template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="getModelTypes()">
-<h3>getModelTypes</h3>
-<div class="member-signature"><span class="return-type">int</span>&nbsp;<span class="element-name">getModelTypes</span>()
-           throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></span></div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></code></dd>
-</dl>
-</section>
-</li>
-</ul>
-</section>
-</li>
-</ul>
-</section>
-<!-- ========= END OF CLASS DATA ========= -->
-</main>
-</div>
-</div>
-</body>
-</html>
diff --git a/docs/api/freemarker/debug/DebuggedEnvironment.html b/docs/api/freemarker/debug/DebuggedEnvironment.html
deleted file mode 100644
index 131ac9ca..00000000
--- a/docs/api/freemarker/debug/DebuggedEnvironment.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE HTML>
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (16) -->
-<title>DebuggedEnvironment (FreeMarker 2.3.34 API)</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="declaration: package: freemarker.debug, interface: DebuggedEnvironment">
-<meta name="generator" content="javadoc/ClassWriterImpl">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-<script type="text/javascript" src="../../script-dir/jquery-3.5.1.min.js"></script>
-<script type="text/javascript" src="../../script-dir/jquery-ui.min.js"></script>
-</head>
-<body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../";
-loadScripts(document, 'script');</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
-<nav role="navigation">
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar.top">
-<div class="skip-nav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
-<li><a href="../../index.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="nav-bar-cell1-rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="sub-nav">
-<div>
-<ul class="sub-nav-list">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="sub-nav-list">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<div class="nav-list-search"><label for="search">SEARCH:</label>
-<input type="text" id="search" value="search" disabled="disabled">
-<input type="reset" id="reset" value="reset" disabled="disabled">
-</div>
-</div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<span class="skip-nav" id="skip.navbar.top">
-<!--   -->
-</span></nav>
-</header>
-<div class="flex-content">
-<main role="main">
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">freemarker.debug</a></div>
-<h1 title="Interface DebuggedEnvironment" class="title">Interface DebuggedEnvironment</h1>
-</div>
-<section class="description">
-<dl class="notes">
-<dt>All Superinterfaces:</dt>
-<dd><code><a href="DebugModel.html" title="interface in freemarker.debug">DebugModel</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/Remote.html" title="class or interface in java.rmi" class="external-link">Remote</a></code></dd>
-</dl>
-<hr>
-<div class="type-signature"><span class="modifiers">public interface </span><span class="element-name type-name-label">DebuggedEnvironment</span><span class="extends-implements">
-extends <a href="DebugModel.html" title="interface in freemarker.debug">DebugModel</a></span></div>
-<div class="block">Represents the debugger-side mirror of a debugged 
- <a href="../core/Environment.html" title="class in freemarker.core"><code>Environment</code></a> object in the remote VM. This interface
- extends <a href="DebugModel.html" title="interface in freemarker.debug"><code>DebugModel</code></a>, and the properties of the Environment are exposed
- as hash keys on it. Specifically, the following keys are supported:
- "currentNamespace", "dataModel", "globalNamespace", "knownVariables", 
- "mainNamespace", and "template".
- <p>The debug model for the template supports keys "configuration" and "name".
- <p>The debug model for the configuration supports key "sharedVariables".
- <p>Additionally, all of the debug models for environment, template, and 
- configuration also support all the setting keys of 
- <a href="../core/Configurable.html" title="class in freemarker.core"><code>Configurable</code></a> objects.</div>
-</section>
-<section class="summary">
-<ul class="summary-list">
-<!-- =========== FIELD SUMMARY =========== -->
-<li>
-<section class="field-summary" id="field.summary">
-<h2>Field Summary</h2>
-<div class="inherited-list">
-<h3 id="fields.inherited.from.class.freemarker.debug.DebugModel">Fields inherited from interface&nbsp;freemarker.debug.<a href="DebugModel.html" title="interface in freemarker.debug">DebugModel</a></h3>
-<code><a href="DebugModel.html#TYPE_BOOLEAN">TYPE_BOOLEAN</a>, <a href="DebugModel.html#TYPE_COLLECTION">TYPE_COLLECTION</a>, <a href="DebugModel.html#TYPE_CONFIGURATION">TYPE_CONFIGURATION</a>, <a href="DebugModel.html#TYPE_DATE">TYPE_DATE</a>, <a href="DebugModel.html#TYPE_ENVIRONMENT">TYPE_ENVIRONMENT</a>, <a href="DebugModel.html#TYPE_HASH">TYPE_HASH</a>, <a href="DebugModel.html#TYPE_HASH_EX">TYPE_HASH_EX</a>, <a href="DebugModel.html#TYPE_METHOD">TYPE_METHOD</a>, <a href="DebugMode [...]
-</section>
-</li>
-<!-- ========== METHOD SUMMARY =========== -->
-<li>
-<section class="method-summary" id="method.summary">
-<h2>Method Summary</h2>
-<div id="method-summary-table">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab( [...]
-<div id="method-summary-table.tabpanel" role="tabpanel">
-<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
-<div class="table-header col-first">Modifier and Type</div>
-<div class="table-header col-second">Method</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code>long</code></div>
-<div class="col-second even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#getId()">getId</a></span>()</code></div>
-<div class="col-last even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">
-<div class="block">Returns a unique identifier for this environment</div>
-</div>
-<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code>void</code></div>
-<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#resume()">resume</a></span>()</code></div>
-<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">
-<div class="block">Resumes the processing of the environment in the remote VM after it was 
- stopped on a breakpoint.</div>
-</div>
-<div class="col-first even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code>void</code></div>
-<div class="col-second even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#stop()">stop</a></span>()</code></div>
-<div class="col-last even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">
-<div class="block">Stops the processing of the environment after it was stopped on
- a breakpoint.</div>
-</div>
-</div>
-</div>
-</div>
-<div class="inherited-list">
-<h3 id="methods.inherited.from.class.freemarker.debug.DebugModel">Methods inherited from interface&nbsp;freemarker.debug.<a href="DebugModel.html" title="interface in freemarker.debug">DebugModel</a></h3>
-<code><a href="DebugModel.html#get(int)">get</a>, <a href="DebugModel.html#get(int,int)">get</a>, <a href="DebugModel.html#get(java.lang.String)">get</a>, <a href="DebugModel.html#get(java.lang.String%5B%5D)">get</a>, <a href="DebugModel.html#getAsBoolean()">getAsBoolean</a>, <a href="DebugModel.html#getAsDate()">getAsDate</a>, <a href="DebugModel.html#getAsNumber()">getAsNumber</a>, <a href="DebugModel.html#getAsString()">getAsString</a>, <a href="DebugModel.html#getCollection()">getCol [...]
-</section>
-</li>
-</ul>
-</section>
-<section class="details">
-<ul class="details-list">
-<!-- ============ METHOD DETAIL ========== -->
-<li>
-<section class="method-details" id="method.detail">
-<h2>Method Details</h2>
-<ul class="member-list">
-<li>
-<section class="detail" id="resume()">
-<h3>resume</h3>
-<div class="member-signature"><span class="return-type">void</span>&nbsp;<span class="element-name">resume</span>()
-     throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></span></div>
-<div class="block">Resumes the processing of the environment in the remote VM after it was 
- stopped on a breakpoint.</div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="stop()">
-<h3>stop</h3>
-<div class="member-signature"><span class="return-type">void</span>&nbsp;<span class="element-name">stop</span>()
-   throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></span></div>
-<div class="block">Stops the processing of the environment after it was stopped on
- a breakpoint. Causes a <a href="../core/StopException.html" title="class in freemarker.core"><code>StopException</code></a> to be
- thrown in the processing thread in the remote VM.</div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="getId()">
-<h3>getId</h3>
-<div class="member-signature"><span class="return-type">long</span>&nbsp;<span class="element-name">getId</span>()
-    throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></span></div>
-<div class="block">Returns a unique identifier for this environment</div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></code></dd>
-</dl>
-</section>
-</li>
-</ul>
-</section>
-</li>
-</ul>
-</section>
-<!-- ========= END OF CLASS DATA ========= -->
-</main>
-</div>
-</div>
-</body>
-</html>
diff --git a/docs/api/freemarker/debug/Debugger.html b/docs/api/freemarker/debug/Debugger.html
deleted file mode 100644
index d65e3344..00000000
--- a/docs/api/freemarker/debug/Debugger.html
+++ /dev/null
@@ -1,325 +0,0 @@
-<!DOCTYPE HTML>
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (16) -->
-<title>Debugger (FreeMarker 2.3.34 API)</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="declaration: package: freemarker.debug, interface: Debugger">
-<meta name="generator" content="javadoc/ClassWriterImpl">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-<script type="text/javascript" src="../../script-dir/jquery-3.5.1.min.js"></script>
-<script type="text/javascript" src="../../script-dir/jquery-ui.min.js"></script>
-</head>
-<body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../";
-loadScripts(document, 'script');</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
-<nav role="navigation">
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar.top">
-<div class="skip-nav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
-<li><a href="../../index.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="nav-bar-cell1-rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="sub-nav">
-<div>
-<ul class="sub-nav-list">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="sub-nav-list">
-<li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<div class="nav-list-search"><label for="search">SEARCH:</label>
-<input type="text" id="search" value="search" disabled="disabled">
-<input type="reset" id="reset" value="reset" disabled="disabled">
-</div>
-</div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<span class="skip-nav" id="skip.navbar.top">
-<!--   -->
-</span></nav>
-</header>
-<div class="flex-content">
-<main role="main">
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">freemarker.debug</a></div>
-<h1 title="Interface Debugger" class="title">Interface Debugger</h1>
-</div>
-<section class="description">
-<dl class="notes">
-<dt>All Superinterfaces:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/Remote.html" title="class or interface in java.rmi" class="external-link">Remote</a></code></dd>
-</dl>
-<hr>
-<div class="type-signature"><span class="modifiers">public interface </span><span class="element-name type-name-label">Debugger</span><span class="extends-implements">
-extends <a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/Remote.html" title="class or interface in java.rmi" class="external-link">Remote</a></span></div>
-<div class="block">The main debugger interface. Allows management of breakpoints as well as
- installation of listeners for debug events.</div>
-</section>
-<section class="summary">
-<ul class="summary-list">
-<!-- =========== FIELD SUMMARY =========== -->
-<li>
-<section class="field-summary" id="field.summary">
-<h2>Field Summary</h2>
-<div class="caption"><span>Fields</span></div>
-<div class="summary-table three-column-summary">
-<div class="table-header col-first">Modifier and Type</div>
-<div class="table-header col-second">Field</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><code>static int</code></div>
-<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#DEFAULT_PORT">DEFAULT_PORT</a></span></code></div>
-<div class="col-last even-row-color">&nbsp;</div>
-</div>
-</section>
-</li>
-<!-- ========== METHOD SUMMARY =========== -->
-<li>
-<section class="method-summary" id="method.summary">
-<h2>Method Summary</h2>
-<div id="method-summary-table">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab( [...]
-<div id="method-summary-table.tabpanel" role="tabpanel">
-<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
-<div class="table-header col-first">Modifier and Type</div>
-<div class="table-header col-second">Method</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code>void</code></div>
-<div class="col-second even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#addBreakpoint(freemarker.debug.Breakpoint)">addBreakpoint</a></span>&#8203;(<a href="Breakpoint.html" title="class in freemarker.debug">Breakpoint</a>&nbsp;breakpoint)</code></div>
-<div class="col-last even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">
-<div class="block">Adds a breakpoint</div>
-</div>
-<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></code></div>
-<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#addDebuggerListener(freemarker.debug.DebuggerListener)">addDebuggerListener</a></span>&#8203;(<a href="DebuggerListener.html" title="interface in freemarker.debug">DebuggerListener</a>&nbsp;listener)</code></div>
-<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">
-<div class="block">Adds a listener for debugger events.</div>
-</div>
-<div class="col-first even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a></code></div>
-<div class="col-second even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#getBreakpoints()">getBreakpoints</a></span>()</code></div>
-<div class="col-last even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">
-<div class="block">Retrieves a list of all <a href="Breakpoint.html" title="class in freemarker.debug"><code>Breakpoint</code></a> objects.</div>
-</div>
-<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a></code></div>
-<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#getBreakpoints(java.lang.String)">getBreakpoints</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;templateName)</code></div>
-<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">
-<div class="block">Retrieves a list of all <a href="Breakpoint.html" title="class in freemarker.debug"><code>Breakpoint</code></a> objects for the specified
- template.</div>
-</div>
-<div class="col-first even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/Collection.html" title="class or interface in java.util" class="external-link">Collection</a></code></div>
-<div class="col-second even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#getSuspendedEnvironments()">getSuspendedEnvironments</a></span>()</code></div>
-<div class="col-last even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">
-<div class="block">Retrieves a collection of all <a href="DebuggedEnvironment.html" title="interface in freemarker.debug"><code>DebuggedEnvironment</code></a> objects that 
- are currently suspended.</div>
-</div>
-<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code>void</code></div>
-<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#removeBreakpoint(freemarker.debug.Breakpoint)">removeBreakpoint</a></span>&#8203;(<a href="Breakpoint.html" title="class in freemarker.debug">Breakpoint</a>&nbsp;breakpoint)</code></div>
-<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">
-<div class="block">Removes a single breakpoint</div>
-</div>
-<div class="col-first even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code>void</code></div>
-<div class="col-second even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#removeBreakpoints()">removeBreakpoints</a></span>()</code></div>
-<div class="col-last even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">
-<div class="block">Removes all breakpoints</div>
-</div>
-<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code>void</code></div>
-<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#removeBreakpoints(java.lang.String)">removeBreakpoints</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;templateName)</code></div>
-<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">
-<div class="block">Removes all breakpoints for a specific template</div>
-</div>
-<div class="col-first even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code>void</code></div>
-<div class="col-second even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#removeDebuggerListener(java.lang.Object)">removeDebuggerListener</a></span>&#8203;(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&nbsp;id)</code></div>
-<div class="col-last even-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">
-<div class="block">Removes a previously added debugger listener.</div>
-</div>
-</div>
-</div>
-</div>
-</section>
-</li>
-</ul>
-</section>
-<section class="details">
-<ul class="details-list">
-<!-- ============ FIELD DETAIL =========== -->
-<li>
-<section class="field-details" id="field.detail">
-<h2>Field Details</h2>
-<ul class="member-list">
-<li>
-<section class="detail" id="DEFAULT_PORT">
-<h3>DEFAULT_PORT</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">DEFAULT_PORT</span></div>
-<dl class="notes">
-<dt>See Also:</dt>
-<dd><a href="../../constant-values.html#freemarker.debug.Debugger.DEFAULT_PORT">Constant Field Values</a></dd>
-</dl>
-</section>
-</li>
-</ul>
-</section>
-</li>
-<!-- ============ METHOD DETAIL ========== -->
-<li>
-<section class="method-details" id="method.detail">
-<h2>Method Details</h2>
-<ul class="member-list">
-<li>
-<section class="detail" id="addBreakpoint(freemarker.debug.Breakpoint)">
-<h3>addBreakpoint</h3>
-<div class="member-signature"><span class="return-type">void</span>&nbsp;<span class="element-name">addBreakpoint</span>&#8203;<span class="parameters">(<a href="Breakpoint.html" title="class in freemarker.debug">Breakpoint</a>&nbsp;breakpoint)</span>
-            throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></span></div>
-<div class="block">Adds a breakpoint</div>
-<dl class="notes">
-<dt>Parameters:</dt>
-<dd><code>breakpoint</code> - the breakpoint to add</dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="removeBreakpoint(freemarker.debug.Breakpoint)">
-<h3>removeBreakpoint</h3>
-<div class="member-signature"><span class="return-type">void</span>&nbsp;<span class="element-name">removeBreakpoint</span>&#8203;<span class="parameters">(<a href="Breakpoint.html" title="class in freemarker.debug">Breakpoint</a>&nbsp;breakpoint)</span>
-               throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></span></div>
-<div class="block">Removes a single breakpoint</div>
-<dl class="notes">
-<dt>Parameters:</dt>
-<dd><code>breakpoint</code> - the breakpoint to remove</dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="removeBreakpoints(java.lang.String)">
-<h3>removeBreakpoints</h3>
-<div class="member-signature"><span class="return-type">void</span>&nbsp;<span class="element-name">removeBreakpoints</span>&#8203;<span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;templateName)</span>
-                throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></span></div>
-<div class="block">Removes all breakpoints for a specific template</div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="removeBreakpoints()">
-<h3>removeBreakpoints</h3>
-<div class="member-signature"><span class="return-type">void</span>&nbsp;<span class="element-name">removeBreakpoints</span>()
-                throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></span></div>
-<div class="block">Removes all breakpoints</div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="getBreakpoints()">
-<h3>getBreakpoints</h3>
-<div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a></span>&nbsp;<span class="element-name">getBreakpoints</span>()
-             throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></span></div>
-<div class="block">Retrieves a list of all <a href="Breakpoint.html" title="class in freemarker.debug"><code>Breakpoint</code></a> objects.</div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="getBreakpoints(java.lang.String)">
-<h3>getBreakpoints</h3>
-<div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a></span>&nbsp;<span class="element-name">getBreakpoints</span>&#8203;<span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;templateNa [...]
-             throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></span></div>
-<div class="block">Retrieves a list of all <a href="Breakpoint.html" title="class in freemarker.debug"><code>Breakpoint</code></a> objects for the specified
- template.</div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="getSuspendedEnvironments()">
-<h3>getSuspendedEnvironments</h3>
-<div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/util/Collection.html" title="class or interface in java.util" class="external-link">Collection</a></span>&nbsp;<span class="element-name">getSuspendedEnvironments</span>()
-                             throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></span></div>
-<div class="block">Retrieves a collection of all <a href="DebuggedEnvironment.html" title="interface in freemarker.debug"><code>DebuggedEnvironment</code></a> objects that 
- are currently suspended.</div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="addDebuggerListener(freemarker.debug.DebuggerListener)">
-<h3>addDebuggerListener</h3>
-<div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span>&nbsp;<span class="element-name">addDebuggerListener</span>&#8203;<span class="parameters">(<a href="DebuggerListener.html" title="interface in freemarker.debug">DebuggerListener</a>&nbsp;listener)</span>
-                    throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></span></div>
-<div class="block">Adds a listener for debugger events.</div>
-<dl class="notes">
-<dt>Returns:</dt>
-<dd>an identification token that should be passed to 
- <a href="#removeDebuggerListener(java.lang.Object)"><code>removeDebuggerListener(Object)</code></a> to remove this listener.</dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/16/docs/api/java.rmi/java/rmi/RemoteException.html" title="class or interface in java.rmi" class="external-link">RemoteException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="removeDebuggerListener(java.lang.Object)">
-<h3>removeDebuggerListener</h3>
... 22747 lines suppressed ...