You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by cb...@apache.org on 2021/03/08 20:24:09 UTC

[velocity-site] branch asf-site updated: [site/prod] Push all changes to prod

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

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


The following commit(s) were added to refs/heads/asf-site by this push:
     new 49a2c4a  [site/prod] Push all changes to prod
49a2c4a is described below

commit 49a2c4a7b2e0b217171fe3cdc8d0289be83b3775
Author: Claude Brisson <cl...@renegat.net>
AuthorDate: Mon Mar 8 21:23:55 2021 +0100

    [site/prod] Push all changes to prod
---
 anakia/index.html                                  |    4 +-
 contact.html                                       |    4 +-
 css/site.css                                       |   23 +-
 docbook/index.html                                 |    4 +-
 download.html                                      |  266 ++-
 dvsl/index.html                                    |    4 +-
 engine/1.7/index.html                              |    2 +-
 engine/1.7/left.nav                                |   36 -
 engine/1.7/source-repository.html                  |    2 +-
 engine/2.0/getting-started.html                    |   16 +-
 engine/2.0/index.html                              |    2 +-
 engine/2.0/left.nav                                |   37 -
 engine/2.1/getting-started.html                    |   16 +-
 engine/2.1/index.html                              |    2 +-
 engine/2.1/left.nav                                |   37 -
 engine/2.2/getting-started.html                    |   16 +-
 engine/2.2/index.html                              |    2 +-
 engine/2.2/left.nav                                |   37 -
 engine/2.3/developer-guide.html                    |    2 +-
 engine/2.3/getting-started.html                    |   16 +-
 engine/2.3/left.nav                                |   37 -
 engine/2.3/source-repository.html                  |    2 +-
 engine/devel/apidocs/allclasses-frame.html         |   11 +-
 engine/devel/apidocs/allclasses-noframe.html       |   11 +-
 engine/devel/apidocs/constant-values.html          |   61 +-
 engine/devel/apidocs/deprecated-list.html          |   22 +-
 engine/devel/apidocs/help-doc.html                 |   10 +-
 engine/devel/apidocs/index-all.html                |  266 ++-
 engine/devel/apidocs/index.html                    |    4 +-
 .../apidocs/org/apache/velocity/Template.html      |   16 +-
 .../org/apache/velocity/VelocityContext.html       |   27 +-
 .../org/apache/velocity/app/FieldMethodizer.html   |   12 +-
 .../apidocs/org/apache/velocity/app/Velocity.html  |   12 +-
 .../org/apache/velocity/app/VelocityEngine.html    |   12 +-
 .../velocity/app/class-use/FieldMethodizer.html    |   10 +-
 .../apache/velocity/app/class-use/Velocity.html    |   10 +-
 .../velocity/app/class-use/VelocityEngine.html     |  152 +-
 .../apache/velocity/app/event/EventCartridge.html  |   16 +-
 .../apache/velocity/app/event/EventHandler.html    |   12 +-
 .../velocity/app/event/EventHandlerUtil.html       |   16 +-
 .../velocity/app/event/IncludeEventHandler.html    |   12 +-
 .../app/event/InvalidReferenceEventHandler.html    |   12 +-
 .../app/event/MethodExceptionEventHandler.html     |   16 +-
 .../app/event/ReferenceInsertionEventHandler.html  |   12 +-
 .../app/event/class-use/EventCartridge.html        |   26 +-
 .../velocity/app/event/class-use/EventHandler.html |   10 +-
 .../app/event/class-use/EventHandlerUtil.html      |   10 +-
 .../app/event/class-use/IncludeEventHandler.html   |   10 +-
 .../class-use/InvalidReferenceEventHandler.html    |   10 +-
 .../class-use/MethodExceptionEventHandler.html     |   10 +-
 .../class-use/ReferenceInsertionEventHandler.html  |   10 +-
 .../app/event/implement/EscapeHtmlReference.html   |   10 +-
 .../event/implement/EscapeJavaScriptReference.html |   10 +-
 .../app/event/implement/EscapeReference.html       |   12 +-
 .../app/event/implement/EscapeSqlReference.html    |   10 +-
 .../app/event/implement/EscapeXmlReference.html    |   10 +-
 .../app/event/implement/IncludeNotFound.html       |   12 +-
 .../app/event/implement/IncludeRelativePath.html   |   12 +-
 .../app/event/implement/InvalidReferenceInfo.html  |   12 +-
 .../app/event/implement/PrintExceptions.html       |   16 +-
 .../event/implement/ReportInvalidReferences.html   |   16 +-
 .../implement/class-use/EscapeHtmlReference.html   |   10 +-
 .../class-use/EscapeJavaScriptReference.html       |   10 +-
 .../event/implement/class-use/EscapeReference.html |   10 +-
 .../implement/class-use/EscapeSqlReference.html    |   10 +-
 .../implement/class-use/EscapeXmlReference.html    |   10 +-
 .../event/implement/class-use/IncludeNotFound.html |   10 +-
 .../implement/class-use/IncludeRelativePath.html   |   10 +-
 .../implement/class-use/InvalidReferenceInfo.html  |   54 +-
 .../event/implement/class-use/PrintExceptions.html |   10 +-
 .../class-use/ReportInvalidReferences.html         |   10 +-
 .../app/event/implement/package-frame.html         |    6 +-
 .../app/event/implement/package-summary.html       |   10 +-
 .../velocity/app/event/implement/package-tree.html |   10 +-
 .../velocity/app/event/implement/package-use.html  |   16 +-
 .../apache/velocity/app/event/package-frame.html   |    6 +-
 .../apache/velocity/app/event/package-summary.html |   10 +-
 .../apache/velocity/app/event/package-tree.html    |   10 +-
 .../org/apache/velocity/app/event/package-use.html |   10 +-
 .../org/apache/velocity/app/package-frame.html     |    6 +-
 .../org/apache/velocity/app/package-summary.html   |   10 +-
 .../org/apache/velocity/app/package-tree.html      |   10 +-
 .../org/apache/velocity/app/package-use.html       |   49 +-
 .../org/apache/velocity/class-use/Template.html    |  129 +-
 .../apache/velocity/class-use/VelocityContext.html |   10 +-
 .../apache/velocity/context/AbstractContext.html   |   20 +-
 .../context/ChainedInternalContextAdapter.html     |   18 +-
 .../org/apache/velocity/context/Context.html       |   12 +-
 .../velocity/context/InternalContextAdapter.html   |   20 +-
 .../context/InternalContextAdapterImpl.html        |   20 +-
 .../velocity/context/InternalEventContext.html     |   12 +-
 .../velocity/context/InternalWrapperContext.html   |   12 +-
 .../context/class-use/AbstractContext.html         |   10 +-
 .../class-use/ChainedInternalContextAdapter.html   |   10 +-
 .../apache/velocity/context/class-use/Context.html |  118 +-
 .../context/class-use/InternalContextAdapter.html  |  440 ++---
 .../class-use/InternalContextAdapterImpl.html      |   10 +-
 .../context/class-use/InternalEventContext.html    |   10 +-
 .../context/class-use/InternalWrapperContext.html  |   10 +-
 .../org/apache/velocity/context/package-frame.html |    6 +-
 .../apache/velocity/context/package-summary.html   |   10 +-
 .../org/apache/velocity/context/package-tree.html  |   10 +-
 .../org/apache/velocity/context/package-use.html   |   10 +-
 .../org/apache/velocity/example/DBContext.html     |   20 +-
 .../org/apache/velocity/example/DBContextTest.html |   12 +-
 .../org/apache/velocity/example/EventExample.html  |   12 +-
 .../org/apache/velocity/example/Example.html       |   12 +-
 .../org/apache/velocity/example/Example2.html      |   12 +-
 .../apache/velocity/example/TreeMapContext.html    |   20 +-
 .../org/apache/velocity/example/XMLTest.html       |   12 +-
 .../velocity/example/class-use/DBContext.html      |   10 +-
 .../velocity/example/class-use/DBContextTest.html  |   10 +-
 .../velocity/example/class-use/EventExample.html   |   10 +-
 .../apache/velocity/example/class-use/Example.html |   10 +-
 .../velocity/example/class-use/Example2.html       |   10 +-
 .../velocity/example/class-use/TreeMapContext.html |   10 +-
 .../apache/velocity/example/class-use/XMLTest.html |   10 +-
 .../org/apache/velocity/example/package-frame.html |    6 +-
 .../apache/velocity/example/package-summary.html   |   10 +-
 .../org/apache/velocity/example/package-tree.html  |   10 +-
 .../org/apache/velocity/example/package-use.html   |   10 +-
 .../velocity/exception/ExtendedParseException.html |   12 +-
 .../velocity/exception/MacroOverflowException.html |   10 +-
 .../apache/velocity/exception/MathException.html   |   10 +-
 .../exception/MethodInvocationException.html       |   12 +-
 .../velocity/exception/ParseErrorException.html    |   12 +-
 .../exception/ResourceNotFoundException.html       |   12 +-
 .../velocity/exception/TemplateInitException.html  |   12 +-
 .../velocity/exception/VelocityException.html      |   12 +-
 .../class-use/ExtendedParseException.html          |   10 +-
 .../class-use/MacroOverflowException.html          |   10 +-
 .../exception/class-use/MathException.html         |   10 +-
 .../class-use/MethodInvocationException.html       |  158 +-
 .../exception/class-use/ParseErrorException.html   |  114 +-
 .../class-use/ResourceNotFoundException.html       |  168 +-
 .../exception/class-use/TemplateInitException.html |  154 +-
 .../exception/class-use/VelocityException.html     |   95 +-
 .../apache/velocity/exception/package-frame.html   |    6 +-
 .../apache/velocity/exception/package-summary.html |   10 +-
 .../apache/velocity/exception/package-tree.html    |   10 +-
 .../org/apache/velocity/exception/package-use.html |   38 +-
 .../apidocs/org/apache/velocity/io/Filter.html     |   10 +-
 .../org/apache/velocity/io/UnicodeInputStream.html |   12 +-
 .../org/apache/velocity/io/VelocityWriter.html     |   12 +-
 .../org/apache/velocity/io/class-use/Filter.html   |   10 +-
 .../velocity/io/class-use/UnicodeInputStream.html  |   10 +-
 .../velocity/io/class-use/VelocityWriter.html      |   10 +-
 .../org/apache/velocity/io/package-frame.html      |    6 +-
 .../org/apache/velocity/io/package-summary.html    |   10 +-
 .../org/apache/velocity/io/package-tree.html       |   10 +-
 .../org/apache/velocity/io/package-use.html        |   10 +-
 .../apidocs/org/apache/velocity/package-frame.html |    6 +-
 .../org/apache/velocity/package-summary.html       |   10 +-
 .../apidocs/org/apache/velocity/package-tree.html  |   12 +-
 .../apidocs/org/apache/velocity/package-use.html   |   40 +-
 .../runtime/DeprecatedRuntimeConstants.html        |   10 +-
 .../velocity/runtime/ParserConfiguration.html      |   10 +-
 .../org/apache/velocity/runtime/ParserPool.html    |   10 +-
 .../apache/velocity/runtime/ParserPoolImpl.html    |   10 +-
 .../org/apache/velocity/runtime/Renderable.html    |   10 +-
 .../runtime/RuntimeConstants.SpaceGobbling.html    |   10 +-
 .../apache/velocity/runtime/RuntimeConstants.html  |   12 +-
 .../apache/velocity/runtime/RuntimeInstance.html   |   12 +-
 .../apache/velocity/runtime/RuntimeServices.html   |   12 +-
 .../apache/velocity/runtime/RuntimeSingleton.html  |   12 +-
 .../velocity/runtime/VelocimacroFactory.html       |   12 +-
 .../velocity/runtime/VelocimacroManager.html       |   12 +-
 .../velocity/runtime/VelocityEngineVersion.html    |   10 +-
 .../class-use/DeprecatedRuntimeConstants.html      |   10 +-
 .../runtime/class-use/ParserConfiguration.html     |   18 +-
 .../velocity/runtime/class-use/ParserPool.html     |   10 +-
 .../velocity/runtime/class-use/ParserPoolImpl.html |   10 +-
 .../velocity/runtime/class-use/Renderable.html     |   15 +-
 .../class-use/RuntimeConstants.SpaceGobbling.html  |   14 +-
 .../runtime/class-use/RuntimeConstants.html        |   10 +-
 .../runtime/class-use/RuntimeInstance.html         |   10 +-
 .../runtime/class-use/RuntimeServices.html         |   94 +-
 .../runtime/class-use/RuntimeSingleton.html        |   10 +-
 .../runtime/class-use/VelocimacroFactory.html      |   10 +-
 .../runtime/class-use/VelocimacroManager.html      |   10 +-
 .../runtime/class-use/VelocityEngineVersion.html   |   10 +-
 .../runtime/directive/Block.Reference.html         |   10 +-
 .../apache/velocity/runtime/directive/Block.html   |   10 +-
 .../velocity/runtime/directive/BlockMacro.html     |   10 +-
 .../apache/velocity/runtime/directive/Break.html   |   10 +-
 .../apache/velocity/runtime/directive/Define.html  |   10 +-
 .../velocity/runtime/directive/Directive.html      |   12 +-
 .../runtime/directive/DirectiveConstants.html      |   12 +-
 .../velocity/runtime/directive/Evaluate.html       |   12 +-
 .../apache/velocity/runtime/directive/Foreach.html |   12 +-
 .../velocity/runtime/directive/ForeachScope.html   |   14 +-
 .../apache/velocity/runtime/directive/Include.html |   12 +-
 .../velocity/runtime/directive/InputBase.html      |   10 +-
 .../velocity/runtime/directive/Macro.MacroArg.html |   10 +-
 .../apache/velocity/runtime/directive/Macro.html   |   12 +-
 .../runtime/directive/MacroParseException.html     |   12 +-
 .../apache/velocity/runtime/directive/Parse.html   |   12 +-
 .../velocity/runtime/directive/RuntimeMacro.html   |   10 +-
 .../velocity/runtime/directive/Scope.Info.html     |   10 +-
 .../apache/velocity/runtime/directive/Scope.html   |   32 +-
 .../apache/velocity/runtime/directive/Stop.html    |   10 +-
 .../velocity/runtime/directive/StopCommand.html    |   10 +-
 .../runtime/directive/VelocimacroProxy.html        |   12 +-
 .../directive/class-use/Block.Reference.html       |   10 +-
 .../runtime/directive/class-use/Block.html         |   10 +-
 .../runtime/directive/class-use/BlockMacro.html    |   10 +-
 .../runtime/directive/class-use/Break.html         |   10 +-
 .../runtime/directive/class-use/Define.html        |   10 +-
 .../runtime/directive/class-use/Directive.html     |   26 +-
 .../directive/class-use/DirectiveConstants.html    |   10 +-
 .../runtime/directive/class-use/Evaluate.html      |   10 +-
 .../runtime/directive/class-use/Foreach.html       |   10 +-
 .../runtime/directive/class-use/ForeachScope.html  |   10 +-
 .../runtime/directive/class-use/Include.html       |   10 +-
 .../runtime/directive/class-use/InputBase.html     |   10 +-
 .../directive/class-use/Macro.MacroArg.html        |   18 +-
 .../runtime/directive/class-use/Macro.html         |   10 +-
 .../directive/class-use/MacroParseException.html   |   10 +-
 .../runtime/directive/class-use/Parse.html         |   10 +-
 .../runtime/directive/class-use/RuntimeMacro.html  |   10 +-
 .../runtime/directive/class-use/Scope.Info.html    |   10 +-
 .../runtime/directive/class-use/Scope.html         |   10 +-
 .../velocity/runtime/directive/class-use/Stop.html |   10 +-
 .../runtime/directive/class-use/StopCommand.html   |   10 +-
 .../directive/class-use/VelocimacroProxy.html      |   10 +-
 .../velocity/runtime/directive/contrib/For.html    |   10 +-
 .../runtime/directive/contrib/class-use/For.html   |   10 +-
 .../runtime/directive/contrib/package-frame.html   |    6 +-
 .../runtime/directive/contrib/package-summary.html |   10 +-
 .../runtime/directive/contrib/package-tree.html    |   10 +-
 .../runtime/directive/contrib/package-use.html     |   10 +-
 .../velocity/runtime/directive/package-frame.html  |    6 +-
 .../runtime/directive/package-summary.html         |   10 +-
 .../velocity/runtime/directive/package-tree.html   |   10 +-
 .../velocity/runtime/directive/package-use.html    |   10 +-
 .../org/apache/velocity/runtime/package-frame.html |    6 +-
 .../apache/velocity/runtime/package-summary.html   |   10 +-
 .../org/apache/velocity/runtime/package-tree.html  |   10 +-
 .../org/apache/velocity/runtime/package-use.html   |   10 +-
 .../apache/velocity/runtime/parser/CharStream.html |   10 +-
 .../apache/velocity/runtime/parser/LogContext.html |   10 +-
 .../velocity/runtime/parser/ParseException.html    |   10 +-
 .../org/apache/velocity/runtime/parser/Parser.html |   10 +-
 .../velocity/runtime/parser/ParserConstants.html   | 2086 --------------------
 .../runtime/parser/ParserTokenManager.html         |  631 ------
 .../velocity/runtime/parser/StandardParser.html    |   10 +-
 .../runtime/parser/StandardParserConstants.html    |   10 +-
 .../runtime/parser/StandardParserTokenManager.html |   10 +-
 .../runtime/parser/TemplateParseException.html     |   12 +-
 .../org/apache/velocity/runtime/parser/Token.html  |   10 +-
 .../velocity/runtime/parser/TokenMgrError.html     |   10 +-
 .../runtime/parser/VelocityCharStream.html         |   23 +-
 .../runtime/parser/class-use/CharStream.html       |   24 +-
 .../runtime/parser/class-use/LogContext.html       |   14 +-
 .../runtime/parser/class-use/ParseException.html   |   48 +-
 .../velocity/runtime/parser/class-use/Parser.html  |   34 +-
 .../runtime/parser/class-use/ParserConstants.html  |  175 --
 .../parser/class-use/ParserTokenManager.html       |  196 --
 .../runtime/parser/class-use/StandardParser.html   |   10 +-
 .../parser/class-use/StandardParserConstants.html  |   10 +-
 .../class-use/StandardParserTokenManager.html      |   10 +-
 .../parser/class-use/TemplateParseException.html   |   10 +-
 .../velocity/runtime/parser/class-use/Token.html   |   44 +-
 .../runtime/parser/class-use/TokenMgrError.html    |   10 +-
 .../parser/class-use/VelocityCharStream.html       |   10 +-
 .../velocity/runtime/parser/node/ASTAddNode.html   |   12 +-
 .../velocity/runtime/parser/node/ASTAndNode.html   |   12 +-
 .../runtime/parser/node/ASTAssignment.html         |   10 +-
 .../runtime/parser/node/ASTBinaryOperator.html     |   10 +-
 .../velocity/runtime/parser/node/ASTBlock.html     |   10 +-
 .../velocity/runtime/parser/node/ASTComment.html   |   12 +-
 .../runtime/parser/node/ASTComparisonNode.html     |   10 +-
 .../velocity/runtime/parser/node/ASTDirective.html |   12 +-
 .../runtime/parser/node/ASTDirectiveAssign.html    |   10 +-
 .../velocity/runtime/parser/node/ASTDivNode.html   |   12 +-
 .../velocity/runtime/parser/node/ASTEQNode.html    |   10 +-
 .../runtime/parser/node/ASTElseIfStatement.html    |   12 +-
 .../runtime/parser/node/ASTElseStatement.html      |   12 +-
 .../velocity/runtime/parser/node/ASTEscape.html    |   12 +-
 .../runtime/parser/node/ASTEscapedDirective.html   |   12 +-
 .../runtime/parser/node/ASTExpression.html         |   10 +-
 .../velocity/runtime/parser/node/ASTFalse.html     |   10 +-
 .../parser/node/ASTFloatingPointLiteral.html       |   10 +-
 .../velocity/runtime/parser/node/ASTGENode.html    |   10 +-
 .../velocity/runtime/parser/node/ASTGTNode.html    |   10 +-
 .../runtime/parser/node/ASTIdentifier.html         |   12 +-
 .../runtime/parser/node/ASTIfStatement.html        |   18 +-
 .../runtime/parser/node/ASTIncludeStatement.html   |   10 +-
 .../velocity/runtime/parser/node/ASTIndex.html     |   10 +-
 .../runtime/parser/node/ASTIntegerLiteral.html     |   10 +-
 ...ASTIntegerRange.IntegerRange.RangeIterator.html |   10 +-
 .../parser/node/ASTIntegerRange.IntegerRange.html  |   10 +-
 .../runtime/parser/node/ASTIntegerRange.html       |   10 +-
 .../velocity/runtime/parser/node/ASTLENode.html    |   10 +-
 .../velocity/runtime/parser/node/ASTLTNode.html    |   10 +-
 .../runtime/parser/node/ASTLogicalOperator.html    |   10 +-
 .../velocity/runtime/parser/node/ASTMap.html       |   12 +-
 .../velocity/runtime/parser/node/ASTMathNode.html  |   10 +-
 .../parser/node/ASTMethod.MethodCacheKey.html      |   14 +-
 .../velocity/runtime/parser/node/ASTMethod.html    |   12 +-
 .../velocity/runtime/parser/node/ASTModNode.html   |   12 +-
 .../velocity/runtime/parser/node/ASTMulNode.html   |   12 +-
 .../velocity/runtime/parser/node/ASTNENode.html    |   10 +-
 .../runtime/parser/node/ASTNegateNode.html         |   10 +-
 .../velocity/runtime/parser/node/ASTNotNode.html   |   10 +-
 .../runtime/parser/node/ASTObjectArray.html        |   10 +-
 .../velocity/runtime/parser/node/ASTOrNode.html    |   12 +-
 .../runtime/parser/node/ASTParameters.html         |   10 +-
 .../velocity/runtime/parser/node/ASTReference.html |   16 +-
 .../runtime/parser/node/ASTSetDirective.html       |   12 +-
 .../runtime/parser/node/ASTStringLiteral.html      |   12 +-
 .../runtime/parser/node/ASTSubtractNode.html       |   12 +-
 .../velocity/runtime/parser/node/ASTText.html      |   10 +-
 .../velocity/runtime/parser/node/ASTTextblock.html |   10 +-
 .../velocity/runtime/parser/node/ASTTrue.html      |   10 +-
 .../velocity/runtime/parser/node/ASTVariable.html  |   10 +-
 .../velocity/runtime/parser/node/ASTWord.html      |   10 +-
 .../velocity/runtime/parser/node/ASTprocess.html   |   10 +-
 .../runtime/parser/node/AbstractExecutor.html      |   12 +-
 .../parser/node/BooleanPropertyExecutor.html       |   24 +-
 .../velocity/runtime/parser/node/GetExecutor.html  |   20 +-
 .../runtime/parser/node/IndentationFixer.html      |   10 +-
 .../runtime/parser/node/JJTParserState.html        |   10 +-
 .../parser/node/JJTStandardParserState.html        |   10 +-
 .../runtime/parser/node/MapGetExecutor.html        |   12 +-
 .../runtime/parser/node/MapSetExecutor.html        |   16 +-
 .../velocity/runtime/parser/node/MathUtils.html    |   14 +-
 .../apache/velocity/runtime/parser/node/Node.html  |   12 +-
 .../velocity/runtime/parser/node/NodeUtils.html    |   12 +-
 .../runtime/parser/node/ParserTreeConstants.html   |   10 +-
 .../runtime/parser/node/ParserVisitor.html         |   12 +-
 .../runtime/parser/node/PropertyExecutor.html      |   22 +-
 .../runtime/parser/node/PublicFieldExecutor.html   |   18 +-
 .../velocity/runtime/parser/node/PutExecutor.html  |   20 +-
 .../velocity/runtime/parser/node/SetExecutor.html  |   12 +-
 .../runtime/parser/node/SetPropertyExecutor.html   |   20 +-
 .../parser/node/SetPublicFieldExecutor.html        |   18 +-
 .../velocity/runtime/parser/node/SimpleNode.html   |   10 +-
 .../parser/node/StandardParserTreeConstants.html   |   10 +-
 .../runtime/parser/node/StandardParserVisitor.html |   10 +-
 .../runtime/parser/node/class-use/ASTAddNode.html  |   14 +-
 .../runtime/parser/node/class-use/ASTAndNode.html  |   14 +-
 .../parser/node/class-use/ASTAssignment.html       |   14 +-
 .../parser/node/class-use/ASTBinaryOperator.html   |   10 +-
 .../runtime/parser/node/class-use/ASTBlock.html    |   14 +-
 .../runtime/parser/node/class-use/ASTComment.html  |   14 +-
 .../parser/node/class-use/ASTComparisonNode.html   |   10 +-
 .../parser/node/class-use/ASTDirective.html        |   14 +-
 .../parser/node/class-use/ASTDirectiveAssign.html  |   14 +-
 .../runtime/parser/node/class-use/ASTDivNode.html  |   14 +-
 .../runtime/parser/node/class-use/ASTEQNode.html   |   14 +-
 .../parser/node/class-use/ASTElseIfStatement.html  |   14 +-
 .../parser/node/class-use/ASTElseStatement.html    |   14 +-
 .../runtime/parser/node/class-use/ASTEscape.html   |   14 +-
 .../parser/node/class-use/ASTEscapedDirective.html |   14 +-
 .../parser/node/class-use/ASTExpression.html       |   14 +-
 .../runtime/parser/node/class-use/ASTFalse.html    |   14 +-
 .../node/class-use/ASTFloatingPointLiteral.html    |   14 +-
 .../runtime/parser/node/class-use/ASTGENode.html   |   14 +-
 .../runtime/parser/node/class-use/ASTGTNode.html   |   14 +-
 .../parser/node/class-use/ASTIdentifier.html       |   14 +-
 .../parser/node/class-use/ASTIfStatement.html      |   14 +-
 .../parser/node/class-use/ASTIncludeStatement.html |   10 +-
 .../runtime/parser/node/class-use/ASTIndex.html    |   14 +-
 .../parser/node/class-use/ASTIntegerLiteral.html   |   14 +-
 ...ASTIntegerRange.IntegerRange.RangeIterator.html |   10 +-
 .../class-use/ASTIntegerRange.IntegerRange.html    |   10 +-
 .../parser/node/class-use/ASTIntegerRange.html     |   14 +-
 .../runtime/parser/node/class-use/ASTLENode.html   |   14 +-
 .../runtime/parser/node/class-use/ASTLTNode.html   |   14 +-
 .../parser/node/class-use/ASTLogicalOperator.html  |   10 +-
 .../runtime/parser/node/class-use/ASTMap.html      |   14 +-
 .../runtime/parser/node/class-use/ASTMathNode.html |   10 +-
 .../node/class-use/ASTMethod.MethodCacheKey.html   |   10 +-
 .../runtime/parser/node/class-use/ASTMethod.html   |   14 +-
 .../runtime/parser/node/class-use/ASTModNode.html  |   14 +-
 .../runtime/parser/node/class-use/ASTMulNode.html  |   14 +-
 .../runtime/parser/node/class-use/ASTNENode.html   |   14 +-
 .../parser/node/class-use/ASTNegateNode.html       |   10 +-
 .../runtime/parser/node/class-use/ASTNotNode.html  |   14 +-
 .../parser/node/class-use/ASTObjectArray.html      |   14 +-
 .../runtime/parser/node/class-use/ASTOrNode.html   |   14 +-
 .../parser/node/class-use/ASTParameters.html       |   10 +-
 .../parser/node/class-use/ASTReference.html        |   14 +-
 .../parser/node/class-use/ASTSetDirective.html     |   14 +-
 .../parser/node/class-use/ASTStringLiteral.html    |   14 +-
 .../parser/node/class-use/ASTSubtractNode.html     |   14 +-
 .../runtime/parser/node/class-use/ASTText.html     |   14 +-
 .../parser/node/class-use/ASTTextblock.html        |   14 +-
 .../runtime/parser/node/class-use/ASTTrue.html     |   14 +-
 .../runtime/parser/node/class-use/ASTVariable.html |   10 +-
 .../runtime/parser/node/class-use/ASTWord.html     |   14 +-
 .../runtime/parser/node/class-use/ASTprocess.html  |   14 +-
 .../parser/node/class-use/AbstractExecutor.html    |   10 +-
 .../node/class-use/BooleanPropertyExecutor.html    |   10 +-
 .../runtime/parser/node/class-use/GetExecutor.html |   10 +-
 .../parser/node/class-use/IndentationFixer.html    |   10 +-
 .../parser/node/class-use/JJTParserState.html      |   10 +-
 .../node/class-use/JJTStandardParserState.html     |   10 +-
 .../parser/node/class-use/MapGetExecutor.html      |   10 +-
 .../parser/node/class-use/MapSetExecutor.html      |   10 +-
 .../runtime/parser/node/class-use/MathUtils.html   |   10 +-
 .../runtime/parser/node/class-use/Node.html        |  127 +-
 .../runtime/parser/node/class-use/NodeUtils.html   |   10 +-
 .../parser/node/class-use/ParserTreeConstants.html |   10 +-
 .../parser/node/class-use/ParserVisitor.html       |   88 +-
 .../parser/node/class-use/PropertyExecutor.html    |   10 +-
 .../parser/node/class-use/PublicFieldExecutor.html |   10 +-
 .../runtime/parser/node/class-use/PutExecutor.html |   10 +-
 .../runtime/parser/node/class-use/SetExecutor.html |   10 +-
 .../parser/node/class-use/SetPropertyExecutor.html |   10 +-
 .../node/class-use/SetPublicFieldExecutor.html     |   10 +-
 .../runtime/parser/node/class-use/SimpleNode.html  |   29 +-
 .../class-use/StandardParserTreeConstants.html     |   10 +-
 .../node/class-use/StandardParserVisitor.html      |   10 +-
 .../runtime/parser/node/package-frame.html         |    6 +-
 .../runtime/parser/node/package-summary.html       |   15 +-
 .../velocity/runtime/parser/node/package-tree.html |   10 +-
 .../velocity/runtime/parser/node/package-use.html  |   20 +-
 .../velocity/runtime/parser/package-frame.html     |    6 +-
 .../velocity/runtime/parser/package-summary.html   |   12 +-
 .../velocity/runtime/parser/package-tree.html      |   10 +-
 .../velocity/runtime/parser/package-use.html       |   10 +-
 .../velocity/runtime/resource/ContentResource.html |   12 +-
 .../apache/velocity/runtime/resource/Resource.html |   12 +-
 .../velocity/runtime/resource/ResourceCache.html   |   12 +-
 .../runtime/resource/ResourceCacheImpl.html        |   12 +-
 .../velocity/runtime/resource/ResourceFactory.html |   12 +-
 .../velocity/runtime/resource/ResourceManager.html |   12 +-
 .../runtime/resource/ResourceManagerImpl.html      |   12 +-
 .../resource/class-use/ContentResource.html        |   26 +-
 .../runtime/resource/class-use/Resource.html       |   72 +-
 .../runtime/resource/class-use/ResourceCache.html  |   10 +-
 .../resource/class-use/ResourceCacheImpl.html      |   10 +-
 .../resource/class-use/ResourceFactory.html        |   10 +-
 .../resource/class-use/ResourceManager.html        |   10 +-
 .../resource/class-use/ResourceManagerImpl.html    |   10 +-
 .../resource/loader/ClasspathResourceLoader.html   |   12 +-
 .../resource/loader/DataSourceResourceLoader.html  |   12 +-
 .../resource/loader/FileResourceLoader.html        |   12 +-
 .../runtime/resource/loader/JarHolder.html         |   16 +-
 .../runtime/resource/loader/JarResourceLoader.html |   12 +-
 .../runtime/resource/loader/ResourceLoader.html    |   14 +-
 .../resource/loader/ResourceLoaderFactory.html     |   12 +-
 .../resource/loader/StringResourceLoader.html      |   16 +-
 .../runtime/resource/loader/URLResourceLoader.html |   14 +-
 .../loader/class-use/ClasspathResourceLoader.html  |   10 +-
 .../loader/class-use/DataSourceResourceLoader.html |   10 +-
 .../loader/class-use/FileResourceLoader.html       |   10 +-
 .../resource/loader/class-use/JarHolder.html       |   10 +-
 .../loader/class-use/JarResourceLoader.html        |   10 +-
 .../resource/loader/class-use/ResourceLoader.html  |   34 +-
 .../loader/class-use/ResourceLoaderFactory.html    |   10 +-
 .../loader/class-use/StringResourceLoader.html     |   10 +-
 .../loader/class-use/URLResourceLoader.html        |   10 +-
 .../runtime/resource/loader/package-frame.html     |    6 +-
 .../runtime/resource/loader/package-summary.html   |   10 +-
 .../runtime/resource/loader/package-tree.html      |   10 +-
 .../runtime/resource/loader/package-use.html       |   32 +-
 .../velocity/runtime/resource/package-frame.html   |    6 +-
 .../velocity/runtime/resource/package-summary.html |   10 +-
 .../velocity/runtime/resource/package-tree.html    |   10 +-
 .../velocity/runtime/resource/package-use.html     |   33 +-
 .../runtime/resource/util/StringResource.html      |   12 +-
 .../resource/util/StringResourceRepository.html    |   12 +-
 .../util/StringResourceRepositoryImpl.html         |   16 +-
 .../resource/util/class-use/StringResource.html    |   25 +-
 .../util/class-use/StringResourceRepository.html   |   23 +-
 .../class-use/StringResourceRepositoryImpl.html    |   10 +-
 .../runtime/resource/util/package-frame.html       |    6 +-
 .../runtime/resource/util/package-summary.html     |   10 +-
 .../runtime/resource/util/package-tree.html        |   10 +-
 .../runtime/resource/util/package-use.html         |   10 +-
 .../velocity/runtime/visitor/BaseVisitor.html      |   12 +-
 .../velocity/runtime/visitor/NodeViewMode.html     |   12 +-
 .../runtime/visitor/class-use/BaseVisitor.html     |   10 +-
 .../runtime/visitor/class-use/NodeViewMode.html    |   10 +-
 .../velocity/runtime/visitor/package-frame.html    |    6 +-
 .../velocity/runtime/visitor/package-summary.html  |   10 +-
 .../velocity/runtime/visitor/package-tree.html     |   10 +-
 .../velocity/runtime/visitor/package-use.html      |   10 +-
 .../velocity/script/VelocityCompiledScript.html    |   10 +-
 .../VelocityScriptEngine.SingleResourceReader.html |   10 +-
 .../velocity/script/VelocityScriptEngine.html      |   10 +-
 .../script/VelocityScriptEngineFactory.html        |   10 +-
 .../script/class-use/VelocityCompiledScript.html   |   10 +-
 .../VelocityScriptEngine.SingleResourceReader.html |   10 +-
 .../script/class-use/VelocityScriptEngine.html     |   10 +-
 .../class-use/VelocityScriptEngineFactory.html     |   10 +-
 .../org/apache/velocity/script/package-frame.html  |    6 +-
 .../apache/velocity/script/package-summary.html    |   14 +-
 .../org/apache/velocity/script/package-tree.html   |   14 +-
 .../org/apache/velocity/script/package-use.html    |   10 +-
 .../velocity/spring/SpringResourceLoader.html      |  530 +++++
 .../velocity/spring/VelocityEngineFactory.html     |  675 +++++++
 .../velocity/spring/VelocityEngineFactoryBean.html |  404 ++++
 .../velocity/spring/VelocityEngineUtils.html       |  423 ++++
 .../class-use/SpringResourceLoader.html}           |   26 +-
 .../class-use/VelocityEngineFactory.html}          |   41 +-
 .../class-use/VelocityEngineFactoryBean.html}      |   26 +-
 .../class-use/VelocityEngineUtils.html}            |   26 +-
 .../org/apache/velocity/spring/package-frame.html  |   24 +
 .../{script => spring}/package-summary.html        |   45 +-
 .../velocity/{app => spring}/package-tree.html     |   38 +-
 .../velocity/{script => spring}/package-use.html   |   28 +-
 .../org/apache/velocity/util/ArrayIterator.html    |   12 +-
 .../org/apache/velocity/util/ArrayListWrapper.html |   12 +-
 .../org/apache/velocity/util/ClassUtils.html       |   26 +-
 .../org/apache/velocity/util/ContextAware.html     |   12 +-
 .../util/DeprecationAwareExtProperties.html        |   10 +-
 .../org/apache/velocity/util/DuckType.Types.html   |   10 +-
 .../apidocs/org/apache/velocity/util/DuckType.html |   14 +-
 .../apache/velocity/util/EnumerationIterator.html  |   12 +-
 .../org/apache/velocity/util/ExtProperties.html    |   14 +-
 .../apache/velocity/util/RuntimeServicesAware.html |   12 +-
 .../org/apache/velocity/util/SimplePool.html       |   12 +-
 .../apache/velocity/util/StringBuilderWriter.html  |   10 +-
 .../org/apache/velocity/util/StringUtils.html      |   12 +-
 .../org/apache/velocity/util/TemplateBoolean.html  |   10 +-
 .../org/apache/velocity/util/TemplateNumber.html   |   10 +-
 .../org/apache/velocity/util/TemplateString.html   |   10 +-
 .../velocity/util/class-use/ArrayIterator.html     |   10 +-
 .../velocity/util/class-use/ArrayListWrapper.html  |   10 +-
 .../apache/velocity/util/class-use/ClassUtils.html |   10 +-
 .../velocity/util/class-use/ContextAware.html      |   10 +-
 .../class-use/DeprecationAwareExtProperties.html   |   10 +-
 .../velocity/util/class-use/DuckType.Types.html    |   12 +-
 .../apache/velocity/util/class-use/DuckType.html   |   10 +-
 .../util/class-use/EnumerationIterator.html        |   10 +-
 .../velocity/util/class-use/ExtProperties.html     |   74 +-
 .../util/class-use/RuntimeServicesAware.html       |   10 +-
 .../apache/velocity/util/class-use/SimplePool.html |   10 +-
 .../util/class-use/StringBuilderWriter.html        |   10 +-
 .../velocity/util/class-use/StringUtils.html       |   10 +-
 .../velocity/util/class-use/TemplateBoolean.html   |   10 +-
 .../velocity/util/class-use/TemplateNumber.html    |   10 +-
 .../velocity/util/class-use/TemplateString.html    |   10 +-
 .../AbstractChainableUberspector.html              |   10 +-
 .../util/introspection/ChainableUberspector.html   |   10 +-
 .../velocity/util/introspection/ClassFieldMap.html |   18 +-
 .../velocity/util/introspection/ClassMap.html      |   24 +-
 .../util/introspection/ConversionHandler.html      |   34 +-
 .../velocity/util/introspection/Converter.html     |   12 +-
 .../introspection/DeprecatedCheckUberspector.html  |   10 +-
 .../apache/velocity/util/introspection/Info.html   |   12 +-
 .../util/introspection/IntrospectionCacheData.html |   16 +-
 .../util/introspection/IntrospectionUtils.html     |   30 +-
 .../velocity/util/introspection/Introspector.html  |   16 +-
 .../util/introspection/IntrospectorBase.html       |   20 +-
 .../util/introspection/IntrospectorCache.html      |   24 +-
 .../util/introspection/LinkingUberspector.html     |   10 +-
 .../MethodMap.AmbiguousException.html              |   10 +-
 .../velocity/util/introspection/MethodMap.html     |   16 +-
 .../introspection/SecureIntrospectorControl.html   |   16 +-
 .../util/introspection/SecureIntrospectorImpl.html |   20 +-
 .../util/introspection/SecureUberspector.html      |   12 +-
 .../util/introspection/TypeConversionHandler.html  |   30 +-
 .../introspection/TypeConversionHandlerImpl.html   |   30 +-
 .../velocity/util/introspection/Uberspect.html     |   12 +-
 .../introspection/UberspectImpl.VelGetterImpl.html |   10 +-
 .../introspection/UberspectImpl.VelMethodImpl.html |   20 +-
 .../introspection/UberspectImpl.VelSetterImpl.html |   10 +-
 .../velocity/util/introspection/UberspectImpl.html |   14 +-
 .../util/introspection/UberspectPublicFields.html  |   10 +-
 .../velocity/util/introspection/VelMethod.html     |   16 +-
 .../util/introspection/VelPropertyGet.html         |   12 +-
 .../util/introspection/VelPropertySet.html         |   12 +-
 .../class-use/AbstractChainableUberspector.html    |   10 +-
 .../class-use/ChainableUberspector.html            |   10 +-
 .../introspection/class-use/ClassFieldMap.html     |   12 +-
 .../util/introspection/class-use/ClassMap.html     |   14 +-
 .../introspection/class-use/ConversionHandler.html |   10 +-
 .../util/introspection/class-use/Converter.html    |   36 +-
 .../class-use/DeprecatedCheckUberspector.html      |   10 +-
 .../util/introspection/class-use/Info.html         |  164 +-
 .../class-use/IntrospectionCacheData.html          |   10 +-
 .../class-use/IntrospectionUtils.html              |   10 +-
 .../util/introspection/class-use/Introspector.html |   40 +-
 .../introspection/class-use/IntrospectorBase.html  |   10 +-
 .../introspection/class-use/IntrospectorCache.html |   10 +-
 .../class-use/LinkingUberspector.html              |   10 +-
 .../class-use/MethodMap.AmbiguousException.html    |   12 +-
 .../util/introspection/class-use/MethodMap.html    |   10 +-
 .../class-use/SecureIntrospectorControl.html       |   10 +-
 .../class-use/SecureIntrospectorImpl.html          |   10 +-
 .../introspection/class-use/SecureUberspector.html |   10 +-
 .../class-use/TypeConversionHandler.html           |   12 +-
 .../class-use/TypeConversionHandlerImpl.html       |   10 +-
 .../util/introspection/class-use/Uberspect.html    |   22 +-
 .../class-use/UberspectImpl.VelGetterImpl.html     |   10 +-
 .../class-use/UberspectImpl.VelMethodImpl.html     |   10 +-
 .../class-use/UberspectImpl.VelSetterImpl.html     |   10 +-
 .../introspection/class-use/UberspectImpl.html     |   10 +-
 .../class-use/UberspectPublicFields.html           |   10 +-
 .../util/introspection/class-use/VelMethod.html    |   42 +-
 .../introspection/class-use/VelPropertyGet.html    |   40 +-
 .../introspection/class-use/VelPropertySet.html    |   38 +-
 .../velocity/util/introspection/package-frame.html |    7 +-
 .../util/introspection/package-summary.html        |   16 +-
 .../velocity/util/introspection/package-tree.html  |   10 +-
 .../velocity/util/introspection/package-use.html   |   10 +-
 .../org/apache/velocity/util/package-frame.html    |    6 +-
 .../org/apache/velocity/util/package-summary.html  |   14 +-
 .../org/apache/velocity/util/package-tree.html     |   14 +-
 .../org/apache/velocity/util/package-use.html      |   35 +-
 engine/devel/apidocs/overview-frame.html           |    7 +-
 engine/devel/apidocs/overview-summary.html         |   18 +-
 engine/devel/apidocs/overview-tree.html            |   20 +-
 engine/devel/apidocs/package-list                  |    1 +
 engine/devel/apidocs/serialized-form.html          |   36 +-
 engine/devel/developer-guide.html                  |    2 +-
 engine/devel/index.html                            |    2 +-
 engine/devel/left.nav                              |   37 -
 engine/index.html                                  |    9 +-
 get-involved.html                                  |    4 +-
 how-it-works.html                                  |    4 +-
 index.html                                         |   14 +-
 left.nav                                           |   37 -
 news.html                                          |   39 +-
 news.xml                                           |   52 +
 release-process.html                               |  102 +-
 rss/news.rss                                       |   20 +
 site-building.html                                 |   57 +-
 texen/index.html                                   |    4 +-
 tools/2.0/index.html                               |    5 +-
 tools/2.0/left.nav                                 |   28 -
 tools/3.0/index.html                               |    7 +-
 tools/3.0/left.nav                                 |   24 -
 tools/3.1/generic.html                             |    2 +-
 tools/3.1/index.html                               |   29 +-
 tools/3.1/left.nav                                 |   24 -
 tools/3.1/view.html                                |    2 +-
 tools/devel/apidocs/allclasses-frame.html          |   14 +-
 tools/devel/apidocs/allclasses-noframe.html        |   14 +-
 tools/devel/apidocs/constant-values.html           |  356 ++--
 tools/devel/apidocs/deprecated-list.html           |  179 +-
 tools/devel/apidocs/help-doc.html                  |   10 +-
 tools/devel/apidocs/index-all.html                 | 1360 ++++++++-----
 tools/devel/apidocs/index.html                     |    4 +-
 .../org/apache/velocity/tools/ClassUtils.html      |  436 ++--
 .../org/apache/velocity/tools/ConversionUtils.html |  414 ++--
 .../apidocs/org/apache/velocity/tools/Scope.html   |   42 +-
 .../org/apache/velocity/tools/ToolContext.html     |  160 +-
 .../org/apache/velocity/tools/ToolInfo.html        |  391 +++-
 .../org/apache/velocity/tools/ToolManager.html     |  273 ++-
 .../apidocs/org/apache/velocity/tools/Toolbox.html |  132 +-
 .../org/apache/velocity/tools/ToolboxFactory.html  |   76 +-
 .../org/apache/velocity/tools/XmlUtils.html        |  271 ++-
 .../velocity/tools/class-use/ClassUtils.html       |   65 +-
 .../velocity/tools/class-use/ConversionUtils.html  |   10 +-
 .../org/apache/velocity/tools/class-use/Scope.html |   10 +-
 .../velocity/tools/class-use/ToolContext.html      |   29 +-
 .../apache/velocity/tools/class-use/ToolInfo.html  |   24 +-
 .../velocity/tools/class-use/ToolManager.html      |   10 +-
 .../apache/velocity/tools/class-use/Toolbox.html   |   36 +-
 .../velocity/tools/class-use/ToolboxFactory.html   |   10 +-
 .../apache/velocity/tools/class-use/XmlUtils.html  |   10 +-
 .../tools/config/CompoundConfiguration.html        |   44 +-
 .../velocity/tools/config/Configuration.html       |   70 +-
 .../tools/config/ConfigurationCleaner.html         |   18 +-
 .../tools/config/ConfigurationException.html       |   92 +-
 .../velocity/tools/config/ConfigurationUtils.html  |  148 +-
 .../velocity/tools/config/Data.AutoConverter.html  |   34 +-
 .../velocity/tools/config/Data.FieldConverter.html |   28 +-
 .../tools/config/Data.NumberConverter.html         |   28 +-
 .../apache/velocity/tools/config/Data.Type.html    |   46 +-
 .../org/apache/velocity/tools/config/Data.html     |  108 +-
 .../apache/velocity/tools/config/DefaultKey.html   |   22 +-
 .../config/EasyFactoryConfiguration.EasyData.html  |   38 +-
 .../config/EasyFactoryConfiguration.EasyWrap.html  |   54 +-
 .../tools/config/EasyFactoryConfiguration.html     |  114 +-
 .../tools/config/FactoryConfiguration.html         |  143 +-
 .../tools/config/FileFactoryConfiguration.html     |  116 +-
 .../apache/velocity/tools/config/InvalidScope.html |   22 +-
 .../tools/config/InvalidScopeException.html        |   28 +-
 .../velocity/tools/config/NullKeyException.html    |   28 +-
 .../config/PropertiesFactoryConfiguration.html     |   52 +-
 .../org/apache/velocity/tools/config/Property.html |   26 +-
 .../apache/velocity/tools/config/SkipSetters.html  |   18 +-
 .../velocity/tools/config/ToolConfiguration.html   |  201 +-
 .../tools/config/ToolboxConfiguration.html         |   50 +-
 .../apache/velocity/tools/config/ValidScope.html   |   22 +-
 .../tools/config/XmlFactoryConfiguration.html      |   67 +-
 ...ryConfigurationRuleSet.DataValueInBodyRule.html |   32 +-
 ...ConfigurationRuleSet.PropertyAttributeRule.html |   32 +-
 .../config/XmlFactoryConfigurationRuleSet.html     |   48 +-
 .../config/class-use/CompoundConfiguration.html    |   13 +-
 .../tools/config/class-use/Configuration.html      |   25 +-
 .../config/class-use/ConfigurationCleaner.html     |   10 +-
 .../config/class-use/ConfigurationException.html   |   10 +-
 .../tools/config/class-use/ConfigurationUtils.html |   10 +-
 .../tools/config/class-use/Data.AutoConverter.html |   10 +-
 .../config/class-use/Data.FieldConverter.html      |   10 +-
 .../config/class-use/Data.NumberConverter.html     |   10 +-
 .../velocity/tools/config/class-use/Data.Type.html |   18 +-
 .../velocity/tools/config/class-use/Data.html      |   34 +-
 .../tools/config/class-use/DefaultKey.html         |   38 +-
 .../EasyFactoryConfiguration.EasyData.html         |   24 +-
 .../EasyFactoryConfiguration.EasyWrap.html         |   42 +-
 .../config/class-use/EasyFactoryConfiguration.html |   36 +-
 .../config/class-use/FactoryConfiguration.html     |   57 +-
 .../config/class-use/FileFactoryConfiguration.html |   10 +-
 .../tools/config/class-use/InvalidScope.html       |   10 +-
 .../config/class-use/InvalidScopeException.html    |   10 +-
 .../tools/config/class-use/NullKeyException.html   |   10 +-
 .../class-use/PropertiesFactoryConfiguration.html  |   10 +-
 .../velocity/tools/config/class-use/Property.html  |   16 +-
 .../tools/config/class-use/SkipSetters.html        |   10 +-
 .../tools/config/class-use/ToolConfiguration.html  |   28 +-
 .../config/class-use/ToolboxConfiguration.html     |   18 +-
 .../tools/config/class-use/ValidScope.html         |   28 +-
 .../config/class-use/XmlFactoryConfiguration.html  |   10 +-
 ...ryConfigurationRuleSet.DataValueInBodyRule.html |   10 +-
 ...ConfigurationRuleSet.PropertyAttributeRule.html |   10 +-
 .../class-use/XmlFactoryConfigurationRuleSet.html  |   10 +-
 .../velocity/tools/config/package-frame.html       |    6 +-
 .../velocity/tools/config/package-summary.html     |   19 +-
 .../apache/velocity/tools/config/package-tree.html |   38 +-
 .../apache/velocity/tools/config/package-use.html  |   15 +-
 .../apache/velocity/tools/generic/Alternator.html  |   60 +-
 .../velocity/tools/generic/AlternatorTool.html     |   67 +-
 .../tools/generic/ClassTool.CallableSub.html       |   82 +-
 .../tools/generic/ClassTool.ConstructorSub.html    |   63 +-
 .../velocity/tools/generic/ClassTool.FieldSub.html |   83 +-
 .../tools/generic/ClassTool.MethodSub.html         |   83 +-
 .../velocity/tools/generic/ClassTool.Sub.html      |  144 +-
 .../apache/velocity/tools/generic/ClassTool.html   |  285 ++-
 .../CollectionTool.PropertiesComparator.html       |   48 +-
 .../velocity/tools/generic/CollectionTool.html     |  296 ++-
 .../generic/ComparisonDateTool.Comparison.html     |  240 ++-
 .../velocity/tools/generic/ComparisonDateTool.html |  413 ++--
 .../apache/velocity/tools/generic/ContextTool.html |   97 +-
 .../velocity/tools/generic/ConversionTool.html     |  475 +++--
 .../apache/velocity/tools/generic/DateTool.html    |  796 +++++---
 .../tools/generic/DisplayTool.Measurements.html    |   28 +-
 .../apache/velocity/tools/generic/DisplayTool.html |  451 +++--
 .../apache/velocity/tools/generic/EscapeTool.html  |  193 +-
 .../tools/generic/FieldTool.FieldToolSub.html      |   36 +-
 .../tools/generic/FieldTool.MutableField.html      |   32 +-
 .../apache/velocity/tools/generic/FieldTool.html   |  139 +-
 .../velocity/tools/generic/FormatConfig.html       |   40 +-
 ...Support.SafeClosingHttpURLConnectionReader.html |   84 +-
 .../velocity/tools/generic/ImportSupport.html      |  155 +-
 .../apache/velocity/tools/generic/ImportTool.html  |   45 +-
 .../apache/velocity/tools/generic/JsonContent.html |  141 +-
 .../apache/velocity/tools/generic/JsonTool.html    |  121 +-
 .../apache/velocity/tools/generic/LinkTool.html    |  769 +++++---
 .../velocity/tools/generic/LocaleConfig.html       |   56 +-
 .../org/apache/velocity/tools/generic/LogTool.html |   45 +-
 .../velocity/tools/generic/LoopTool.Action.html    |   34 +-
 .../tools/generic/LoopTool.ActionCondition.html    |   28 +-
 .../tools/generic/LoopTool.Comparison.html         |   26 +-
 .../velocity/tools/generic/LoopTool.Condition.html |   14 +-
 .../velocity/tools/generic/LoopTool.Equals.html    |   24 +-
 .../tools/generic/LoopTool.ManagedIterator.html    |  239 +--
 .../tools/generic/LoopTool.SyncedIterator.html     |   35 +-
 .../apache/velocity/tools/generic/LoopTool.html    |  284 ++-
 .../velocity/tools/generic/MarkupTool.Tag.html     |  193 +-
 .../apache/velocity/tools/generic/MarkupTool.html  |   63 +-
 .../apache/velocity/tools/generic/MathTool.html    |  447 +++--
 .../apache/velocity/tools/generic/NumberTool.html  |  194 +-
 .../apache/velocity/tools/generic/RenderTool.html  |  120 +-
 .../velocity/tools/generic/ResourceTool.Key.html   |   84 +-
 .../velocity/tools/generic/ResourceTool.html       |  216 +-
 .../apache/velocity/tools/generic/SafeConfig.html  |   76 +-
 .../apache/velocity/tools/generic/SortTool.html    |   26 +-
 .../apache/velocity/tools/generic/ValueParser.html |  463 +++--
 .../tools/generic/XmlTool.NodeIterator.html        |   36 +-
 .../org/apache/velocity/tools/generic/XmlTool.html |  326 ++-
 .../tools/generic/class-use/Alternator.html        |   18 +-
 .../tools/generic/class-use/AlternatorTool.html    |   10 +-
 .../generic/class-use/ClassTool.CallableSub.html   |   14 +-
 .../class-use/ClassTool.ConstructorSub.html        |   16 +-
 .../generic/class-use/ClassTool.FieldSub.html      |   16 +-
 .../generic/class-use/ClassTool.MethodSub.html     |   16 +-
 .../tools/generic/class-use/ClassTool.Sub.html     |   16 +-
 .../tools/generic/class-use/ClassTool.html         |   22 +-
 .../CollectionTool.PropertiesComparator.html       |   10 +-
 .../tools/generic/class-use/CollectionTool.html    |   10 +-
 .../class-use/ComparisonDateTool.Comparison.html   |   51 +-
 .../generic/class-use/ComparisonDateTool.html      |   10 +-
 .../tools/generic/class-use/ContextTool.html       |   10 +-
 .../tools/generic/class-use/ConversionTool.html    |   10 +-
 .../velocity/tools/generic/class-use/DateTool.html |   12 +-
 .../class-use/DisplayTool.Measurements.html        |   12 +-
 .../tools/generic/class-use/DisplayTool.html       |   10 +-
 .../tools/generic/class-use/EscapeTool.html        |   10 +-
 .../generic/class-use/FieldTool.FieldToolSub.html  |   26 +-
 .../generic/class-use/FieldTool.MutableField.html  |   10 +-
 .../tools/generic/class-use/FieldTool.html         |   10 +-
 .../tools/generic/class-use/FormatConfig.html      |   16 +-
 ...Support.SafeClosingHttpURLConnectionReader.html |   10 +-
 .../tools/generic/class-use/ImportSupport.html     |   16 +-
 .../tools/generic/class-use/ImportTool.html        |   10 +-
 .../tools/generic/class-use/JsonContent.html       |   10 +-
 .../velocity/tools/generic/class-use/JsonTool.html |   20 +-
 .../velocity/tools/generic/class-use/LinkTool.html |   75 +-
 .../tools/generic/class-use/LocaleConfig.html      |   26 +-
 .../velocity/tools/generic/class-use/LogTool.html  |   10 +-
 .../tools/generic/class-use/LoopTool.Action.html   |   12 +-
 .../class-use/LoopTool.ActionCondition.html        |   10 +-
 .../generic/class-use/LoopTool.Comparison.html     |   10 +-
 .../generic/class-use/LoopTool.Condition.html      |   10 +-
 .../tools/generic/class-use/LoopTool.Equals.html   |   10 +-
 .../class-use/LoopTool.ManagedIterator.html        |   36 +-
 .../generic/class-use/LoopTool.SyncedIterator.html |   10 +-
 .../velocity/tools/generic/class-use/LoopTool.html |   14 +-
 .../tools/generic/class-use/MarkupTool.Tag.html    |   34 +-
 .../tools/generic/class-use/MarkupTool.html        |   10 +-
 .../velocity/tools/generic/class-use/MathTool.html |   10 +-
 .../tools/generic/class-use/NumberTool.html        |   10 +-
 .../tools/generic/class-use/RenderTool.html        |   10 +-
 .../tools/generic/class-use/ResourceTool.Key.html  |   48 +-
 .../tools/generic/class-use/ResourceTool.html      |   10 +-
 .../tools/generic/class-use/SafeConfig.html        |   77 +-
 .../velocity/tools/generic/class-use/SortTool.html |   10 +-
 .../tools/generic/class-use/ValueParser.html       |  134 +-
 .../generic/class-use/XmlTool.NodeIterator.html    |   10 +-
 .../velocity/tools/generic/class-use/XmlTool.html  |   48 +-
 .../velocity/tools/generic/package-frame.html      |    6 +-
 .../velocity/tools/generic/package-summary.html    |   34 +-
 .../velocity/tools/generic/package-tree.html       |   66 +-
 .../apache/velocity/tools/generic/package-use.html |   64 +-
 .../org/apache/velocity/tools/package-frame.html   |    6 +-
 .../org/apache/velocity/tools/package-summary.html |   10 +-
 .../org/apache/velocity/tools/package-tree.html    |   16 +-
 .../org/apache/velocity/tools/package-use.html     |   25 +-
 .../view/AbstractSearchTool.StoredResults.html     |   46 +-
 .../velocity/tools/view/AbstractSearchTool.html    |   76 +-
 .../view/BreadcrumbTool.NavigationElement.html     |  160 +-
 .../apache/velocity/tools/view/BreadcrumbTool.html |  592 ++++++
 .../apache/velocity/tools/view/BrowserTool.html    |  101 +-
 .../tools/view/BrowserToolDeprecatedMethods.html   |  388 ++--
 .../tools/view/CookieTool.SugarCookie.html         |   60 +-
 .../org/apache/velocity/tools/view/CookieTool.html |  100 +-
 .../org/apache/velocity/tools/view/ImportTool.html |   34 +-
 .../apache/velocity/tools/view/IncludeTool.html    |   90 +-
 .../org/apache/velocity/tools/view/JeeConfig.html  |   30 +-
 .../velocity/tools/view/JeeContextConfig.html      |   38 +-
 .../velocity/tools/view/JeeFilterConfig.html       |   38 +-
 .../velocity/tools/view/JeeServletConfig.html      |   38 +-
 .../org/apache/velocity/tools/view/JsonTool.html   |   58 +-
 .../org/apache/velocity/tools/view/LinkTool.html   |   90 +-
 .../org/apache/velocity/tools/view/PagerTool.html  |  144 +-
 .../apache/velocity/tools/view/ParameterTool.html  |   67 +-
 .../apache/velocity/tools/view/ServletUtils.html   |  244 ++-
 .../velocity/tools/view/UAParser.DeviceType.html   |   34 +-
 .../velocity/tools/view/UAParser.UAEntity.html     |   50 +-
 .../velocity/tools/view/UAParser.UserAgent.html    |   58 +-
 .../org/apache/velocity/tools/view/UAParser.html   |   22 +-
 .../tools/view/UiDependencyTool.FileRule.html      |   48 +-
 .../tools/view/UiDependencyTool.Group.html         |   38 +-
 .../tools/view/UiDependencyTool.GroupRule.html     |   44 +-
 .../tools/view/UiDependencyTool.NeedsRule.html     |   32 +-
 .../tools/view/UiDependencyTool.TypeRule.html      |   48 +-
 .../velocity/tools/view/UiDependencyTool.html      |  258 ++-
 .../velocity/tools/view/VelocityLayoutServlet.html |  138 +-
 .../apache/velocity/tools/view/VelocityView.html   |  216 +-
 .../velocity/tools/view/VelocityViewFilter.html    |   62 +-
 .../velocity/tools/view/VelocityViewServlet.html   |  241 ++-
 .../apache/velocity/tools/view/ViewContext.html    |   91 +-
 .../velocity/tools/view/ViewContextTool.html       |   30 +-
 .../ViewImportSupport.ImportResponseWrapper.html   |   40 +-
 ...Support.SafeClosingHttpURLConnectionReader.html |   84 +-
 .../velocity/tools/view/ViewImportSupport.html     |   99 +-
 .../velocity/tools/view/ViewToolContext.html       |  128 +-
 .../velocity/tools/view/ViewToolManager.html       |  149 +-
 .../velocity/tools/view/WebappResourceLoader.html  |   36 +-
 .../WebappUberspector.GetAttributeExecutor.html    |   54 +-
 .../WebappUberspector.SetAttributeExecutor.html    |   71 +-
 .../velocity/tools/view/WebappUberspector.html     |   50 +-
 .../org/apache/velocity/tools/view/XmlTool.html    |   22 +-
 .../AbstractSearchTool.StoredResults.html          |   10 +-
 .../tools/view/class-use/AbstractSearchTool.html   |   54 +-
 ....html => BreadcrumbTool.NavigationElement.html} |   62 +-
 .../{BrowserTool.html => BreadcrumbTool.html}      |   26 +-
 .../velocity/tools/view/class-use/BrowserTool.html |   10 +-
 .../class-use/BrowserToolDeprecatedMethods.html    |   10 +-
 .../view/class-use/CookieTool.SugarCookie.html     |   24 +-
 .../velocity/tools/view/class-use/CookieTool.html  |   10 +-
 .../velocity/tools/view/class-use/ImportTool.html  |   10 +-
 .../velocity/tools/view/class-use/IncludeTool.html |   10 +-
 .../velocity/tools/view/class-use/JeeConfig.html   |   10 +-
 .../tools/view/class-use/JeeContextConfig.html     |   10 +-
 .../tools/view/class-use/JeeFilterConfig.html      |   10 +-
 .../tools/view/class-use/JeeServletConfig.html     |   10 +-
 .../velocity/tools/view/class-use/JsonTool.html    |   10 +-
 .../velocity/tools/view/class-use/LinkTool.html    |   41 +-
 .../velocity/tools/view/class-use/PagerTool.html   |   34 +-
 .../tools/view/class-use/ParameterTool.html        |   10 +-
 .../tools/view/class-use/ServletUtils.html         |   10 +-
 .../tools/view/class-use/UAParser.DeviceType.html  |   12 +-
 .../tools/view/class-use/UAParser.UAEntity.html    |   34 +-
 .../tools/view/class-use/UAParser.UserAgent.html   |   12 +-
 .../velocity/tools/view/class-use/UAParser.html    |   10 +-
 .../view/class-use/UiDependencyTool.FileRule.html  |   10 +-
 .../view/class-use/UiDependencyTool.Group.html     |   14 +-
 .../view/class-use/UiDependencyTool.GroupRule.html |   10 +-
 .../view/class-use/UiDependencyTool.NeedsRule.html |   10 +-
 .../view/class-use/UiDependencyTool.TypeRule.html  |   10 +-
 .../tools/view/class-use/UiDependencyTool.html     |   20 +-
 .../view/class-use/VelocityLayoutServlet.html      |   52 +-
 .../tools/view/class-use/VelocityView.html         |   10 +-
 .../tools/view/class-use/VelocityViewFilter.html   |   10 +-
 .../tools/view/class-use/VelocityViewServlet.html  |   32 +-
 .../velocity/tools/view/class-use/ViewContext.html |   12 +-
 .../tools/view/class-use/ViewContextTool.html      |   10 +-
 .../ViewImportSupport.ImportResponseWrapper.html   |   10 +-
 ...Support.SafeClosingHttpURLConnectionReader.html |   10 +-
 .../tools/view/class-use/ViewImportSupport.html    |   10 +-
 .../tools/view/class-use/ViewToolContext.html      |   10 +-
 .../tools/view/class-use/ViewToolManager.html      |   10 +-
 .../tools/view/class-use/WebappResourceLoader.html |   10 +-
 .../WebappUberspector.GetAttributeExecutor.html    |   10 +-
 .../WebappUberspector.SetAttributeExecutor.html    |   10 +-
 .../tools/view/class-use/WebappUberspector.html    |   10 +-
 .../velocity/tools/view/class-use/XmlTool.html     |   10 +-
 .../velocity/tools/view/jsp/JspToolContext.html    |   44 +-
 .../velocity/tools/view/jsp/VelocityViewTag.html   |  130 +-
 .../tools/view/jsp/class-use/JspToolContext.html   |   10 +-
 .../tools/view/jsp/class-use/VelocityViewTag.html  |   10 +-
 .../jspimpl/ExternalWriterHttpServletResponse.html |   24 +-
 .../velocity/tools/view/jsp/jspimpl/JspUtils.html  |   22 +-
 .../tools/view/jsp/jspimpl/JspWriterImpl.html      |  202 +-
 .../view/jsp/jspimpl/VelocityBodyContent.html      |  162 +-
 .../view/jsp/jspimpl/VelocityJspFragment.html      |   24 +-
 .../view/jsp/jspimpl/VelocityPageContext.html      |  134 +-
 .../jsp/jspimpl/VelocityToolsJspException.html     |   46 +-
 .../ExternalWriterHttpServletResponse.html         |   10 +-
 .../tools/view/jsp/jspimpl/class-use/JspUtils.html |   10 +-
 .../view/jsp/jspimpl/class-use/JspWriterImpl.html  |   10 +-
 .../jsp/jspimpl/class-use/VelocityBodyContent.html |   10 +-
 .../jsp/jspimpl/class-use/VelocityJspFragment.html |   10 +-
 .../jsp/jspimpl/class-use/VelocityPageContext.html |   10 +-
 .../class-use/VelocityToolsJspException.html       |   10 +-
 .../tools/view/jsp/jspimpl/package-frame.html      |    6 +-
 .../tools/view/jsp/jspimpl/package-summary.html    |   10 +-
 .../tools/view/jsp/jspimpl/package-tree.html       |   20 +-
 .../tools/view/jsp/jspimpl/package-use.html        |   10 +-
 .../velocity/tools/view/jsp/package-frame.html     |    6 +-
 .../velocity/tools/view/jsp/package-summary.html   |   10 +-
 .../velocity/tools/view/jsp/package-tree.html      |   14 +-
 .../velocity/tools/view/jsp/package-use.html       |   10 +-
 .../apache/velocity/tools/view/package-frame.html  |    8 +-
 .../velocity/tools/view/package-summary.html       |   22 +-
 .../apache/velocity/tools/view/package-tree.html   |   46 +-
 .../apache/velocity/tools/view/package-use.html    |  112 +-
 tools/devel/apidocs/overview-frame.html            |   10 +-
 tools/devel/apidocs/overview-summary.html          |   28 +-
 tools/devel/apidocs/overview-tree.html             |  129 +-
 tools/devel/apidocs/package-list                   |    4 +
 tools/devel/apidocs/serialized-form.html           |  570 +++++-
 tools/devel/generic.html                           |    2 +-
 tools/devel/index.html                             |   29 +-
 tools/devel/left.nav                               |   24 -
 tools/devel/view.html                              |    2 +-
 tools/index.html                                   |    9 +-
 who-we-are.html                                    |    4 +-
 958 files changed, 22394 insertions(+), 17242 deletions(-)

diff --git a/anakia/index.html b/anakia/index.html
index a069761..6095bde 100644
--- a/anakia/index.html
+++ b/anakia/index.html
@@ -162,8 +162,8 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
 </ul>
 <h2 id="releases">Releases<a class="headerlink" href="#releases" title="Permanent link">&para;</a></h2>
 <ul>
-<li><a href="/engine/2.2">Engine 2.2</a></li>
-<li><a href="/tools/3.0">Tools 3.0</a></li>
+<li><a href="/engine/2.3">Engine 2.3</a></li>
+<li><a href="/tools/3.1">Tools 3.1</a></li>
 </ul>
 <h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h2>
 <ul>
diff --git a/contact.html b/contact.html
index 295995c..9fc6271 100644
--- a/contact.html
+++ b/contact.html
@@ -162,8 +162,8 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
 </ul>
 <h2 id="releases">Releases<a class="headerlink" href="#releases" title="Permanent link">&para;</a></h2>
 <ul>
-<li><a href="/engine/2.2">Engine 2.2</a></li>
-<li><a href="/tools/3.0">Tools 3.0</a></li>
+<li><a href="/engine/2.3">Engine 2.3</a></li>
+<li><a href="/tools/3.1">Tools 3.1</a></li>
 </ul>
 <h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h2>
 <ul>
diff --git a/css/site.css b/css/site.css
index 5ad5af9..cff1c1e 100644
--- a/css/site.css
+++ b/css/site.css
@@ -126,20 +126,30 @@ h1
 
 h2
 {
-    font-size: 1.2em;
+    font-size: 1.3em;
 }
 
 h3
 {
-    font-size: 1em;
+    font-size: 1.2em;
+}
+
+h3::before
+{
+    content: '> ';
 }
 
 h4
 {
-    font-size: 1em;
-    font-weight: 300;
+    font-size: 1.1em;
 }
 
+h4::before
+{
+    content: '>> ';
+}
+
+
 hr
 {
     margin-top: 1em;
@@ -453,6 +463,11 @@ table.conversions th
     word-wrap: no;
 }
 
+.smalltable td, .smalltable th
+{
+    text-align: left;
+}
+
 .blue
 {
     color: blue;
diff --git a/docbook/index.html b/docbook/index.html
index ba3233b..2fbc316 100644
--- a/docbook/index.html
+++ b/docbook/index.html
@@ -162,8 +162,8 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
 </ul>
 <h2 id="releases">Releases<a class="headerlink" href="#releases" title="Permanent link">&para;</a></h2>
 <ul>
-<li><a href="/engine/2.2">Engine 2.2</a></li>
-<li><a href="/tools/3.0">Tools 3.0</a></li>
+<li><a href="/engine/2.3">Engine 2.3</a></li>
+<li><a href="/tools/3.1">Tools 3.1</a></li>
 </ul>
 <h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h2>
 <ul>
diff --git a/download.html b/download.html
index 026ce6e..f89c603 100644
--- a/download.html
+++ b/download.html
@@ -162,8 +162,8 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
 </ul>
 <h2 id="releases">Releases<a class="headerlink" href="#releases" title="Permanent link">&para;</a></h2>
 <ul>
-<li><a href="/engine/2.2">Engine 2.2</a></li>
-<li><a href="/tools/3.0">Tools 3.0</a></li>
+<li><a href="/engine/2.3">Engine 2.3</a></li>
+<li><a href="/tools/3.1">Tools 3.1</a></li>
 </ul>
 <h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h2>
 <ul>
@@ -226,6 +226,49 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
 <h2 id="downloads">Downloads<a class="headerlink" href="#downloads" title="Permanent link">&para;</a></h2>
 <p>You can download sources and binaries for all Apache Velocity projects from here.</p>
+<div class="toc">
+<ul>
+<li><a href="#downloads">Downloads</a><ul>
+<li><a href="#mirror-selection">Mirror Selection</a></li>
+</ul>
+</li>
+<li><a href="#production-releases">Production releases</a><ul>
+<li><a href="#velocity-engine-23">Velocity Engine 2.3</a><ul>
+<li><a href="#modules">Modules</a></li>
+<li><a href="#inclusion-as-a-maven-dependency">Inclusion as a maven dependency</a></li>
+<li><a href="#binaries">Binaries</a></li>
+<li><a href="#pom-files">POM Files</a></li>
+<li><a href="#javadoc">Javadoc</a></li>
+<li><a href="#sources">Sources</a></li>
+<li><a href="#examples">Examples</a></li>
+</ul>
+</li>
+<li><a href="#velocity-tools-31">Velocity Tools 3.1</a><ul>
+<li><a href="#modules_1">Modules</a></li>
+<li><a href="#inclusion-as-a-maven-dependency_1">Inclusion as a maven dependency</a></li>
+<li><a href="#binaries_1">Binaries</a></li>
+<li><a href="#pom-files_1">POM Files</a></li>
+<li><a href="#javadoc_1">Javadoc</a></li>
+<li><a href="#sources_1">Sources</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a href="#alphabeta-releases">Alpha/Beta Releases</a><ul>
+<li><a href="#engine">Engine</a></li>
+<li><a href="#tools">Tools</a></li>
+</ul>
+</li>
+<li><a href="#archived-components-releases">Archived Components Releases</a><ul>
+<li><a href="#anakia">Anakia</a></li>
+<li><a href="#texen">Texen</a></li>
+<li><a href="#dvsl">DVSL</a></li>
+</ul>
+</li>
+<li><a href="#older-releases">Older Releases</a></li>
+<li><a href="#source-code-repository">Source Code Repository</a></li>
+</ul>
+</div>
 <h3 id="mirror-selection">Mirror Selection<a class="headerlink" href="#mirror-selection" title="Permanent link">&para;</a></h3>
 <p>[if-any logo] <a href="[link]"><img src="[logo]" align="right" border="0" alt="logo" /></a>[end]
 The currently selected mirror is <b>[preferred]</b>. If you encounter a problem with this mirror, please select another mirror. If all mirrors are failing, there are <i>backup</i> mirrors (at the end of the mirrors list) that should be available.</p>
@@ -236,7 +279,7 @@ The currently selected mirror is <b>[preferred]</b>. If you encounter a problem
         [if-any http]
             [for http]
             <option value="[http]">[http]</option>
-            [end]
+            [end] a
         [end]
         [if-any ftp]
             [for ftp]
@@ -260,33 +303,48 @@ The <tt>SHA</tt> links download the checksum from the main site. None of these s
 <p><a href="https://www.apache.org/dist/velocity/KEYS">KEYS</a></p>
 <h2 id="production-releases">Production releases<a class="headerlink" href="#production-releases" title="Permanent link">&para;</a></h2>
 <p>These releases are considered stable and suitable for production.</p>
-<h3 id="engine">Engine<a class="headerlink" href="#engine" title="Permanent link">&para;</a></h3>
-<p>Be sure to check the <a href="https://www.apache.org/dist/velocity/engine/2.2/release-notes.html">release notes</a> and the <a href="https://velocity.apache.org/engine/2.2/dependencies.html">dependencies</a>.</p>
+<h3 id="velocity-engine-23">Velocity Engine 2.3<a class="headerlink" href="#velocity-engine-23" title="Permanent link">&para;</a></h3>
+<p>Be sure to check the <a href="https://www.apache.org/dist/velocity/engine/2.3/release-notes.html">release notes</a> and the <a href="https://velocity.apache.org/engine/2.3/dependencies.html">dependencies</a>.</p>
+<h4 id="modules">Modules<a class="headerlink" href="#modules" title="Permanent link">&para;</a></h4>
+<ul>
+<li><code>velocity-engine-core</code>, the core templating engine</li>
+<li><code>velocity-engine-scripting</code>, the JSR223 scripting engine</li>
+<li><code>spring-velocity-support</code>, Spring framework integration support classes of the engine</li>
+<li><code>velocity-engine-examples</code>, a zip file of simple examples for the engine</li>
+<li><code>velocity-custom-parser-example</code>, a <code>pom.xml</code> example demonstrating parser customization</li>
+</ul>
 <h4 id="inclusion-as-a-maven-dependency">Inclusion as a maven dependency<a class="headerlink" href="#inclusion-as-a-maven-dependency" title="Permanent link">&para;</a></h4>
 <div class="codehilite"><pre><span class="nt">&lt;dependency&gt;</span>
   <span class="nt">&lt;groupId&gt;</span>org.apache.velocity<span class="nt">&lt;/groupId&gt;</span>
   <span class="nt">&lt;artifactId&gt;</span>velocity-engine-core<span class="nt">&lt;/artifactId&gt;</span>
-  <span class="nt">&lt;version&gt;</span>2.2<span class="nt">&lt;/version&gt;</span>
+  <span class="nt">&lt;version&gt;</span>2.3<span class="nt">&lt;/version&gt;</span>
 <span class="nt">&lt;/dependency&gt;</span>
 </pre></div>
 
 
+<p>Replace <code>velocity-engine-core</code> with <code>velocity-engine-scripting</code> to include the scripting engine, or with <code>spring-velocity-support</code> to include the Spring integration support. Both will include <code>velocity-engine-core</code> as a dependency.</p>
 <h4 id="binaries">Binaries<a class="headerlink" href="#binaries" title="Permanent link">&para;</a></h4>
 <table class="smalltable">
   <thead>
   </thead>
   <tbody>
     <tr>
-      <th>engine-core</th>
-      <td><a href="[preferred]/velocity/engine/2.2/velocity-engine-core-2.2.jar">velocity-engine-core-2.2.jar</a></td>
-      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.2/velocity-engine-core-2.2.jar.asc">PGP</a>]</td>
-      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.2/velocity-engine-core-2.2.jar.sha256">SHA256</a>]</td>
+      <th>velocity-engine-core</th>
+      <td><a href="[preferred]/velocity/engine/2.3/velocity-engine-core-2.3.jar">velocity-engine-core-2.3.jar</a></td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-engine-core-2.3.jar.asc">PGP</a>]</td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-engine-core-2.3.jar.sha256">SHA256</a>]</td>
     </tr>
     <tr>
-      <th>engine-scripting</th>
-      <td><a href="[preferred]/velocity/engine/2.2/velocity-engine-scripting-2.2.jar">velocity-engine-scripting-2.2.jar</a></td>
-      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.2/velocity-engine-scripting-2.2.jar.asc">PGP</a>]</td>
-      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.2/velocity-engine-scripting-2.2.jar.sha256">SHA256</a>]</td>
+      <th>velocity-engine-scripting</th>
+      <td><a href="[preferred]/velocity/engine/2.3/velocity-engine-scripting-2.3.jar">velocity-engine-scripting-2.3.jar</a></td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-engine-scripting-2.3.jar.asc">PGP</a>]</td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-engine-scripting-2.3.jar.sha256">SHA256</a>]</td>
+    </tr>
+    <tr>
+      <th>spring-velocity-support</th>
+      <td><a href="[preferred]/velocity/engine/2.3/velocity-spring-velocity-support-2.3.jar">velocity-spring-velocity-support-2.3.jar</a></td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-spring-velocity-support-2.3.jar.asc">PGP</a>]</td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-spring-velocity-support-2.3.jar.sha256">SHA256</a>]</td>
     </tr>
   </tbody>
 </table>
@@ -297,22 +355,28 @@ The <tt>SHA</tt> links download the checksum from the main site. None of these s
   </thead>
   <tbody>
     <tr>
-      <th>engine-core</th>
-      <td><a href="[preferred]/velocity/engine/2.2/velocity-engine-core-2.2.pom">velocity-engine-core-2.2.pom</a></td>
-      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.2/velocity-engine-core-2.2.pom.asc">PGP</a>]</td>
-      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.2/velocity-engine-core-2.2.pom.sha256">SHA256</a>]</td>
+      <th>velocity-engine-core</th>
+      <td><a href="[preferred]/velocity/engine/2.3/velocity-engine-core-2.3.pom">velocity-engine-core-2.3.pom</a></td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-engine-core-2.3.pom.asc">PGP</a>]</td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-engine-core-2.3.pom.sha256">SHA256</a>]</td>
+    </tr>
+    <tr>
+      <th>velocity-engine-scripting</th>
+      <td><a href="[preferred]/velocity/engine/2.3/velocity-engine-scripting-2.3.pom">velocity-engine-scripting-2.3.pom</a></td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-engine-scripting-2.3.pom.asc">PGP</a>]</td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-engine-scripting-2.3.pom.sha256">SHA256</a>]</td>
     </tr>
     <tr>
-      <th>engine-scripting</th>
-      <td><a href="[preferred]/velocity/engine/2.2/velocity-engine-scripting-2.2.pom">velocity-engine-scripting-2.2.pom</a></td>
-      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.2/velocity-engine-scripting-2.2.pom.asc">PGP</a>]</td>
-      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.2/velocity-engine-scripting-2.2.pom.sha256">SHA256</a>]</td>
+      <th>spring-velocity-support</th>
+      <td><a href="[preferred]/velocity/engine/2.3/velocity-spring-velocity-support-2.3.pom">velocity-spring-velocity-support-2.3.pom</a></td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-spring-velocity-support-2.3.pom.asc">PGP</a>]</td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-spring-velocity-support-2.3.pom.sha256">SHA256</a>]</td>
     </tr>
     <tr>
       <th>velocity-custom-parser-example</th>
-      <td><a href="[preferred]/velocity/engine/2.2/velocity-custom-parser-example-2.2.pom">velocity-engine-scripting-2.2.pom</a></td>
-      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.2/velocity-custom-parser-example-2.2.pom.asc">PGP</a>]</td>
-      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.2/velocity-custom-parser-example-2.2.pom.sha256">SHA256</a>]</td>
+      <td><a href="[preferred]/velocity/engine/2.3/velocity-custom-parser-example-2.3.pom">velocity-engine-scripting-2.3.pom</a></td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-custom-parser-example-2.3.pom.asc">PGP</a>]</td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-custom-parser-example-2.3.pom.sha256">SHA256</a>]</td>
     </tr>
   </tbody>
 </table>
@@ -323,16 +387,22 @@ The <tt>SHA</tt> links download the checksum from the main site. None of these s
   </thead>
   <tbody>
     <tr>
-      <th>engine-core</th>
-      <td><a href="[preferred]/velocity/engine/2.2/velocity-engine-core-2.2-javadoc.jar">velocity-engine-core-2.2-javadoc.jar</a></td>
-      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.2/velocity-engine-core-2.2-javadoc.jar.asc">PGP</a>]</td>
-      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.2/velocity-engine-core-2.2-javadoc.jar.sha256">SHA256</a>]</td>
+      <th>velocity-engine-core</th>
+      <td><a href="[preferred]/velocity/engine/2.3/velocity-engine-core-2.3-javadoc.jar">velocity-engine-core-2.3-javadoc.jar</a></td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-engine-core-2.3-javadoc.jar.asc">PGP</a>]</td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-engine-core-2.3-javadoc.jar.sha256">SHA256</a>]</td>
+    </tr>
+    <tr>
+      <th>velocity-engine-scripting</th>
+      <td><a href="[preferred]/velocity/engine/2.3/velocity-engine-scripting-2.3-javadoc.jar">velocity-engine-scripting-2.3-javadoc.jar</a></td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-engine-scripting-2.3-javadoc.jar.asc">PGP</a>]</td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-engine-scripting-2.3-javadoc.jar.sha256">SHA256</a>]</td>
     </tr>
     <tr>
-      <th>engine-scripting</th>
-      <td><a href="[preferred]/velocity/engine/2.2/velocity-engine-scripting-2.2-javadoc.jar">velocity-engine-scripting-2.2-javadoc.jar</a></td>
-      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.2/velocity-engine-scripting-2.2-javadoc.jar.asc">PGP</a>]</td>
-      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.2/velocity-engine-scripting-2.2-javadoc.jar.sha256">SHA256</a>]</td>
+      <th>spring-velocity-support</th>
+      <td><a href="[preferred]/velocity/engine/2.3/velocity-spring-velocity-support-2.3-javadoc.jar">velocity-spring-velocity-support-2.3-javadoc.jar</a></td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-spring-velocity-support-2.3-javadoc.jar.asc">PGP</a>]</td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-spring-velocity-support-2.3-javadoc.jar.sha256">SHA256</a>]</td>
     </tr>
   </tbody>
 </table>
@@ -343,16 +413,22 @@ The <tt>SHA</tt> links download the checksum from the main site. None of these s
   </thead>
   <tbody>
     <tr>
-      <th>engine-core</th>
-      <td><a href="[preferred]/velocity/engine/2.2/velocity-engine-core-2.2-sources.jar">velocity-engine-core-2.2-sources.jar</a></td>
-      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.2/velocity-engine-core-2.2-sources.jar.asc">PGP</a>]</td>
-      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.2/velocity-engine-core-2.2-sources.jar.sha256">SHA256</a>]</td>
+      <th>velocity-engine-core</th>
+      <td><a href="[preferred]/velocity/engine/2.3/velocity-engine-core-2.3-sources.jar">velocity-engine-core-2.3-sources.jar</a></td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-engine-core-2.3-sources.jar.asc">PGP</a>]</td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-engine-core-2.3-sources.jar.sha256">SHA256</a>]</td>
+    </tr>
+    <tr>
+      <th>velocity-engine-scripting</th>
+      <td><a href="[preferred]/velocity/engine/2.3/velocity-engine-scripting-2.3-sources.jar">velocity-engine-scripting-2.3-sources.jar</a></td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-engine-scripting-2.3-sources.jar.asc">PGP</a>]</td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-engine-scripting-2.3-sources.jar.sha256">SHA256</a>]</td>
     </tr>
     <tr>
-      <th>engine-scripting</th>
-      <td><a href="[preferred]/velocity/engine/2.2/velocity-engine-scripting-2.2-sources.jar">velocity-engine-scripting-2.2-sources.jar</a></td>
-      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.2/velocity-engine-scripting-2.2-sources.jar.asc">PGP</a>]</td>
-      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.2/velocity-engine-scripting-2.2-sources.jar.sha256">SHA256</a>]</td>
+      <th>spring-velocity-support</th>
+      <td><a href="[preferred]/velocity/engine/2.3/velocity-spring-velocity-support-2.3-sources.jar">velocity-spring-velocity-support-2.3-sources.jar</a></td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-spring-velocity-support-2.3-sources.jar.asc">PGP</a>]</td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-spring-velocity-support-2.3-sources.jar.sha256">SHA256</a>]</td>
     </tr>
   </tbody>
 </table>
@@ -364,25 +440,32 @@ The <tt>SHA</tt> links download the checksum from the main site. None of these s
   <tbody>
     <tr>
       <th>velocity-engine-examples</th>
-      <td><a href="[preferred]/velocity/engine/2.2/velocity-engine-examples-2.2.zip">velocity-engine-examples.zip</a></td>
-      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.2/velocity-engine-examples-2.2.zip.asc">PGP</a>]</td>
-      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.2/velocity-engine-examples-2.2.zip.sha256">SHA256</a>]</td>
+      <td><a href="[preferred]/velocity/engine/2.3/velocity-engine-examples-2.3.zip">velocity-engine-examples.zip</a></td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-engine-examples-2.3.zip.asc">PGP</a>]</td>
+      <td>[<a href="https://www.apache.org/dist/velocity/engine/2.3/velocity-engine-examples-2.3.zip.sha256">SHA256</a>]</td>
     </tr>
   </tbody>
 </table>
 
-<h3 id="tools">Tools<a class="headerlink" href="#tools" title="Permanent link">&para;</a></h3>
+<h3 id="velocity-tools-31">Velocity Tools 3.1<a class="headerlink" href="#velocity-tools-31" title="Permanent link">&para;</a></h3>
+<h4 id="modules_1">Modules<a class="headerlink" href="#modules_1" title="Permanent link">&para;</a></h4>
+<ul>
+<li><code>velocity-tools-generic</code>, the generic tools</li>
+<li><code>velocity-tools-view</code>, the view tools, meant to be used in a J2EE webapp</li>
+<li><code>velocity-tools-view-jsp</code>, the view tools JSP extension</li>
+</ul>
 <h4 id="inclusion-as-a-maven-dependency_1">Inclusion as a maven dependency<a class="headerlink" href="#inclusion-as-a-maven-dependency_1" title="Permanent link">&para;</a></h4>
+<p>Use one of:</p>
 <div class="codehilite"><pre><span class="nt">&lt;dependency&gt;</span>
   <span class="nt">&lt;groupId&gt;</span>org.apache.velocity.tools<span class="nt">&lt;/groupId&gt;</span>
   <span class="nt">&lt;artifactId&gt;</span>velocity-tools-generic<span class="nt">&lt;/artifactId&gt;</span>
-  <span class="nt">&lt;version&gt;</span>3.0<span class="nt">&lt;/version&gt;</span>
+  <span class="nt">&lt;version&gt;</span>3.1<span class="nt">&lt;/version&gt;</span>
 <span class="nt">&lt;/dependency&gt;</span>
 
 <span class="nt">&lt;dependency&gt;</span>
   <span class="nt">&lt;groupId&gt;</span>org.apache.velocity.tools<span class="nt">&lt;/groupId&gt;</span>
   <span class="nt">&lt;artifactId&gt;</span>velocity-tools-view<span class="nt">&lt;/artifactId&gt;</span>
-  <span class="nt">&lt;version&gt;</span>3.0<span class="nt">&lt;/version&gt;</span>
+  <span class="nt">&lt;version&gt;</span>3.1<span class="nt">&lt;/version&gt;</span>
 <span class="nt">&lt;/dependency&gt;</span>
 
 <span class="nt">&lt;dependency&gt;</span>
@@ -393,6 +476,7 @@ The <tt>SHA</tt> links download the checksum from the main site. None of these s
 </pre></div>
 
 
+<p>Each of those modules will include the previous one as a dependency. But note that <code>velocity-tools-view-jsp</code> is still in 3.0.</p>
 <h4 id="binaries_1">Binaries<a class="headerlink" href="#binaries_1" title="Permanent link">&para;</a></h4>
 <table class="smalltable">
   <thead>
@@ -400,18 +484,18 @@ The <tt>SHA</tt> links download the checksum from the main site. None of these s
   <tbody>
     <tr>
       <th>Generic Tools</th>
-      <td><a href="[preferred]/velocity/tools/3.0/velocity-tools-generic-3.0.jar">velocity-tools-generic-3.0.jar</a></td>
-      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.0/velocity-tools-generic-3.0.jar.asc">PGP</a>]</td>
-      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.0/velocity-tools-generic-3.0.jar.sha256">SHA256</a>]</td>
+      <td><a href="[preferred]/velocity/tools/3.1/velocity-tools-generic-3.1.jar">velocity-tools-generic-3.1.jar</a></td>
+      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.1/velocity-tools-generic-3.1.jar.asc">PGP</a>]</td>
+      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.1/velocity-tools-generic-3.1.jar.sha256">SHA256</a>]</td>
     </tr>
     <tr>
       <th>View Tools</th>
-      <td><a href="[preferred]/velocity/tools/3.0/velocity-tools-view-3.0.jar">velocity-tools-view-3.0.jar</a></td>
-      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.0/velocity-tools-view-3.0.jar.asc">PGP</a>]</td>
-      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.0/velocity-tools-view-3.0.jar.sha256">SHA256</a>]</td>
+      <td><a href="[preferred]/velocity/tools/3.1/velocity-tools-view-3.1.jar">velocity-tools-view-3.1.jar</a></td>
+      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.1/velocity-tools-view-3.1.jar.asc">PGP</a>]</td>
+      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.1/velocity-tools-view-3.1.jar.sha256">SHA256</a>]</td>
     </tr>
     <tr>
-      <th>JSP View Tools</th>
+      <th>JSP View Tools (3.0)</th>
       <td><a href="[preferred]/velocity/tools/3.0/velocity-tools-view-jsp-3.0.jar">velocity-tools-view-jsp-3.0.jar</a></td>
       <td>[<a href="https://www.apache.org/dist/velocity/tools/3.0/velocity-tools-view-jsp-3.0.jar.asc">PGP</a>]</td>
       <td>[<a href="https://www.apache.org/dist/velocity/tools/3.0/velocity-tools-view-jsp-3.0.jar.sha256">SHA256</a>]</td>
@@ -426,18 +510,18 @@ The <tt>SHA</tt> links download the checksum from the main site. None of these s
   <tbody>
     <tr>
       <th>Generic Tools</th>
-      <td><a href="[preferred]/velocity/tools/3.0/velocity-tools-generic-3.0.pom">velocity-tools-generic-3.0.pom</a></td>
-      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.0/velocity-tools-generic-3.0.pom.asc">PGP</a>]</td>
-      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.0/velocity-tools-generic-3.0.pom.sha256">SHA256</a>]</td>
+      <td><a href="[preferred]/velocity/tools/3.1/velocity-tools-generic-3.1.pom">velocity-tools-generic-3.1.pom</a></td>
+      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.1/velocity-tools-generic-3.1.pom.asc">PGP</a>]</td>
+      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.1/velocity-tools-generic-3.1.pom.sha256">SHA256</a>]</td>
     </tr>
     <tr>
       <th>View Tools</th>
-      <td><a href="[preferred]/velocity/tools/3.0/velocity-tools-view-3.0.pom">velocity-tools-view-3.0.pom</a></td>
-      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.0/velocity-tools-view-3.0.pom.asc">PGP</a>]</td>
-      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.0/velocity-tools-view-3.0.pom.sha256">SHA256</a>]</td>
+      <td><a href="[preferred]/velocity/tools/3.1/velocity-tools-view-3.1.pom">velocity-tools-view-3.1.pom</a></td>
+      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.1/velocity-tools-view-3.1.pom.asc">PGP</a>]</td>
+      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.1/velocity-tools-view-3.1.pom.sha256">SHA256</a>]</td>
     </tr>
     <tr>
-      <th>JSP View Tools</th>
+      <th>JSP View Tools (3.0)</th>
       <td><a href="[preferred]/velocity/tools/3.0/velocity-tools-view-jsp-3.0.pom">velocity-tools-view-jsp-3.0.pom</a></td>
       <td>[<a href="https://www.apache.org/dist/velocity/tools/3.0/velocity-tools-view-jsp-3.0.pom.asc">PGP</a>]</td>
       <td>[<a href="https://www.apache.org/dist/velocity/tools/3.0/velocity-tools-view-jsp-3.0.pom.sha256">SHA256</a>]</td>
@@ -452,18 +536,18 @@ The <tt>SHA</tt> links download the checksum from the main site. None of these s
   <tbody>
     <tr>
       <th>Generic Tools</th>
-      <td><a href="[preferred]/velocity/tools/3.0/velocity-tools-generic-3.0-javadoc.jar">velocity-tools-generic-3.0-javadoc.jar</a></td>
-      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.0/velocity-tools-generic-3.0-javadoc.jar.asc">PGP</a>]</td>
-      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.0/velocity-tools-generic-3.0-javadoc.jar.sha256">SHA256</a>]</td>
+      <td><a href="[preferred]/velocity/tools/3.1/velocity-tools-generic-3.1-javadoc.jar">velocity-tools-generic-3.1-javadoc.jar</a></td>
+      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.1/velocity-tools-generic-3.1-javadoc.jar.asc">PGP</a>]</td>
+      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.1/velocity-tools-generic-3.1-javadoc.jar.sha256">SHA256</a>]</td>
     </tr>
     <tr>
       <th>View Tools</th>
-      <td><a href="[preferred]/velocity/tools/3.0/velocity-tools-view-3.0-javadoc.jar">velocity-tools-view-3.0-javadoc.jar</a></td>
-      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.0/velocity-tools-view-3.0-javadoc.jar.asc">PGP</a>]</td>
-      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.0/velocity-tools-view-3.0-javadoc.jar.sha256">SHA256</a>]</td>
+      <td><a href="[preferred]/velocity/tools/3.1/velocity-tools-view-3.1-javadoc.jar">velocity-tools-view-3.1-javadoc.jar</a></td>
+      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.1/velocity-tools-view-3.1-javadoc.jar.asc">PGP</a>]</td>
+      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.1/velocity-tools-view-3.1-javadoc.jar.sha256">SHA256</a>]</td>
     </tr>
     <tr>
-      <th>JSP View Tools</th>
+      <th>JSP View Tools (3.0)</th>
       <td><a href="[preferred]/velocity/tools/3.0/velocity-tools-view-jsp-3.0-javadoc.jar">velocity-tools-view-jsp-3.0-javadoc.jar</a></td>
       <td>[<a href="https://www.apache.org/dist/velocity/tools/3.0/velocity-tools-view-jsp-3.0-javadoc.jar.asc">PGP</a>]</td>
       <td>[<a href="https://www.apache.org/dist/velocity/tools/3.0/velocity-tools-view-jsp-3.0-javadoc.jar.sha256">SHA256</a>]</td>
@@ -478,18 +562,18 @@ The <tt>SHA</tt> links download the checksum from the main site. None of these s
   <tbody>
     <tr>
       <th>Generic Tools</th>
-      <td><a href="[preferred]/velocity/tools/3.0/velocity-tools-generic-3.0-sources.jar">velocity-tools-generic-3.0-sources.jar</a></td>
-      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.0/velocity-tools-generic-3.0-sources.jar.asc">PGP</a>]</td>
-      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.0/velocity-tools-generic-3.0-sources.jar.sha256">SHA256</a>]</td>
+      <td><a href="[preferred]/velocity/tools/3.1/velocity-tools-generic-3.1-sources.jar">velocity-tools-generic-3.1-sources.jar</a></td>
+      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.1/velocity-tools-generic-3.1-sources.jar.asc">PGP</a>]</td>
+      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.1/velocity-tools-generic-3.1-sources.jar.sha256">SHA256</a>]</td>
     </tr>
     <tr>
       <th>View Tools</th>
-      <td><a href="[preferred]/velocity/tools/3.0/velocity-tools-view-3.0-sources.jar">velocity-tools-view-3.0-sources.jar</a></td>
-      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.0/velocity-tools-view-3.0-sources.jar.asc">PGP</a>]</td>
-      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.0/velocity-tools-view-3.0-sources.jar.sha256">SHA256</a>]</td>
+      <td><a href="[preferred]/velocity/tools/3.1/velocity-tools-view-3.1-sources.jar">velocity-tools-view-3.1-sources.jar</a></td>
+      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.1/velocity-tools-view-3.1-sources.jar.asc">PGP</a>]</td>
+      <td>[<a href="https://www.apache.org/dist/velocity/tools/3.1/velocity-tools-view-3.1-sources.jar.sha256">SHA256</a>]</td>
     </tr>
     <tr>
-      <th>JSP View Tools</th>
+      <th>JSP View Tools (3.0)</th>
       <td><a href="[preferred]/velocity/tools/3.0/velocity-tools-view-jsp-3.0-sources.jar">velocity-tools-view-jsp-3.0-sources.jar</a></td>
       <td>[<a href="https://www.apache.org/dist/velocity/tools/3.0/velocity-tools-view-jsp-3.0-sources.jar.asc">PGP</a>]</td>
       <td>[<a href="https://www.apache.org/dist/velocity/tools/3.0/velocity-tools-view-jsp-3.0-sources.jar.sha256">SHA256</a>]</td>
@@ -497,40 +581,44 @@ The <tt>SHA</tt> links download the checksum from the main site. None of these s
   </tbody>
 </table>
 
-<p>Or checkout the svn repository from <a href="https://svn.apache.org/repos/asf/velocity/tools/tags/3.0">the 3.0 subversion tag</a>.</p>
+<p>Or clone the github mirror repository and checkout the 3.1 tag:</p>
+<div class="codehilite"><pre>git clone https://github.com/apache/velocity-tools
+<span class="nb">cd</span> velocity-tools
+git checkout tags/3.1
+</pre></div>
+
+
 <hr />
 <h2 id="alphabeta-releases">Alpha/Beta Releases<a class="headerlink" href="#alphabeta-releases" title="Permanent link">&para;</a></h2>
 <p>These releases are not considered production-ready but they might contain new features or bug fixes that are not yet in the production release.</p>
-<h2 id="engine_1">Engine<a class="headerlink" href="#engine_1" title="Permanent link">&para;</a></h2>
+<h3 id="engine">Engine<a class="headerlink" href="#engine" title="Permanent link">&para;</a></h3>
 <p>There are no current Alpha or Beta releases of the Engine project.</p>
-<h2 id="tools_1">Tools<a class="headerlink" href="#tools_1" title="Permanent link">&para;</a></h2>
+<h3 id="tools">Tools<a class="headerlink" href="#tools" title="Permanent link">&para;</a></h3>
 <p>There are no current Alpha or Beta releases of the Tools project.</p>
 <hr />
-<h2 id="snapshot-releases">Snapshot Releases<a class="headerlink" href="#snapshot-releases" title="Permanent link">&para;</a></h2>
-<p>Snapshot releases published from times to times on <a href="https://repository.apache.org/content/repositories/snapshots/org/apache/velocity/">Apache's repository</a>.</p>
 <h2 id="archived-components-releases">Archived Components Releases<a class="headerlink" href="#archived-components-releases" title="Permanent link">&para;</a></h2>
 <h3 id="anakia">Anakia<a class="headerlink" href="#anakia" title="Permanent link">&para;</a></h3>
 <p>Binaries and sources:</p>
 <ul>
-<li><a href="[preferred]/velocity/anakia/1.0/anakia-1.0.zip">anakia-1.0.zip</a> [<a href="https://www.apache.org/dist/velocity/anakia/1.0/anakia-1.0.zip.asc">PGP</a>] [<a href="https://www.apache.org/dist/velocity/anakia/1.0/anakia-1.0.zip.sha1">SHA1</a>]</li>
-<li><a href="[preferred]/velocity/anakia/1.0/anakia-1.0.tar.gz">anakia-1.0.tar.gz</a> [<a href="https://www.apache.org/dist/velocity/anakia/1.0/anakia-1.0.tar.gz.asc">PGP</a>] [<a href="https://www.apache.org/dist/velocity/anakia/1.0/anakia-1.0.tar.gz.sha1">SHA1</a>]</li>
+<li><a href="https://archive.apache.org/dist/velocity/anakia/1.0/anakia-1.0.zip">anakia-1.0.zip</a> [<a href="https://archive.apache.org/dist/velocity/anakia/1.0/anakia-1.0.zip.asc">PGP</a>] [<a href="https://archive.apache.org/dist/velocity/anakia/1.0/anakia-1.0.zip.sha1">SHA1</a>]</li>
+<li><a href="https://archive.apache.org/dist/velocity/anakia/1.0/anakia-1.0.tar.gz">anakia-1.0.tar.gz</a> [<a href="https://archive.apache.org/dist/velocity/anakia/1.0/anakia-1.0.tar.gz.asc">PGP</a>] [<a href="https://archive.apache.org/dist/velocity/anakia/1.0/anakia-1.0.tar.gz.sha1">SHA1</a>]</li>
 </ul>
 <h3 id="texen">Texen<a class="headerlink" href="#texen" title="Permanent link">&para;</a></h3>
 <p>Binaries and sources:</p>
 <ul>
-<li><a href="[preferred]/velocity/texen/1.0/texen-1.0.zip">texen-1.0.zip</a> [<a href="https://www.apache.org/dist/velocity/texen/1.0/texen-1.0.zip.asc">PGP</a>] [<a href="https://www.apache.org/dist/velocity/texen/1.0/texen-1.0.zip.sha1">SHA1</a>]</li>
-<li><a href="[preferred]/velocity/texen/1.0/texen-1.0.tar.gz">texen-1.0.tar.gz</a> [<a href="https://www.apache.org/dist/velocity/texen/1.0/texen-1.0.tar.gz.asc">PGP</a>] [<a href="https://www.apache.org/dist/velocity/texen/1.0/texen-1.0.tar.gz.sha1">SHA1</a>]</li>
+<li><a href="https://archive.apache.org/dist/velocity/texen/1.0/texen-1.0.zip">texen-1.0.zip</a> [<a href="https://archive.apache.org/dist/velocity/texen/1.0/texen-1.0.zip.asc">PGP</a>] [<a href="https://archive.apache.org/dist/velocity/texen/1.0/texen-1.0.zip.sha1">SHA1</a>]</li>
+<li><a href="https://archive.apache.org/dist/velocity/texen/1.0/texen-1.0.tar.gz">texen-1.0.tar.gz</a> [<a href="https://archive.apache.org/dist/velocity/texen/1.0/texen-1.0.tar.gz.asc">PGP</a>] [<a href="https://archive.apache.org/dist/velocity/texen/1.0/texen-1.0.tar.gz.sha1">SHA1</a>]</li>
 </ul>
 <h3 id="dvsl">DVSL<a class="headerlink" href="#dvsl" title="Permanent link">&para;</a></h3>
 <p>Binaries:</p>
 <ul>
-<li><a href="[preferred]/velocity/dvsl/1.0/velocity-dvsl-1.0.zip">velocity-dvsl-1.0.zip</a> [<a href="https://www.apache.org/dist/velocity/dvsl/1.0/velocity-dvsl-1.0.zip.asc">PGP</a>] [<a href="https://www.apache.org/dist/velocity/dvsl/1.0/velocity-dvsl-1.0.zip.sha1">SHA1</a>]</li>
-<li><a href="[preferred]/velocity/dvsl/1.0/velocity-dvsl-1.0.tar.gz">velocity-dvsl-1.0.tar.gz</a> [<a href="https://www.apache.org/dist/velocity/dvsl/1.0/velocity-dvsl-1.0.tar.gz.asc">PGP</a>] [<a href="https://www.apache.org/dist/velocity/dvsl/1.0/velocity-dvsl-1.0.tar.gz.sha1">SHA1</a>]</li>
+<li><a href="https://archive.apache.org/dist/velocity/dvsl/1.0/velocity-dvsl-1.0.zip">velocity-dvsl-1.0.zip</a> [<a href="https://archive.apache.org/dist/velocity/dvsl/1.0/velocity-dvsl-1.0.zip.asc">PGP</a>] [<a href="https://archive.apache.org/dist/velocity/dvsl/1.0/velocity-dvsl-1.0.zip.sha1">SHA1</a>]</li>
+<li><a href="https://archive.apache.org/dist/velocity/dvsl/1.0/velocity-dvsl-1.0.tar.gz">velocity-dvsl-1.0.tar.gz</a> [<a href="https://archive.apache.org/dist/velocity/dvsl/1.0/velocity-dvsl-1.0.tar.gz.asc">PGP</a>] [<a href="https://archive.apache.org/dist/velocity/dvsl/1.0/velocity-dvsl-1.0.tar.gz.sha1">SHA1</a>]</li>
 </ul>
 <p>Sources:</p>
 <ul>
-<li><a href="[preferred]/velocity/dvsl/1.0/velocity-dvsl-1.0-src.zip">velocity-dvsl-1.0-src.zip</a> [<a href="https://www.apache.org/dist/velocity/dvsl/1.0/velocity-dvsl-1.0-src.zip.asc">PGP</a>] [<a href="https://www.apache.org/dist/velocity/dvsl/1.0/velocity-dvsl-1.0-src.zip.sha1">SHA1</a>]</li>
-<li><a href="[preferred]/velocity/dvsl/1.0/velocity-dvsl-1.0-src.tar.gz">velocity-dvsl-1.0-src.tar.gz</a> [<a href="https://www.apache.org/dist/velocity/dvsl/1.0/velocity-dvsl-1.0-src.tar.gz.asc">PGP</a>] [<a href="https://www.apache.org/dist/velocity/dvsl/1.0/velocity-dvsl-1.0-src.tar.gz.sha1">SHA1</a>]</li>
+<li><a href="https://archive.apache.org/dist/velocity/dvsl/1.0/velocity-dvsl-1.0-src.zip">velocity-dvsl-1.0-src.zip</a> [<a href="https://archive.apache.org/dist/velocity/dvsl/1.0/velocity-dvsl-1.0-src.zip.asc">PGP</a>] [<a href="https://archive.apache.org/dist/velocity/dvsl/1.0/velocity-dvsl-1.0-src.zip.sha1">SHA1</a>]</li>
+<li><a href="https://archive.apache.org/dist/velocity/dvsl/1.0/velocity-dvsl-1.0-src.tar.gz">velocity-dvsl-1.0-src.tar.gz</a> [<a href="https://archive.apache.org/dist/velocity/dvsl/1.0/velocity-dvsl-1.0-src.tar.gz.asc">PGP</a>] [<a href="https://archive.apache.org/dist/velocity/dvsl/1.0/velocity-dvsl-1.0-src.tar.gz.sha1">SHA1</a>]</li>
 </ul>
 <h2 id="older-releases">Older Releases<a class="headerlink" href="#older-releases" title="Permanent link">&para;</a></h2>
 <p>Older versions of the Apache Velocity projects are available from <a href="https://archive.apache.org/dist/velocity/">our archive site</a>, and documented here:</p>
@@ -542,7 +630,7 @@ The <tt>SHA</tt> links download the checksum from the main site. None of these s
 <!-- nightly builds -->
 
 <h2 id="source-code-repository">Source Code Repository<a class="headerlink" href="#source-code-repository" title="Permanent link">&para;</a></h2>
-<p>You can download the source code to each Apache Velocity project directly from our apache gitbox repositories or from our github mirrors (which are preferable to open a pull request). Here you get logs, change histories and all the information necessary to follow the development process. If you are interested in the project development, please join the Apache Velocity development list.</p>
+<p>You can download the source code to each Apache Velocity project directly from our apache gitbox repositories or from our github mirrors (which are preferable if you intend to open a pull request). Here you get logs, change histories and all the information necessary to follow the development process. If you are interested in the project development, please join the Apache Velocity development list.</p>
 <table class="table">
 <thead>
 <tr>
diff --git a/dvsl/index.html b/dvsl/index.html
index 57c594b..366f53f 100644
--- a/dvsl/index.html
+++ b/dvsl/index.html
@@ -162,8 +162,8 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
 </ul>
 <h2 id="releases">Releases<a class="headerlink" href="#releases" title="Permanent link">&para;</a></h2>
 <ul>
-<li><a href="/engine/2.2">Engine 2.2</a></li>
-<li><a href="/tools/3.0">Tools 3.0</a></li>
+<li><a href="/engine/2.3">Engine 2.3</a></li>
+<li><a href="/tools/3.1">Tools 3.1</a></li>
 </ul>
 <h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h2>
 <ul>
diff --git a/engine/1.7/index.html b/engine/1.7/index.html
index f76b33f..cf96d3e 100644
--- a/engine/1.7/index.html
+++ b/engine/1.7/index.html
@@ -226,7 +226,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
 <p>If you're new to Velocity, you can read the <a href="overview.html">Overview</a> to understand its principles. Then, you can go through the <a href="user-guide.html">User Guide</a> for more details.</p>
 <p>You can check the <a href="vtl-reference.html">Velocity Template Language (VTL) reference</a> to write templates, and the <a href="developer-guide.html">Developer Guide</a> to guide you in the process of configuring and integrating Velocity.</p>
 <h2 id="where-do-i-get-releases">Where do I get releases?<a class="headerlink" href="#where-do-i-get-releases" title="Permanent link">&para;</a></h2>
-<p>The current stable release version is version 2.2.</p>
+<p>The current stable release version is version 2.3.</p>
 <p>The release distribution is available as a combined source/binary distribution in <code>tar.gz</code> and <code>zip</code> formats, and can be downloaded through the <a href="/download.cgi">Apache Mirror system</a>..</p>
 <p>The Velocity jars are also available through the <a href="http://repo1.maven.org/maven2/org/apache/velocity/">central Maven repository</a>.</p>
 <p>Older releases are archived at the <a href="http://archive.apache.org/dist/velocity/engine/">Apache Velocity archives</a>.</p>
diff --git a/engine/1.7/left.nav b/engine/1.7/left.nav
deleted file mode 100644
index 9a20bd4..0000000
--- a/engine/1.7/left.nav
+++ /dev/null
@@ -1,36 +0,0 @@
-## Velocity Engine
-* [Welcome](index.html)
-* [Overview](overview.html)
-* [Getting Started](getting-started.html)
-* [Web Applications](webapps.html)
-* [Downloads](/download.cgi#engine)
-* [FAQ](http://wiki.apache.org/velocity/VelocityFAQ)
-## Docs
-* [User Guide](user-guide.html)
-* [Developer Guide](developer-guide.html)
-* [VTL Reference](vtl-reference.html)
-* [Glossary](glossary.html)
-* [Javadoc](apidocs/index.html)
-## Developers
-* [License](license.html)
-* [Changes](changes.html)
-* [Upgrading](upgrading.html)
-* [Dependencies](dependencies.html)
-* [Sources](source-repository.html)
-* [Building](build.html)
-* [Issues](https://issues.apache.org/jira/browse/VELOCITY)
-* [RoadMap](http://wiki.apache.org/velocity/RoadMap)
-* [Coding Standards](http://wiki.apache.org/velocity/CodeStandards)
-* [Doc Guidelines](http://wiki.apache.org/velocity/DocumentationGuidelines)
-## Community
-* [Wiki](http://wiki.apache.org/velocity/)
-* [News](/news.html)
-* [Powered by Velocity](http://wiki.apache.org/velocity/PoweredByVelocity)
-* [IDE/Editor Plugins](http://wiki.apache.org/velocity/VelocityEditors)
-* [Articles and Books](http://wiki.apache.org/velocity/PublishedArticlesAndBooks)
-* [Mailing Lists](/contact.html)
-## Translations (outdated)
-* [Site (Japanese)](http://www.jajakarta.org/velocity/)
-* [User's Guide (Finnish)](translations/user-guide_fi.html)
-* [User's Guide (French)](translations/user-guide_fr.html)
-* [User's Guide (Spanish)](translations/user-guide_es.html)
diff --git a/engine/1.7/source-repository.html b/engine/1.7/source-repository.html
index 302b153..48e820d 100644
--- a/engine/1.7/source-repository.html
+++ b/engine/1.7/source-repository.html
@@ -223,7 +223,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
 <h2 id="overview">Overview<a class="headerlink" href="#overview" title="Permanent link">&para;</a></h2>
-<p>This project uses <a href="http://subversion.tigris.org">Subversion</a> to manage its source code. Instructions on Subversion use can be found at <a href="http://svnbook.red-bean.com/">http://svnbook.red-bean.com/</a>.</p>
+<p>~~This project uses <a href="http://subversion.tigris.org">Subversion</a> to manage its source code. Instructions on Subversion use can be found at <a href="http://svnbook.red-bean.com/">http://svnbook.red-bean.com/</a>.~~</p>
 <h2 id="web-access">Web Access<a class="headerlink" href="#web-access" title="Permanent link">&para;</a></h2>
 <p>The following is a link to the online source repository.</p>
 <p class="frame"><a href="http://svn.apache.org/viewvc/velocity/engine/trunk">http://svn.apache.org/viewvc/velocity/engine/trunk</a>
diff --git a/engine/2.0/getting-started.html b/engine/2.0/getting-started.html
index 6297036..73297f3 100644
--- a/engine/2.0/getting-started.html
+++ b/engine/2.0/getting-started.html
@@ -233,19 +233,11 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
 </ul>
 <p>The best place to start is with the examples provided in the distribution, and with the source code itself, which is included.</p>
 <h2 id="downloading-velocity">Downloading Velocity<a class="headerlink" href="#downloading-velocity" title="Permanent link">&para;</a></h2>
-<p>You can download the latest release version of <a href="/download.cgi#engine">Velocity Engine</a> or <a href="/download.cgi#tools">Velocity Tools</a> from the main Apache Velocity download site. For Velocity itself, source is included with the binary download.</p>
-<p>If you want to download the latest source, you can do so via the Subversion (svn) source control system.</p>
-<p>You can also find published snapshots on the <a href="https://repository.apache.org/content/repositories/snapshots/org/apache/velocity/">Apache Snapshot Repository</a>.</p>
-<p>Instructions for building Velocity from source can be found in the <a href="build.html">Build</a> document.</p>
+<p>You can download the latest release version of <a href="/download.cgi#engine">Velocity Engine</a> or <a href="/download.cgi#tools">Velocity Tools</a> from the main Apache Velocity download site.</p>
+<p>If you want to download the latest source, you can do so using git, see the <a href="/download.cgi">downloads page</a>.</p>
+<p>Instructions for building Velocity from source can be found in the <a href="build.html">Site Building</a> document.</p>
 <h2 id="api-documentation">API Documentation<a class="headerlink" href="#api-documentation" title="Permanent link">&para;</a></h2>
-<p>Our API documentation is available <a href="apidocs/">online</a>, as part of the distribution package, an of course, you can generate it yourself from the included source code.</p>
-<p>If you would like to create a full set of detailed API documentation for Velocity, go to the <code>build</code> directory and run:</p>
-<div class="codehilite"><pre>ant javadocs
-</pre></div>
-
-
-<p>The docs will be found in the <code>/bin/apidocs/</code> directory.</p>
-<p><strong>Note:</strong> Velocity uses the <a href="http://maven.Apache.org">Maven</a> build tool for all code and documentation generation, so you will need to have it installed.</p></div></div>
+<p>Our API documentation is available <a href="apidocs/">online</a>, you can generate it yourself from the included source code using the <code>mvn javadoc:aggregate</code> command.</p></div></div>
         <hr/>
         <div id="copyright">
           Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
diff --git a/engine/2.0/index.html b/engine/2.0/index.html
index 9f758f9..0f05a5a 100644
--- a/engine/2.0/index.html
+++ b/engine/2.0/index.html
@@ -227,7 +227,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
 <p>If you're new to Velocity, you can read the <a href="overview.html">Overview</a> to understand its principles. Then, you can go through the <a href="user-guide.html">User Guide</a> for more details.</p>
 <p>You can check the <a href="vtl-reference.html">Velocity Template Language (VTL) reference</a> to write templates, and the <a href="developer-guide.html">Developer Guide</a> to guide you in the process of configuring and integrating Velocity.</p>
 <h2 id="where-do-i-get-releases">Where do I get releases?<a class="headerlink" href="#where-do-i-get-releases" title="Permanent link">&para;</a></h2>
-<p>The current stable release version is version 2.2.</p>
+<p>The current stable release version is version 2.3.</p>
 <p>The release distribution is available as a combined source/binary distribution in <code>tar.gz</code> and <code>zip</code> formats, and can be downloaded through the <a href="/download.cgi">Apache Mirror system</a>.</p>
 <p>The Velocity jars are also available through the <a href="https://search.maven.org/artifact/org.apache.velocity/velocity-engine-core/2.0/jar">central Maven repository</a>.</p>
 <p>Older releases are archived at the <a href="http://archive.apache.org/dist/velocity/engine/">Apache Velocity archives</a>.</p>
diff --git a/engine/2.0/left.nav b/engine/2.0/left.nav
deleted file mode 100644
index 21339f8..0000000
--- a/engine/2.0/left.nav
+++ /dev/null
@@ -1,37 +0,0 @@
-## Velocity Engine
-* [Welcome](index.html)
-* [Overview](overview.html)
-* [Getting Started](getting-started.html)
-* [Web Applications](webapps.html)
-* [Downloads](/download.cgi#engine)
-* [FAQ](http://wiki.apache.org/velocity/VelocityFAQ)
-## Docs
-* [User Guide](user-guide.html)
-* [Developer Guide](developer-guide.html)
-* [VTL Reference](vtl-reference.html)
-* [Configuration](configuration.html)
-* [Glossary](glossary.html)
-* [Javadoc](apidocs/index.html)
-* [Upgrading](upgrading.html)
-## Developers
-* [License](license.html)
-* [Changes](changes.html)
-* [Dependencies](dependencies.html)
-* [Sources](source-repository.html)
-* [Building](build.html)
-* [Issues](https://issues.apache.org/jira/browse/VELOCITY)
-* [Road Map](http://wiki.apache.org/velocity/RoadMap)
-* [Coding Standards](http://wiki.apache.org/velocity/CodeStandards)
-* [Doc Guidelines](http://wiki.apache.org/velocity/DocumentationGuidelines)
-## Community
-* [Wiki](http://wiki.apache.org/velocity/)
-* [News](/news.html)
-* [Powered by Velocity](http://wiki.apache.org/velocity/PoweredByVelocity)
-* [IDE/Editor Plugins](http://wiki.apache.org/velocity/VelocityEditors)
-* [Articles and Books](http://wiki.apache.org/velocity/PublishedArticlesAndBooks)
-* [Mailing Lists](/contact.html)
-## Translations (outdated)
-* [Site (Japanese)](http://www.jajakarta.org/velocity/)
-* [User's Guide (Finnish)](translations/user-guide_fi.html)
-* [User's Guide (French)](translations/user-guide_fr.html)
-* [User's Guide (Spanish)](translations/user-guide_es.html)
diff --git a/engine/2.1/getting-started.html b/engine/2.1/getting-started.html
index a217e04..e39e551 100644
--- a/engine/2.1/getting-started.html
+++ b/engine/2.1/getting-started.html
@@ -233,19 +233,11 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
 </ul>
 <p>The best place to start is with the examples provided in the distribution, and with the source code itself, which is included.</p>
 <h2 id="downloading-velocity">Downloading Velocity<a class="headerlink" href="#downloading-velocity" title="Permanent link">&para;</a></h2>
-<p>You can download the latest release version of <a href="/download.cgi#engine">Velocity Engine</a> or <a href="/download.cgi#tools">Velocity Tools</a> from the main Apache Velocity download site. For Velocity itself, source is included with the binary download.</p>
-<p>If you want to download the latest source, you can do so via the Subversion (svn) source control system.</p>
-<p>You can also find published snapshots on the <a href="https://repository.apache.org/content/repositories/snapshots/org/apache/velocity/">Apache Snapshot Repository</a>.</p>
-<p>Instructions for building Velocity from source can be found in the <a href="build.html">Build</a> document.</p>
+<p>You can download the latest release version of <a href="/download.cgi#engine">Velocity Engine</a> or <a href="/download.cgi#tools">Velocity Tools</a> from the main Apache Velocity download site.</p>
+<p>If you want to download the latest source, you can do so using git, see the <a href="/download.cgi">downloads page</a>.</p>
+<p>Instructions for building Velocity from source can be found in the <a href="build.html">Site Building</a> document.</p>
 <h2 id="api-documentation">API Documentation<a class="headerlink" href="#api-documentation" title="Permanent link">&para;</a></h2>
-<p>Our API documentation is available <a href="apidocs/">online</a>, as part of the distribution package, an of course, you can generate it yourself from the included source code.</p>
-<p>If you would like to create a full set of detailed API documentation for Velocity, go to the <code>build</code> directory and run:</p>
-<div class="codehilite"><pre>ant javadocs
-</pre></div>
-
-
-<p>The docs will be found in the <code>/bin/apidocs/</code> directory.</p>
-<p><strong>Note:</strong> Velocity uses the <a href="http://maven.Apache.org">Maven</a> build tool for all code and documentation generation, so you will need to have it installed.</p></div></div>
+<p>Our API documentation is available <a href="apidocs/">online</a>, you can generate it yourself from the included source code using the <code>mvn javadoc:aggregate</code> command.</p></div></div>
         <hr/>
         <div id="copyright">
           Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
diff --git a/engine/2.1/index.html b/engine/2.1/index.html
index 20bfb14..99faa76 100644
--- a/engine/2.1/index.html
+++ b/engine/2.1/index.html
@@ -227,7 +227,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
 <p>If you're new to Velocity, you can read the <a href="overview.html">Overview</a> to understand its principles. Then, you can go through the <a href="user-guide.html">User Guide</a> for more details.</p>
 <p>You can check the <a href="vtl-reference.html">Velocity Template Language (VTL) reference</a> to write templates, and the <a href="developer-guide.html">Developer Guide</a> to guide you in the process of configuring and integrating Velocity.</p>
 <h2 id="where-do-i-get-releases">Where do I get releases?<a class="headerlink" href="#where-do-i-get-releases" title="Permanent link">&para;</a></h2>
-<p>The current stable release version is version 2.2.</p>
+<p>The current stable release version is version 2.3.</p>
 <p>The release distribution is available as a combined source/binary distribution in <code>tar.gz</code> and <code>zip</code> formats, and can be downloaded through the <a href="/download.cgi">Apache Mirror system</a>.</p>
 <p>The Velocity jars are also available through the <a href="https://search.maven.org/artifact/org.apache.velocity/velocity-engine-core/2.2/jar">central Maven repository</a>.</p>
 <p>Older releases are archived at the <a href="http://archive.apache.org/dist/velocity/engine/">Apache Velocity archives</a>.</p>
diff --git a/engine/2.1/left.nav b/engine/2.1/left.nav
deleted file mode 100644
index 21339f8..0000000
--- a/engine/2.1/left.nav
+++ /dev/null
@@ -1,37 +0,0 @@
-## Velocity Engine
-* [Welcome](index.html)
-* [Overview](overview.html)
-* [Getting Started](getting-started.html)
-* [Web Applications](webapps.html)
-* [Downloads](/download.cgi#engine)
-* [FAQ](http://wiki.apache.org/velocity/VelocityFAQ)
-## Docs
-* [User Guide](user-guide.html)
-* [Developer Guide](developer-guide.html)
-* [VTL Reference](vtl-reference.html)
-* [Configuration](configuration.html)
-* [Glossary](glossary.html)
-* [Javadoc](apidocs/index.html)
-* [Upgrading](upgrading.html)
-## Developers
-* [License](license.html)
-* [Changes](changes.html)
-* [Dependencies](dependencies.html)
-* [Sources](source-repository.html)
-* [Building](build.html)
-* [Issues](https://issues.apache.org/jira/browse/VELOCITY)
-* [Road Map](http://wiki.apache.org/velocity/RoadMap)
-* [Coding Standards](http://wiki.apache.org/velocity/CodeStandards)
-* [Doc Guidelines](http://wiki.apache.org/velocity/DocumentationGuidelines)
-## Community
-* [Wiki](http://wiki.apache.org/velocity/)
-* [News](/news.html)
-* [Powered by Velocity](http://wiki.apache.org/velocity/PoweredByVelocity)
-* [IDE/Editor Plugins](http://wiki.apache.org/velocity/VelocityEditors)
-* [Articles and Books](http://wiki.apache.org/velocity/PublishedArticlesAndBooks)
-* [Mailing Lists](/contact.html)
-## Translations (outdated)
-* [Site (Japanese)](http://www.jajakarta.org/velocity/)
-* [User's Guide (Finnish)](translations/user-guide_fi.html)
-* [User's Guide (French)](translations/user-guide_fr.html)
-* [User's Guide (Spanish)](translations/user-guide_es.html)
diff --git a/engine/2.2/getting-started.html b/engine/2.2/getting-started.html
index 911bd67..5253e8c 100644
--- a/engine/2.2/getting-started.html
+++ b/engine/2.2/getting-started.html
@@ -233,19 +233,11 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
 </ul>
 <p>The best place to start is with the examples provided in the distribution, and with the source code itself, which is included.</p>
 <h2 id="downloading-velocity">Downloading Velocity<a class="headerlink" href="#downloading-velocity" title="Permanent link">&para;</a></h2>
-<p>You can download the latest release version of <a href="/download.cgi#engine">Velocity Engine</a> or <a href="/download.cgi#tools">Velocity Tools</a> from the main Apache Velocity download site. For Velocity itself, source is included with the binary download.</p>
-<p>If you want to download the latest source, you can do so via the Subversion (svn) source control system.</p>
-<p>You can also find published snapshots on the <a href="https://repository.apache.org/content/repositories/snapshots/org/apache/velocity/">Apache Snapshot Repository</a>.</p>
-<p>Instructions for building Velocity from source can be found in the <a href="build.html">Build</a> document.</p>
+<p>You can download the latest release version of <a href="/download.cgi#engine">Velocity Engine</a> or <a href="/download.cgi#tools">Velocity Tools</a> from the main Apache Velocity download site.</p>
+<p>If you want to download the latest source, you can do so using git, see the <a href="/download.cgi">downloads page</a>.</p>
+<p>Instructions for building Velocity from source can be found in the <a href="build.html">Site Building</a> document.</p>
 <h2 id="api-documentation">API Documentation<a class="headerlink" href="#api-documentation" title="Permanent link">&para;</a></h2>
-<p>Our API documentation is available <a href="apidocs/">online</a>, as part of the distribution package, an of course, you can generate it yourself from the included source code.</p>
-<p>If you would like to create a full set of detailed API documentation for Velocity, go to the <code>build</code> directory and run:</p>
-<div class="codehilite"><pre>ant javadocs
-</pre></div>
-
-
-<p>The docs will be found in the <code>/bin/apidocs/</code> directory.</p>
-<p><strong>Note:</strong> Velocity uses the <a href="http://maven.Apache.org">Maven</a> build tool for all code and documentation generation, so you will need to have it installed.</p></div></div>
+<p>Our API documentation is available <a href="apidocs/">online</a>, you can generate it yourself from the included source code using the <code>mvn javadoc:aggregate</code> command.</p></div></div>
         <hr/>
         <div id="copyright">
           Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
diff --git a/engine/2.2/index.html b/engine/2.2/index.html
index 1438285..020cd37 100644
--- a/engine/2.2/index.html
+++ b/engine/2.2/index.html
@@ -227,7 +227,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
 <p>If you're new to Velocity, you can read the <a href="overview.html">Overview</a> to understand its principles. Then, you can go through the <a href="user-guide.html">User Guide</a> for more details.</p>
 <p>You can check the <a href="vtl-reference.html">Velocity Template Language (VTL) reference</a> to write templates, and the <a href="developer-guide.html">Developer Guide</a> to guide you in the process of configuring and integrating Velocity.</p>
 <h2 id="where-do-i-get-releases">Where do I get releases?<a class="headerlink" href="#where-do-i-get-releases" title="Permanent link">&para;</a></h2>
-<p>The current stable release version is version 2.2.</p>
+<p>The current stable release version is version 2.3.</p>
 <p>The release distribution is available as a combined source/binary distribution in <code>tar.gz</code> and <code>zip</code> formats, and can be downloaded through the <a href="/download.cgi">Apache Mirror system</a>.</p>
 <p>The Velocity jars are also available through the <a href="https://search.maven.org/artifact/org.apache.velocity/velocity-engine-core/2.2/jar">central Maven repository</a>.</p>
 <p>Older releases are archived at the <a href="http://archive.apache.org/dist/velocity/engine/">Apache Velocity archives</a>.</p>
diff --git a/engine/2.2/left.nav b/engine/2.2/left.nav
deleted file mode 100644
index 21339f8..0000000
--- a/engine/2.2/left.nav
+++ /dev/null
@@ -1,37 +0,0 @@
-## Velocity Engine
-* [Welcome](index.html)
-* [Overview](overview.html)
-* [Getting Started](getting-started.html)
-* [Web Applications](webapps.html)
-* [Downloads](/download.cgi#engine)
-* [FAQ](http://wiki.apache.org/velocity/VelocityFAQ)
-## Docs
-* [User Guide](user-guide.html)
-* [Developer Guide](developer-guide.html)
-* [VTL Reference](vtl-reference.html)
-* [Configuration](configuration.html)
-* [Glossary](glossary.html)
-* [Javadoc](apidocs/index.html)
-* [Upgrading](upgrading.html)
-## Developers
-* [License](license.html)
-* [Changes](changes.html)
-* [Dependencies](dependencies.html)
-* [Sources](source-repository.html)
-* [Building](build.html)
-* [Issues](https://issues.apache.org/jira/browse/VELOCITY)
-* [Road Map](http://wiki.apache.org/velocity/RoadMap)
-* [Coding Standards](http://wiki.apache.org/velocity/CodeStandards)
-* [Doc Guidelines](http://wiki.apache.org/velocity/DocumentationGuidelines)
-## Community
-* [Wiki](http://wiki.apache.org/velocity/)
-* [News](/news.html)
-* [Powered by Velocity](http://wiki.apache.org/velocity/PoweredByVelocity)
-* [IDE/Editor Plugins](http://wiki.apache.org/velocity/VelocityEditors)
-* [Articles and Books](http://wiki.apache.org/velocity/PublishedArticlesAndBooks)
-* [Mailing Lists](/contact.html)
-## Translations (outdated)
-* [Site (Japanese)](http://www.jajakarta.org/velocity/)
-* [User's Guide (Finnish)](translations/user-guide_fi.html)
-* [User's Guide (French)](translations/user-guide_fr.html)
-* [User's Guide (Spanish)](translations/user-guide_es.html)
diff --git a/engine/2.3/developer-guide.html b/engine/2.3/developer-guide.html
index 19b698a..627bf9c 100644
--- a/engine/2.3/developer-guide.html
+++ b/engine/2.3/developer-guide.html
@@ -1803,7 +1803,7 @@ see the Javadoc API documentation.</p>
 
 
 <h2 id="customizing-the-vtl-parser">Customizing the VTL parser<a class="headerlink" href="#customizing-the-vtl-parser" title="Permanent link">&para;</a></h2>
-<p>Since 2.2, Velocity Engine can use a custom parser. You need to generate your custom parser class, let's say <code>com.foo.MyCustomParser</code>, by copy pasting the content of the <a href="https://dist.apache.org/repos/dist/dev/velocity/velocity-engine/2.3/velocity-custom-parser-example-2.3.pom">velocity-custom-parser-example</a> maven module pom file inside one of your own modules pom.xml, and then adapting its <code>&lt;properties&gt;</code> section. There's a minimal maven knowled [...]
+<p>Since 2.2, Velocity Engine can use a custom parser. You need to generate your custom parser class, let's say <code>com.foo.MyCustomParser</code>, by copy pasting the content of the <a href="https://raw.githubusercontent.com/apache/velocity-engine/master/velocity-custom-parser-example/pom.xml">velocity-custom-parser-example</a> maven module pom file inside one of your own modules pom.xml, and then adapting its <code>&lt;properties&gt;</code> section. There's a minimal maven knowledge r [...]
 <p>This custom parser will let you configure the following VTL characters:</p>
 <ul>
 <li><code>*</code> (used in <code>#*</code> multiline comments syntax)</li>
diff --git a/engine/2.3/getting-started.html b/engine/2.3/getting-started.html
index d429ebe..ae8e120 100644
--- a/engine/2.3/getting-started.html
+++ b/engine/2.3/getting-started.html
@@ -233,19 +233,11 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
 </ul>
 <p>The best place to start is with the examples provided in the distribution, and with the source code itself, which is included.</p>
 <h2 id="downloading-velocity">Downloading Velocity<a class="headerlink" href="#downloading-velocity" title="Permanent link">&para;</a></h2>
-<p>You can download the latest release version of <a href="/download.cgi#engine">Velocity Engine</a> or <a href="/download.cgi#tools">Velocity Tools</a> from the main Apache Velocity download site. For Velocity itself, source is included with the binary download.</p>
-<p>If you want to download the latest source, you can do so via the Subversion (svn) source control system.</p>
-<p>You can also find published snapshots on the <a href="https://repository.apache.org/content/repositories/snapshots/org/apache/velocity/">Apache Snapshot Repository</a>.</p>
-<p>Instructions for building Velocity from source can be found in the <a href="build.html">Build</a> document.</p>
+<p>You can download the latest release version of <a href="/download.cgi#engine">Velocity Engine</a> or <a href="/download.cgi#tools">Velocity Tools</a> from the main Apache Velocity download site.</p>
+<p>If you want to download the latest source, you can do so using git, see the <a href="/download.cgi">downloads page</a>.</p>
+<p>Instructions for building Velocity from source can be found in the <a href="build.html">Site Building</a> document.</p>
 <h2 id="api-documentation">API Documentation<a class="headerlink" href="#api-documentation" title="Permanent link">&para;</a></h2>
-<p>Our API documentation is available <a href="apidocs/">online</a>, as part of the distribution package, an of course, you can generate it yourself from the included source code.</p>
-<p>If you would like to create a full set of detailed API documentation for Velocity, go to the <code>build</code> directory and run:</p>
-<div class="codehilite"><pre>ant javadocs
-</pre></div>
-
-
-<p>The docs will be found in the <code>/bin/apidocs/</code> directory.</p>
-<p><strong>Note:</strong> Velocity uses the <a href="http://maven.Apache.org">Maven</a> build tool for all code and documentation generation, so you will need to have it installed.</p></div></div>
+<p>Our API documentation is available <a href="apidocs/">online</a>, you can generate it yourself from the included source code using the <code>mvn javadoc:aggregate</code> command.</p></div></div>
         <hr/>
         <div id="copyright">
           Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
diff --git a/engine/2.3/left.nav b/engine/2.3/left.nav
deleted file mode 100644
index 21339f8..0000000
--- a/engine/2.3/left.nav
+++ /dev/null
@@ -1,37 +0,0 @@
-## Velocity Engine
-* [Welcome](index.html)
-* [Overview](overview.html)
-* [Getting Started](getting-started.html)
-* [Web Applications](webapps.html)
-* [Downloads](/download.cgi#engine)
-* [FAQ](http://wiki.apache.org/velocity/VelocityFAQ)
-## Docs
-* [User Guide](user-guide.html)
-* [Developer Guide](developer-guide.html)
-* [VTL Reference](vtl-reference.html)
-* [Configuration](configuration.html)
-* [Glossary](glossary.html)
-* [Javadoc](apidocs/index.html)
-* [Upgrading](upgrading.html)
-## Developers
-* [License](license.html)
-* [Changes](changes.html)
-* [Dependencies](dependencies.html)
-* [Sources](source-repository.html)
-* [Building](build.html)
-* [Issues](https://issues.apache.org/jira/browse/VELOCITY)
-* [Road Map](http://wiki.apache.org/velocity/RoadMap)
-* [Coding Standards](http://wiki.apache.org/velocity/CodeStandards)
-* [Doc Guidelines](http://wiki.apache.org/velocity/DocumentationGuidelines)
-## Community
-* [Wiki](http://wiki.apache.org/velocity/)
-* [News](/news.html)
-* [Powered by Velocity](http://wiki.apache.org/velocity/PoweredByVelocity)
-* [IDE/Editor Plugins](http://wiki.apache.org/velocity/VelocityEditors)
-* [Articles and Books](http://wiki.apache.org/velocity/PublishedArticlesAndBooks)
-* [Mailing Lists](/contact.html)
-## Translations (outdated)
-* [Site (Japanese)](http://www.jajakarta.org/velocity/)
-* [User's Guide (Finnish)](translations/user-guide_fi.html)
-* [User's Guide (French)](translations/user-guide_fr.html)
-* [User's Guide (Spanish)](translations/user-guide_es.html)
diff --git a/engine/2.3/source-repository.html b/engine/2.3/source-repository.html
index d287b9a..4051037 100644
--- a/engine/2.3/source-repository.html
+++ b/engine/2.3/source-repository.html
@@ -224,7 +224,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
 <h2 id="overview">Overview<a class="headerlink" href="#overview" title="Permanent link">&para;</a></h2>
-<p>This project uses <a href="https://git-scm.com/">Git</a> to manage its source code. Instructions on Subversion use can be found at <a href="https://git-scm.com/doc">Git documentation</a>.</p>
+<p>This project uses <a href="https://git-scm.com/">Git</a> to manage its source code. Instructions on how to use git can be found at <a href="https://git-scm.com/doc">Git documentation</a>.</p>
 <h2 id="web-access">Web Access<a class="headerlink" href="#web-access" title="Permanent link">&para;</a></h2>
 <p class="frame">Apache gitbox repository: <a href="https://gitbox.apache.org/repos/asf?p=velocity-engine.git">https://gitbox.apache.org/repos/asf?p=velocity-engine.git</a>
 </p>
diff --git a/engine/devel/apidocs/allclasses-frame.html b/engine/devel/apidocs/allclasses-frame.html
index 218df56..2e86ae3 100644
--- a/engine/devel/apidocs/allclasses-frame.html
+++ b/engine/devel/apidocs/allclasses-frame.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>All Classes (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>All Classes (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -202,6 +202,7 @@
 <li><a href="org/apache/velocity/runtime/parser/node/SetPublicFieldExecutor.html" title="class in org.apache.velocity.runtime.parser.node" target="classFrame">SetPublicFieldExecutor</a></li>
 <li><a href="org/apache/velocity/runtime/parser/node/SimpleNode.html" title="class in org.apache.velocity.runtime.parser.node" target="classFrame">SimpleNode</a></li>
 <li><a href="org/apache/velocity/util/SimplePool.html" title="class in org.apache.velocity.util" target="classFrame">SimplePool</a></li>
+<li><a href="org/apache/velocity/spring/SpringResourceLoader.html" title="class in org.apache.velocity.spring" target="classFrame">SpringResourceLoader</a></li>
 <li><a href="org/apache/velocity/runtime/parser/StandardParser.html" title="class in org.apache.velocity.runtime.parser" target="classFrame">StandardParser</a></li>
 <li><a href="org/apache/velocity/runtime/parser/StandardParserConstants.html" title="interface in org.apache.velocity.runtime.parser" target="classFrame"><span class="interfaceName">StandardParserConstants</span></a></li>
 <li><a href="org/apache/velocity/runtime/parser/StandardParserTokenManager.html" title="class in org.apache.velocity.runtime.parser" target="classFrame">StandardParserTokenManager</a></li>
@@ -229,6 +230,7 @@
 <li><a href="org/apache/velocity/util/introspection/Uberspect.html" title="interface in org.apache.velocity.util.introspection" target="classFrame"><span class="interfaceName">Uberspect</span></a></li>
 <li><a href="org/apache/velocity/util/introspection/UberspectImpl.html" title="class in org.apache.velocity.util.introspection" target="classFrame">UberspectImpl</a></li>
 <li><a href="org/apache/velocity/util/introspection/UberspectImpl.VelGetterImpl.html" title="class in org.apache.velocity.util.introspection" target="classFrame">UberspectImpl.VelGetterImpl</a></li>
+<li><a href="org/apache/velocity/util/introspection/UberspectImpl.VelMethodImpl.html" title="class in org.apache.velocity.util.introspection" target="classFrame">UberspectImpl.VelMethodImpl</a></li>
 <li><a href="org/apache/velocity/util/introspection/UberspectImpl.VelSetterImpl.html" title="class in org.apache.velocity.util.introspection" target="classFrame">UberspectImpl.VelSetterImpl</a></li>
 <li><a href="org/apache/velocity/util/introspection/UberspectPublicFields.html" title="class in org.apache.velocity.util.introspection" target="classFrame">UberspectPublicFields</a></li>
 <li><a href="org/apache/velocity/io/UnicodeInputStream.html" title="class in org.apache.velocity.io" target="classFrame">UnicodeInputStream</a></li>
@@ -242,6 +244,9 @@
 <li><a href="org/apache/velocity/script/VelocityCompiledScript.html" title="class in org.apache.velocity.script" target="classFrame">VelocityCompiledScript</a></li>
 <li><a href="org/apache/velocity/VelocityContext.html" title="class in org.apache.velocity" target="classFrame">VelocityContext</a></li>
 <li><a href="org/apache/velocity/app/VelocityEngine.html" title="class in org.apache.velocity.app" target="classFrame">VelocityEngine</a></li>
+<li><a href="org/apache/velocity/spring/VelocityEngineFactory.html" title="class in org.apache.velocity.spring" target="classFrame">VelocityEngineFactory</a></li>
+<li><a href="org/apache/velocity/spring/VelocityEngineFactoryBean.html" title="class in org.apache.velocity.spring" target="classFrame">VelocityEngineFactoryBean</a></li>
+<li><a href="org/apache/velocity/spring/VelocityEngineUtils.html" title="class in org.apache.velocity.spring" target="classFrame">VelocityEngineUtils</a></li>
 <li><a href="org/apache/velocity/runtime/VelocityEngineVersion.html" title="class in org.apache.velocity.runtime" target="classFrame">VelocityEngineVersion</a></li>
 <li><a href="org/apache/velocity/exception/VelocityException.html" title="class in org.apache.velocity.exception" target="classFrame">VelocityException</a></li>
 <li><a href="org/apache/velocity/script/VelocityScriptEngine.html" title="class in org.apache.velocity.script" target="classFrame">VelocityScriptEngine</a></li>
diff --git a/engine/devel/apidocs/allclasses-noframe.html b/engine/devel/apidocs/allclasses-noframe.html
index 6d480de..caa1a1c 100644
--- a/engine/devel/apidocs/allclasses-noframe.html
+++ b/engine/devel/apidocs/allclasses-noframe.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>All Classes (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>All Classes (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -202,6 +202,7 @@
 <li><a href="org/apache/velocity/runtime/parser/node/SetPublicFieldExecutor.html" title="class in org.apache.velocity.runtime.parser.node">SetPublicFieldExecutor</a></li>
 <li><a href="org/apache/velocity/runtime/parser/node/SimpleNode.html" title="class in org.apache.velocity.runtime.parser.node">SimpleNode</a></li>
 <li><a href="org/apache/velocity/util/SimplePool.html" title="class in org.apache.velocity.util">SimplePool</a></li>
+<li><a href="org/apache/velocity/spring/SpringResourceLoader.html" title="class in org.apache.velocity.spring">SpringResourceLoader</a></li>
 <li><a href="org/apache/velocity/runtime/parser/StandardParser.html" title="class in org.apache.velocity.runtime.parser">StandardParser</a></li>
 <li><a href="org/apache/velocity/runtime/parser/StandardParserConstants.html" title="interface in org.apache.velocity.runtime.parser"><span class="interfaceName">StandardParserConstants</span></a></li>
 <li><a href="org/apache/velocity/runtime/parser/StandardParserTokenManager.html" title="class in org.apache.velocity.runtime.parser">StandardParserTokenManager</a></li>
@@ -229,6 +230,7 @@
 <li><a href="org/apache/velocity/util/introspection/Uberspect.html" title="interface in org.apache.velocity.util.introspection"><span class="interfaceName">Uberspect</span></a></li>
 <li><a href="org/apache/velocity/util/introspection/UberspectImpl.html" title="class in org.apache.velocity.util.introspection">UberspectImpl</a></li>
 <li><a href="org/apache/velocity/util/introspection/UberspectImpl.VelGetterImpl.html" title="class in org.apache.velocity.util.introspection">UberspectImpl.VelGetterImpl</a></li>
+<li><a href="org/apache/velocity/util/introspection/UberspectImpl.VelMethodImpl.html" title="class in org.apache.velocity.util.introspection">UberspectImpl.VelMethodImpl</a></li>
 <li><a href="org/apache/velocity/util/introspection/UberspectImpl.VelSetterImpl.html" title="class in org.apache.velocity.util.introspection">UberspectImpl.VelSetterImpl</a></li>
 <li><a href="org/apache/velocity/util/introspection/UberspectPublicFields.html" title="class in org.apache.velocity.util.introspection">UberspectPublicFields</a></li>
 <li><a href="org/apache/velocity/io/UnicodeInputStream.html" title="class in org.apache.velocity.io">UnicodeInputStream</a></li>
@@ -242,6 +244,9 @@
 <li><a href="org/apache/velocity/script/VelocityCompiledScript.html" title="class in org.apache.velocity.script">VelocityCompiledScript</a></li>
 <li><a href="org/apache/velocity/VelocityContext.html" title="class in org.apache.velocity">VelocityContext</a></li>
 <li><a href="org/apache/velocity/app/VelocityEngine.html" title="class in org.apache.velocity.app">VelocityEngine</a></li>
+<li><a href="org/apache/velocity/spring/VelocityEngineFactory.html" title="class in org.apache.velocity.spring">VelocityEngineFactory</a></li>
+<li><a href="org/apache/velocity/spring/VelocityEngineFactoryBean.html" title="class in org.apache.velocity.spring">VelocityEngineFactoryBean</a></li>
+<li><a href="org/apache/velocity/spring/VelocityEngineUtils.html" title="class in org.apache.velocity.spring">VelocityEngineUtils</a></li>
 <li><a href="org/apache/velocity/runtime/VelocityEngineVersion.html" title="class in org.apache.velocity.runtime">VelocityEngineVersion</a></li>
 <li><a href="org/apache/velocity/exception/VelocityException.html" title="class in org.apache.velocity.exception">VelocityException</a></li>
 <li><a href="org/apache/velocity/script/VelocityScriptEngine.html" title="class in org.apache.velocity.script">VelocityScriptEngine</a></li>
diff --git a/engine/devel/apidocs/constant-values.html b/engine/devel/apidocs/constant-values.html
index 0fdc3cc..a798a79 100644
--- a/engine/devel/apidocs/constant-values.html
+++ b/engine/devel/apidocs/constant-values.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Constant Field Values (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Constant Field Values (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Constant Field Values (Apache Velocity 2.2 API)";
+            parent.document.title="Constant Field Values (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -1044,7 +1044,7 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="org/apache/velocity/runtime/VelocityEngineVersion.html#VERSION">VERSION</a></code></td>
-<td class="colLast"><code>"2.2"</code></td>
+<td class="colLast"><code>"2.4-SNAPSHOT"</code></td>
 </tr>
 </tbody>
 </table>
@@ -2357,6 +2357,55 @@
 <ul class="blockList">
 <li class="blockList">
 <table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>org.apache.velocity.spring.<a href="org/apache/velocity/spring/SpringResourceLoader.html" title="class in org.apache.velocity.spring">SpringResourceLoader</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="org.apache.velocity.spring.SpringResourceLoader.NAME">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/apache/velocity/spring/SpringResourceLoader.html#NAME">NAME</a></code></td>
+<td class="colLast"><code>"spring"</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="org.apache.velocity.spring.SpringResourceLoader.SPRING_RESOURCE_LOADER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/apache/velocity/spring/SpringResourceLoader.html#SPRING_RESOURCE_LOADER">SPRING_RESOURCE_LOADER</a></code></td>
+<td class="colLast"><code>"spring.resource.loader"</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="org.apache.velocity.spring.SpringResourceLoader.SPRING_RESOURCE_LOADER_CACHE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/apache/velocity/spring/SpringResourceLoader.html#SPRING_RESOURCE_LOADER_CACHE">SPRING_RESOURCE_LOADER_CACHE</a></code></td>
+<td class="colLast"><code>"spring.resource.loader.cache"</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="org.apache.velocity.spring.SpringResourceLoader.SPRING_RESOURCE_LOADER_CLASS">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/apache/velocity/spring/SpringResourceLoader.html#SPRING_RESOURCE_LOADER_CLASS">SPRING_RESOURCE_LOADER_CLASS</a></code></td>
+<td class="colLast"><code>"spring.resource.loader.class"</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="org.apache.velocity.spring.SpringResourceLoader.SPRING_RESOURCE_LOADER_PATH">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/apache/velocity/spring/SpringResourceLoader.html#SPRING_RESOURCE_LOADER_PATH">SPRING_RESOURCE_LOADER_PATH</a></code></td>
+<td class="colLast"><code>"spring.resource.loader.path"</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
 <caption><span>org.apache.velocity.util.<a href="org/apache/velocity/util/ExtProperties.html" title="class in org.apache.velocity.util">ExtProperties</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -2451,6 +2500,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/deprecated-list.html b/engine/devel/apidocs/deprecated-list.html
index 1d3edbc..8bb7ce3 100644
--- a/engine/devel/apidocs/deprecated-list.html
+++ b/engine/devel/apidocs/deprecated-list.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Deprecated List (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Deprecated List (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Deprecated List (Apache Velocity 2.2 API)";
+            parent.document.title="Deprecated List (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -383,6 +383,18 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colOne"><a href="org/apache/velocity/spring/VelocityEngineUtils.html#mergeTemplate-org.apache.velocity.app.VelocityEngine-java.lang.String-java.util.Map-java.io.Writer-">org.apache.velocity.spring.VelocityEngineUtils.mergeTemplate(VelocityEngine, String, Map&lt;String, Object&gt;, Writer)</a>
+<div class="block"><span class="deprecationComment">Use <a href="org/apache/velocity/spring/VelocityEngineUtils.html#mergeTemplate-org.apache.velocity.app.VelocityEngine-java.lang.String-java.lang.String-java.util.Map-java.io.Writer-"><code>VelocityEngineUtils.mergeTemplate(VelocityEngine, String, String, Map, Writer)</code></a>
+ instead, following Velocity 1.6's corresponding deprecation in its own API.</span></div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="org/apache/velocity/spring/VelocityEngineUtils.html#mergeTemplateIntoString-org.apache.velocity.app.VelocityEngine-java.lang.String-java.util.Map-">org.apache.velocity.spring.VelocityEngineUtils.mergeTemplateIntoString(VelocityEngine, String, Map&lt;String, Object&gt;)</a>
+<div class="block"><span class="deprecationComment">Use <a href="org/apache/velocity/spring/VelocityEngineUtils.html#mergeTemplateIntoString-org.apache.velocity.app.VelocityEngine-java.lang.String-java.lang.String-java.util.Map-"><code>VelocityEngineUtils.mergeTemplateIntoString(VelocityEngine, String, String, Map)</code></a>
+ instead, following Velocity 1.6's corresponding deprecation in its own API.</span></div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/velocity/util/introspection/UberspectImpl.html#setLog-org.slf4j.Logger-">org.apache.velocity.util.introspection.UberspectImpl.setLog(Logger)</a>
 <div class="block"><span class="deprecationComment">logger is now set by default to the namespace logger "velocity.rendering".</span></div>
 </td>
@@ -439,6 +451,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/help-doc.html b/engine/devel/apidocs/help-doc.html
index 39ec589..1ec975f 100644
--- a/engine/devel/apidocs/help-doc.html
+++ b/engine/devel/apidocs/help-doc.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>API Help (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>API Help (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="API Help (Apache Velocity 2.2 API)";
+            parent.document.title="API Help (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -226,6 +226,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/index-all.html b/engine/devel/apidocs/index-all.html
index eb636f3..bcaaf4e 100644
--- a/engine/devel/apidocs/index-all.html
+++ b/engine/devel/apidocs/index-all.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Index (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Index (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Index (Apache Velocity 2.2 API)";
+            parent.document.title="Index (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -118,16 +118,16 @@
  when these raw version cannot be used as part of an ASCII
  string literal.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/ConversionHandler.html#addConverter-java.lang.Class-java.lang.Class-org.apache.velocity.util.introspection.Converter-">addConverter(Class, Class, Converter)</a></span> - Method in interface org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/ConversionHandler.html" title="interface in org.apache.velocity.util.introspection">ConversionHandler</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/ConversionHandler.html#addConverter-java.lang.Class-java.lang.Class-org.apache.velocity.util.introspection.Converter-">addConverter(Class&lt;?&gt;, Class&lt;?&gt;, Converter)</a></span> - Method in interface org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/ConversionHandler.html" title="interface in org.apache.velocity.util.introspection">ConversionHandler</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Add the given converter to the handler.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/TypeConversionHandler.html#addConverter-java.lang.reflect.Type-java.lang.Class-org.apache.velocity.util.introspection.Converter-">addConverter(Type, Class, Converter)</a></span> - Method in interface org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/TypeConversionHandler.html" title="interface in org.apache.velocity.util.introspection">TypeConversionHandler</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/TypeConversionHandler.html#addConverter-java.lang.reflect.Type-java.lang.Class-org.apache.velocity.util.introspection.Converter-">addConverter(Type, Class&lt;?&gt;, Converter&lt;?&gt;)</a></span> - Method in interface org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/TypeConversionHandler.html" title="interface in org.apache.velocity.util.introspection">TypeConversionHand [...]
 <dd>
 <div class="block">Add the given converter to the handler.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/TypeConversionHandlerImpl.html#addConverter-java.lang.reflect.Type-java.lang.Class-org.apache.velocity.util.introspection.Converter-">addConverter(Type, Class, Converter)</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/TypeConversionHandlerImpl.html" title="class in org.apache.velocity.util.introspection">TypeConversionHandlerImpl</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/TypeConversionHandlerImpl.html#addConverter-java.lang.reflect.Type-java.lang.Class-org.apache.velocity.util.introspection.Converter-">addConverter(Type, Class&lt;?&gt;, Converter&lt;?&gt;)</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/TypeConversionHandlerImpl.html" title="class in org.apache.velocity.util.introspection">TypeConversionHand [...]
 <dd>
 <div class="block">Add the given converter to the handler.</div>
 </dd>
@@ -227,6 +227,8 @@
 <dd>
 <div class="block">Method to adjust line and column numbers for the start of a token.<BR></div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineFactoryBean.html#afterPropertiesSet--">afterPropertiesSet()</a></span> - Method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineFactoryBean.html" title="class in org.apache.velocity.spring">VelocityEngineFactoryBean</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/StandardParserConstants.html#ALPHA_CHAR">ALPHA_CHAR</a></span> - Static variable in interface org.apache.velocity.runtime.parser.<a href="org/apache/velocity/runtime/parser/StandardParserConstants.html" title="interface in org.apache.velocity.runtime.parser">StandardParserConstants</a></dt>
 <dd>
 <div class="block">RegularExpression Id.</div>
@@ -465,7 +467,10 @@
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/ASTIdentifier.html#ASTIdentifier-org.apache.velocity.runtime.parser.Parser-int-">ASTIdentifier(Parser, int)</a></span> - Constructor for class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/ASTIdentifier.html" title="class in org.apache.velocity.runtime.parser.node">ASTIdentifier</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/velocity/runtime/parser/node/ASTIfStatement.html" title="class in org.apache.velocity.runtime.parser.node"><span class="typeNameLink">ASTIfStatement</span></a> - Class in <a href="org/apache/velocity/runtime/parser/node/package-summary.html">org.apache.velocity.runtime.parser.node</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Please look at the Parser.jjt file which is
+ what controls the generation of this class.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/ASTIfStatement.html#ASTIfStatement-int-">ASTIfStatement(int)</a></span> - Constructor for class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/ASTIfStatement.html" title="class in org.apache.velocity.runtime.parser.node">ASTIfStatement</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/ASTIfStatement.html#ASTIfStatement-org.apache.velocity.runtime.parser.Parser-int-">ASTIfStatement(Parser, int)</a></span> - Constructor for class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/ASTIfStatement.html" title="class in org.apache.velocity.runtime.parser.node">ASTIfStatement</a></dt>
@@ -800,9 +805,9 @@
   boolean object property, of the
   form public boolean is&lt;property&gt; when executed.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.html#BooleanPropertyExecutor-org.slf4j.Logger-org.apache.velocity.util.introspection.Introspector-java.lang.Class-java.lang.String-">BooleanPropertyExecutor(Logger, Introspector, Class, String)</a></span> - Constructor for class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.html" title="class in org.apache.velocity.ru [...]
+<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.html#BooleanPropertyExecutor-org.slf4j.Logger-org.apache.velocity.util.introspection.Introspector-java.lang.Class-java.lang.String-">BooleanPropertyExecutor(Logger, Introspector, Class&lt;?&gt;, String)</a></span> - Constructor for class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.html" title="class in org.apache.ve [...]
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.html#BooleanPropertyExecutor-org.slf4j.Logger-org.apache.velocity.util.introspection.Introspector-java.lang.Class-java.lang.String-boolean-">BooleanPropertyExecutor(Logger, Introspector, Class, String, boolean)</a></span> - Constructor for class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.html" title="class in org.a [...]
+<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.html#BooleanPropertyExecutor-org.slf4j.Logger-org.apache.velocity.util.introspection.Introspector-java.lang.Class-java.lang.String-boolean-">BooleanPropertyExecutor(Logger, Introspector, Class&lt;?&gt;, String, boolean)</a></span> - Constructor for class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.html" title="class [...]
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/StandardParserConstants.html#BRACKETED_WORD">BRACKETED_WORD</a></span> - Static variable in interface org.apache.velocity.runtime.parser.<a href="org/apache/velocity/runtime/parser/StandardParserConstants.html" title="interface in org.apache.velocity.runtime.parser">StandardParserConstants</a></dt>
 <dd>
@@ -902,11 +907,11 @@
 <div class="block">check that we aren't already at the max call depth and throws
  a MacroOverflowException if we are there.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/SecureIntrospectorControl.html#checkObjectExecutePermission-java.lang.Class-java.lang.String-">checkObjectExecutePermission(Class, String)</a></span> - Method in interface org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/SecureIntrospectorControl.html" title="interface in org.apache.velocity.util.introspection">SecureIntrospectorControl</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/SecureIntrospectorControl.html#checkObjectExecutePermission-java.lang.Class-java.lang.String-">checkObjectExecutePermission(Class&lt;?&gt;, String)</a></span> - Method in interface org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/SecureIntrospectorControl.html" title="interface in org.apache.velocity.util.introspection">SecureIntrospectorControl</a></dt>
 <dd>
 <div class="block">Determine which methods and classes to prevent from executing.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/SecureIntrospectorImpl.html#checkObjectExecutePermission-java.lang.Class-java.lang.String-">checkObjectExecutePermission(Class, String)</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/SecureIntrospectorImpl.html" title="class in org.apache.velocity.util.introspection">SecureIntrospectorImpl</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/SecureIntrospectorImpl.html#checkObjectExecutePermission-java.lang.Class-java.lang.String-">checkObjectExecutePermission(Class&lt;?&gt;, String)</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/SecureIntrospectorImpl.html" title="class in org.apache.velocity.util.introspection">SecureIntrospectorImpl</a></dt>
 <dd>
 <div class="block">Determine which methods and classes to prevent from executing.</div>
 </dd>
@@ -920,7 +925,7 @@
 <dd>
 <div class="block">A cache of introspection information for a specific class instance.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/ClassFieldMap.html#ClassFieldMap-java.lang.Class-org.slf4j.Logger-">ClassFieldMap(Class, Logger)</a></span> - Constructor for class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/ClassFieldMap.html" title="class in org.apache.velocity.util.introspection">ClassFieldMap</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/ClassFieldMap.html#ClassFieldMap-java.lang.Class-org.slf4j.Logger-">ClassFieldMap(Class&lt;?&gt;, Logger)</a></span> - Constructor for class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/ClassFieldMap.html" title="class in org.apache.velocity.util.introspection">ClassFieldMap</a></dt>
 <dd>
 <div class="block">Standard constructor</div>
 </dd>
@@ -928,11 +933,11 @@
 <dd>
 <div class="block">A cache of introspection information for a specific class instance.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/ClassMap.html#ClassMap-java.lang.Class-org.slf4j.Logger-">ClassMap(Class, Logger)</a></span> - Constructor for class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/ClassMap.html" title="class in org.apache.velocity.util.introspection">ClassMap</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/ClassMap.html#ClassMap-java.lang.Class-org.slf4j.Logger-">ClassMap(Class&lt;?&gt;, Logger)</a></span> - Constructor for class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/ClassMap.html" title="class in org.apache.velocity.util.introspection">ClassMap</a></dt>
 <dd>
 <div class="block">Standard constructor</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/ClassMap.html#ClassMap-java.lang.Class-org.slf4j.Logger-org.apache.velocity.util.introspection.TypeConversionHandler-">ClassMap(Class, Logger, TypeConversionHandler)</a></span> - Constructor for class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/ClassMap.html" title="class in org.apache.velocity.util.introspection">ClassMap</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/ClassMap.html#ClassMap-java.lang.Class-org.slf4j.Logger-org.apache.velocity.util.introspection.TypeConversionHandler-">ClassMap(Class&lt;?&gt;, Logger, TypeConversionHandler)</a></span> - Constructor for class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/ClassMap.html" title="class in org.apache.velocity.util.introspection">ClassMap</a></dt>
 <dd>
 <div class="block">Standard constructor</div>
 </dd>
@@ -1204,6 +1209,10 @@
 <dd>
 <div class="block">Create a new Resource of the specified type.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineFactory.html#createVelocityEngine--">createVelocityEngine()</a></span> - Method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineFactory.html" title="class in org.apache.velocity.spring">VelocityEngineFactory</a></dt>
+<dd>
+<div class="block">Prepare the VelocityEngine instance and return it.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/StandardParserTokenManager.html#curChar">curChar</a></span> - Variable in class org.apache.velocity.runtime.parser.<a href="org/apache/velocity/runtime/parser/StandardParserTokenManager.html" title="class in org.apache.velocity.runtime.parser">StandardParserTokenManager</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/StandardParser.html#currentTemplate">currentTemplate</a></span> - Variable in class org.apache.velocity.runtime.parser.<a href="org/apache/velocity/runtime/parser/StandardParser.html" title="class in org.apache.velocity.runtime.parser">StandardParser</a></dt>
@@ -1381,23 +1390,23 @@
 <dd>
 <div class="block">Disable tracing.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.html#discover-java.lang.Class-java.lang.String-">discover(Class, String)</a></span> - Method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.html" title="class in org.apache.velocity.runtime.parser.node">BooleanPropertyExecutor</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.html#discover-java.lang.Class-java.lang.String-">discover(Class&lt;?&gt;, String)</a></span> - Method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.html" title="class in org.apache.velocity.runtime.parser.node">BooleanPropertyExecutor</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/GetExecutor.html#discover-java.lang.Class-">discover(Class)</a></span> - Method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/GetExecutor.html" title="class in org.apache.velocity.runtime.parser.node">GetExecutor</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/GetExecutor.html#discover-java.lang.Class-">discover(Class&lt;?&gt;)</a></span> - Method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/GetExecutor.html" title="class in org.apache.velocity.runtime.parser.node">GetExecutor</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/MapGetExecutor.html#discover-java.lang.Object-">discover(Object)</a></span> - Method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/MapGetExecutor.html" title="class in org.apache.velocity.runtime.parser.node">MapGetExecutor</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/MapSetExecutor.html#discover-java.lang.Class-">discover(Class)</a></span> - Method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/MapSetExecutor.html" title="class in org.apache.velocity.runtime.parser.node">MapSetExecutor</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/MapSetExecutor.html#discover-java.lang.Class-">discover(Class&lt;?&gt;)</a></span> - Method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/MapSetExecutor.html" title="class in org.apache.velocity.runtime.parser.node">MapSetExecutor</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/PropertyExecutor.html#discover-java.lang.Class-java.lang.String-">discover(Class, String)</a></span> - Method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/PropertyExecutor.html" title="class in org.apache.velocity.runtime.parser.node">PropertyExecutor</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/PropertyExecutor.html#discover-java.lang.Class-java.lang.String-">discover(Class&lt;?&gt;, String)</a></span> - Method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/PropertyExecutor.html" title="class in org.apache.velocity.runtime.parser.node">PropertyExecutor</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/PublicFieldExecutor.html#discover-java.lang.Class-java.lang.String-">discover(Class, String)</a></span> - Method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/PublicFieldExecutor.html" title="class in org.apache.velocity.runtime.parser.node">PublicFieldExecutor</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/PublicFieldExecutor.html#discover-java.lang.Class-java.lang.String-">discover(Class&lt;?&gt;, String)</a></span> - Method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/PublicFieldExecutor.html" title="class in org.apache.velocity.runtime.parser.node">PublicFieldExecutor</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/PutExecutor.html#discover-java.lang.Class-java.lang.Object-">discover(Class, Object)</a></span> - Method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/PutExecutor.html" title="class in org.apache.velocity.runtime.parser.node">PutExecutor</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/PutExecutor.html#discover-java.lang.Class-java.lang.Object-">discover(Class&lt;?&gt;, Object)</a></span> - Method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/PutExecutor.html" title="class in org.apache.velocity.runtime.parser.node">PutExecutor</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/SetPropertyExecutor.html#discover-java.lang.Class-java.lang.String-java.lang.Object-">discover(Class, String, Object)</a></span> - Method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/SetPropertyExecutor.html" title="class in org.apache.velocity.runtime.parser.node">SetPropertyExecutor</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/SetPropertyExecutor.html#discover-java.lang.Class-java.lang.String-java.lang.Object-">discover(Class&lt;?&gt;, String, Object)</a></span> - Method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/SetPropertyExecutor.html" title="class in org.apache.velocity.runtime.parser.node">SetPropertyExecutor</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/SetPublicFieldExecutor.html#discover-java.lang.Class-java.lang.String-java.lang.Object-">discover(Class, String, Object)</a></span> - Method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/SetPublicFieldExecutor.html" title="class in org.apache.velocity.runtime.parser.node">SetPublicFieldExecutor</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/SetPublicFieldExecutor.html#discover-java.lang.Class-java.lang.String-java.lang.Object-">discover(Class&lt;?&gt;, String, Object)</a></span> - Method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/SetPublicFieldExecutor.html" title="class in org.apache.velocity.runtime.parser.node">SetPublicFieldExecutor</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/util/ExtProperties.html#display--">display()</a></span> - Method in class org.apache.velocity.util.<a href="org/apache/velocity/util/ExtProperties.html" title="class in org.apache.velocity.util">ExtProperties</a></dt>
 <dd>
@@ -2023,7 +2032,7 @@
 <dd>
 <div class="block">Find a Field using the field name.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/DuckType.html#findMethod-java.lang.Class-org.apache.velocity.util.DuckType.Types-">findMethod(Class, DuckType.Types)</a></span> - Static method in class org.apache.velocity.util.<a href="org/apache/velocity/util/DuckType.html" title="class in org.apache.velocity.util">DuckType</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/DuckType.html#findMethod-java.lang.Class-org.apache.velocity.util.DuckType.Types-">findMethod(Class&lt;?&gt;, DuckType.Types)</a></span> - Static method in class org.apache.velocity.util.<a href="org/apache/velocity/util/DuckType.html" title="class in org.apache.velocity.util">DuckType</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/ClassMap.html#findMethod-java.lang.String-java.lang.Object:A-">findMethod(String, Object[])</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/ClassMap.html" title="class in org.apache.velocity.util.introspection">ClassMap</a></dt>
 <dd>
@@ -2172,7 +2181,7 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/util/DuckType.html#get-java.lang.Object-org.apache.velocity.util.DuckType.Types-">get(Object, DuckType.Types)</a></span> - Static method in class org.apache.velocity.util.<a href="org/apache/velocity/util/DuckType.html" title="class in org.apache.velocity.util">DuckType</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/IntrospectorCache.html#get-java.lang.Class-">get(Class)</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/IntrospectorCache.html" title="class in org.apache.velocity.util.introspection">IntrospectorCache</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/IntrospectorCache.html#get-java.lang.Class-">get(Class&lt;?&gt;)</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/IntrospectorCache.html" title="class in org.apache.velocity.util.introspection">IntrospectorCache</a></dt>
 <dd>
 <div class="block">Lookup a given Class object in the cache.</div>
 </dd>
@@ -2550,7 +2559,7 @@
 <div class="block">Executor that simply tries to execute a get(key)
  operation.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/GetExecutor.html#GetExecutor-org.slf4j.Logger-org.apache.velocity.util.introspection.Introspector-java.lang.Class-java.lang.String-">GetExecutor(Logger, Introspector, Class, String)</a></span> - Constructor for class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/GetExecutor.html" title="class in org.apache.velocity.runtime.parser.node">GetExecutor</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/GetExecutor.html#GetExecutor-org.slf4j.Logger-org.apache.velocity.util.introspection.Introspector-java.lang.Class-java.lang.String-">GetExecutor(Logger, Introspector, Class&lt;?&gt;, String)</a></span> - Constructor for class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/GetExecutor.html" title="class in org.apache.velocity.runtime.parser.node">GetExecutor</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/script/VelocityScriptEngineFactory.html#getExtensions--">getExtensions()</a></span> - Method in class org.apache.velocity.script.<a href="org/apache/velocity/script/VelocityScriptEngineFactory.html" title="class in org.apache.velocity.script">VelocityScriptEngineFactory</a></dt>
 <dd>
@@ -2564,11 +2573,11 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/SetPublicFieldExecutor.html#getField--">getField()</a></span> - Method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/SetPublicFieldExecutor.html" title="class in org.apache.velocity.runtime.parser.node">SetPublicFieldExecutor</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/IntrospectorBase.html#getField-java.lang.Class-java.lang.String-">getField(Class, String)</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/IntrospectorBase.html" title="class in org.apache.velocity.util.introspection">IntrospectorBase</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/IntrospectorBase.html#getField-java.lang.Class-java.lang.String-">getField(Class&lt;?&gt;, String)</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/IntrospectorBase.html" title="class in org.apache.velocity.util.introspection">IntrospectorBase</a></dt>
 <dd>
 <div class="block">Gets the field defined by <code>name</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/IntrospectorCache.html#getFieldMap-java.lang.Class-">getFieldMap(Class)</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/IntrospectorCache.html" title="class in org.apache.velocity.util.introspection">IntrospectorCache</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/IntrospectorCache.html#getFieldMap-java.lang.Class-">getFieldMap(Class&lt;?&gt;)</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/IntrospectorCache.html" title="class in org.apache.velocity.util.introspection">IntrospectorCache</a></dt>
 <dd>
 <div class="block">Lookup a given Class object in the cache.</div>
 </dd>
@@ -2805,6 +2814,8 @@
 <dd>
 <div class="block">Returns the modification date of the template.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/SpringResourceLoader.html#getLastModified-org.apache.velocity.runtime.resource.Resource-">getLastModified(Resource)</a></span> - Method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/SpringResourceLoader.html" title="class in org.apache.velocity.spring">SpringResourceLoader</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/Node.html#getLastToken--">getLastToken()</a></span> - Method in interface org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/SimpleNode.html#getLastToken--">getLastToken()</a></span> - Method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/SimpleNode.html" title="class in org.apache.velocity.runtime.parser.node">SimpleNode</a></dt>
@@ -3047,7 +3058,7 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/SetExecutor.html#getMethod--">getMethod()</a></span> - Method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/SetExecutor.html" title="class in org.apache.velocity.runtime.parser.node">SetExecutor</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/ClassUtils.html#getMethod-java.lang.String-java.lang.Object:A-java.lang.Class:A-java.lang.Object-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.SimpleNode-boolean-">getMethod(String, Object[], Class[], Object, InternalContextAdapter, SimpleNode, boolean)</a></span> - Static method in class org.apache.velocity.util.<a href="org/apache/velocity/util/ClassUtils.html" title="class i [...]
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/ClassUtils.html#getMethod-java.lang.String-java.lang.Object:A-java.lang.Class:A-java.lang.Object-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.SimpleNode-boolean-">getMethod(String, Object[], Class&lt;?&gt;[], Object, InternalContextAdapter, SimpleNode, boolean)</a></span> - Static method in class org.apache.velocity.util.<a href="org/apache/velocity/util/ClassUtils.html" title [...]
 <dd>
 <div class="block">Lookup a VelMethod object given the method signature that is specified in
  the passed in parameters.</div>
@@ -3058,12 +3069,12 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/DeprecatedCheckUberspector.html#getMethod-java.lang.Object-java.lang.String-java.lang.Object:A-org.apache.velocity.util.introspection.Info-">getMethod(Object, String, Object[], Info)</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/DeprecatedCheckUberspector.html" title="class in org.apache.velocity.util.introspection">DeprecatedCheckUberspec [...]
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/Introspector.html#getMethod-java.lang.Class-java.lang.String-java.lang.Object:A-">getMethod(Class, String, Object[])</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/Introspector.html" title="class in org.apache.velocity.util.introspection">Introspector</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/Introspector.html#getMethod-java.lang.Class-java.lang.String-java.lang.Object:A-">getMethod(Class&lt;?&gt;, String, Object[])</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/Introspector.html" title="class in org.apache.velocity.util.introspection">Introspector</a></dt>
 <dd>
 <div class="block">Gets the method defined by <code>name</code> and
  <code>params</code> for the Class <code>c</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/IntrospectorBase.html#getMethod-java.lang.Class-java.lang.String-java.lang.Object:A-">getMethod(Class, String, Object[])</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/IntrospectorBase.html" title="class in org.apache.velocity.util.introspection">IntrospectorBase</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/IntrospectorBase.html#getMethod-java.lang.Class-java.lang.String-java.lang.Object:A-">getMethod(Class&lt;?&gt;, String, Object[])</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/IntrospectorBase.html" title="class in org.apache.velocity.util.introspection">IntrospectorBase</a></dt>
 <dd>
 <div class="block">Gets the method defined by <code>name</code> and
  <code>params</code> for the Class <code>c</code>.</div>
@@ -3072,7 +3083,7 @@
 <dd>
 <div class="block">Method</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/SecureIntrospectorImpl.html#getMethod-java.lang.Class-java.lang.String-java.lang.Object:A-">getMethod(Class, String, Object[])</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/SecureIntrospectorImpl.html" title="class in org.apache.velocity.util.introspection">SecureIntrospectorImpl</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/SecureIntrospectorImpl.html#getMethod-java.lang.Class-java.lang.String-java.lang.Object:A-">getMethod(Class&lt;?&gt;, String, Object[])</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/SecureIntrospectorImpl.html" title="class in org.apache.velocity.util.introspection">SecureIntrospectorImpl</a></dt>
 <dd>
 <div class="block">Get the Method object corresponding to the given class, name and parameters.</div>
 </dd>
@@ -3200,18 +3211,18 @@
 <dd>
 <div class="block">get the list of names</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/ConversionHandler.html#getNeededConverter-java.lang.Class-java.lang.Class-">getNeededConverter(Class, Class)</a></span> - Method in interface org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/ConversionHandler.html" title="interface in org.apache.velocity.util.introspection">ConversionHandler</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/ConversionHandler.html#getNeededConverter-java.lang.Class-java.lang.Class-">getNeededConverter(Class&lt;?&gt;, Class&lt;?&gt;)</a></span> - Method in interface org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/ConversionHandler.html" title="interface in org.apache.velocity.util.introspection">ConversionHandler</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Returns the appropriate Converter object needed for an explicit conversion
  Returns null if no conversion is needed.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/TypeConversionHandler.html#getNeededConverter-java.lang.reflect.Type-java.lang.Class-">getNeededConverter(Type, Class)</a></span> - Method in interface org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/TypeConversionHandler.html" title="interface in org.apache.velocity.util.introspection">TypeConversionHandler</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/TypeConversionHandler.html#getNeededConverter-java.lang.reflect.Type-java.lang.Class-">getNeededConverter(Type, Class&lt;?&gt;)</a></span> - Method in interface org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/TypeConversionHandler.html" title="interface in org.apache.velocity.util.introspection">TypeConversionHandler</a></dt>
 <dd>
 <div class="block">Returns the appropriate Converter object needed for an explicit conversion
  Returns null if no conversion is needed.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/TypeConversionHandlerImpl.html#getNeededConverter-java.lang.reflect.Type-java.lang.Class-">getNeededConverter(Type, Class)</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/TypeConversionHandlerImpl.html" title="class in org.apache.velocity.util.introspection">TypeConversionHandlerImpl</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/TypeConversionHandlerImpl.html#getNeededConverter-java.lang.reflect.Type-java.lang.Class-">getNeededConverter(Type, Class&lt;?&gt;)</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/TypeConversionHandlerImpl.html" title="class in org.apache.velocity.util.introspection">TypeConversionHandlerImpl</a></dt>
 <dd>
 <div class="block">Returns the appropriate Converter object needed for an explicit conversion
  Returns null if no conversion is needed.</div>
@@ -3232,6 +3243,10 @@
 <dd>
 <div class="block">returns the number of ars needed for this VM</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineFactoryBean.html#getObject--">getObject()</a></span> - Method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineFactoryBean.html" title="class in org.apache.velocity.spring">VelocityEngineFactoryBean</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineFactoryBean.html#getObjectType--">getObjectType()</a></span> - Method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineFactoryBean.html" title="class in org.apache.velocity.spring">VelocityEngineFactoryBean</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/script/VelocityScriptEngineFactory.html#getOutputStatement-java.lang.String-">getOutputStatement(String)</a></span> - Method in class org.apache.velocity.script.<a href="org/apache/velocity/script/VelocityScriptEngineFactory.html" title="class in org.apache.velocity.script">VelocityScriptEngineFactory</a></dt>
 <dd>
 <div class="block">get VTL expression used to display specified string</div>
@@ -3406,7 +3421,7 @@
 <dd>
 <div class="block">Gets the named resource.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/ClassUtils.html#getResourceAsStream-java.lang.Class-java.lang.String-">getResourceAsStream(Class, String)</a></span> - Static method in class org.apache.velocity.util.<a href="org/apache/velocity/util/ClassUtils.html" title="class in org.apache.velocity.util">ClassUtils</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/ClassUtils.html#getResourceAsStream-java.lang.Class-java.lang.String-">getResourceAsStream(Class&lt;?&gt;, String)</a></span> - Static method in class org.apache.velocity.util.<a href="org/apache/velocity/util/ClassUtils.html" title="class in org.apache.velocity.util">ClassUtils</a></dt>
 <dd>
 <div class="block">Finds a resource with the given name.</div>
 </dd>
@@ -3415,6 +3430,10 @@
 <div class="block">Return the template loader that pulled
  in the template stream</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineFactory.html#getResourceLoader--">getResourceLoader()</a></span> - Method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineFactory.html" title="class in org.apache.velocity.spring">VelocityEngineFactory</a></dt>
+<dd>
+<div class="block">Return the Spring ResourceLoader to use for loading Velocity template files.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.html#getResourceReader-java.lang.String-java.lang.String-">getResourceReader(String, String)</a></span> - Method in class org.apache.velocity.runtime.resource.loader.<a href="org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.html" title="class in org.apache.velocity.runtime.resource.loader">ClasspathResourceLoader</a></dt>
 <dd>
 <div class="block">Get a Reader so that the Runtime can build a
@@ -3452,6 +3471,11 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/script/VelocityScriptEngine.SingleResourceReader.html#getResourceReader-java.lang.String-java.lang.String-">getResourceReader(String, String)</a></span> - Method in class org.apache.velocity.script.<a href="org/apache/velocity/script/VelocityScriptEngine.SingleResourceReader.html" title="class in org.apache.velocity.script">VelocityScriptEngine.SingleResourceReader</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/SpringResourceLoader.html#getResourceReader-java.lang.String-java.lang.String-">getResourceReader(String, String)</a></span> - Method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/SpringResourceLoader.html" title="class in org.apache.velocity.spring">SpringResourceLoader</a></dt>
+<dd>
+<div class="block">Get the Reader that the Runtime will parse
+ to create a template.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/UberspectImpl.VelMethodImpl.html#getReturnType--">getReturnType()</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/UberspectImpl.VelMethodImpl.html" title="class in org.apache.velocity.util.introspection">UberspectImpl.VelMethodImpl</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/VelMethod.html#getReturnType--">getReturnType()</a></span> - Method in interface org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/VelMethod.html" title="interface in org.apache.velocity.util.introspection">VelMethod</a></dt>
@@ -4272,6 +4296,8 @@
 <div class="block">Initialize the Velocity Runtime with the name of
  a properties file.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/SpringResourceLoader.html#init-org.apache.velocity.util.ExtProperties-">init(ExtProperties)</a></span> - Method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/SpringResourceLoader.html" title="class in org.apache.velocity.spring">SpringResourceLoader</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/AbstractChainableUberspector.html#init--">init()</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/AbstractChainableUberspector.html" title="class in org.apache.velocity.util.introspection">AbstractChainableUberspector</a></dt>
 <dd>
 <div class="block">init - the chainable uberspector is responsible for the initialization of the wrapped uberspector</div>
@@ -4324,11 +4350,20 @@
 <dd>
 <div class="block">Initialize the ResourceManager.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineFactory.html#initSpringResourceLoader-org.apache.velocity.app.VelocityEngine-java.lang.String-">initSpringResourceLoader(VelocityEngine, String)</a></span> - Method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineFactory.html" title="class in org.apache.velocity.spring">VelocityEngineFactory</a></dt>
+<dd>
+<div class="block">Initialize a SpringResourceLoader for the given VelocityEngine.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/VelocimacroFactory.html#initVelocimacro--">initVelocimacro()</a></span> - Method in class org.apache.velocity.runtime.<a href="org/apache/velocity/runtime/VelocimacroFactory.html" title="class in org.apache.velocity.runtime">VelocimacroFactory</a></dt>
 <dd>
 <div class="block">initialize the factory - setup all permissions
   load all global libraries.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineFactory.html#initVelocityResourceLoader-org.apache.velocity.app.VelocityEngine-java.lang.String-">initVelocityResourceLoader(VelocityEngine, String)</a></span> - Method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineFactory.html" title="class in org.apache.velocity.spring">VelocityEngineFactory</a></dt>
+<dd>
+<div class="block">Initialize a Velocity resource loader for the given VelocityEngine:
+ either a standard Velocity FileResourceLoader or a SpringResourceLoader.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/StandardParserConstants.html#INLINE_TEXT">INLINE_TEXT</a></span> - Static variable in interface org.apache.velocity.runtime.parser.<a href="org/apache/velocity/runtime/parser/StandardParserConstants.html" title="interface in org.apache.velocity.runtime.parser">StandardParserConstants</a></dt>
 <dd>
 <div class="block">RegularExpression Id.</div>
@@ -4471,7 +4506,7 @@
 <dd>
 <div class="block">Switch for the interpolation facility for string literals.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/ExtProperties.html#interpolateHelper-java.lang.String-java.util.List-">interpolateHelper(String, List)</a></span> - Method in class org.apache.velocity.util.<a href="org/apache/velocity/util/ExtProperties.html" title="class in org.apache.velocity.util">ExtProperties</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/ExtProperties.html#interpolateHelper-java.lang.String-java.util.List-">interpolateHelper(String, List&lt;String&gt;)</a></span> - Method in class org.apache.velocity.util.<a href="org/apache/velocity/util/ExtProperties.html" title="class in org.apache.velocity.util">ExtProperties</a></dt>
 <dd>
 <div class="block">Recursive handler for multiple levels of interpolation.</div>
 </dd>
@@ -4721,16 +4756,16 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/example/EventExample.html#isErrorEnabled--">isErrorEnabled()</a></span> - Method in class org.apache.velocity.example.<a href="org/apache/velocity/example/EventExample.html" title="class in org.apache.velocity.example">EventExample</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/ConversionHandler.html#isExplicitlyConvertible-java.lang.Class-java.lang.Class-boolean-">isExplicitlyConvertible(Class, Class, boolean)</a></span> - Method in interface org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/ConversionHandler.html" title="interface in org.apache.velocity.util.introspection">ConversionHandler</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/ConversionHandler.html#isExplicitlyConvertible-java.lang.Class-java.lang.Class-boolean-">isExplicitlyConvertible(Class&lt;?&gt;, Class&lt;?&gt;, boolean)</a></span> - Method in interface org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/ConversionHandler.html" title="interface in org.apache.velocity.util.introspection">ConversionHandler</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Check to see if the conversion can be done using an explicit conversion</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/TypeConversionHandler.html#isExplicitlyConvertible-java.lang.reflect.Type-java.lang.Class-boolean-">isExplicitlyConvertible(Type, Class, boolean)</a></span> - Method in interface org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/TypeConversionHandler.html" title="interface in org.apache.velocity.util.introspection">TypeConversionHandler</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/TypeConversionHandler.html#isExplicitlyConvertible-java.lang.reflect.Type-java.lang.Class-boolean-">isExplicitlyConvertible(Type, Class&lt;?&gt;, boolean)</a></span> - Method in interface org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/TypeConversionHandler.html" title="interface in org.apache.velocity.util.introspection">TypeConversionHandler</a></dt>
 <dd>
 <div class="block">Check to see if the conversion can be done using an explicit conversion</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/TypeConversionHandlerImpl.html#isExplicitlyConvertible-java.lang.reflect.Type-java.lang.Class-boolean-">isExplicitlyConvertible(Type, Class, boolean)</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/TypeConversionHandlerImpl.html" title="class in org.apache.velocity.util.introspection">TypeConversionHandlerImpl</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/TypeConversionHandlerImpl.html#isExplicitlyConvertible-java.lang.reflect.Type-java.lang.Class-boolean-">isExplicitlyConvertible(Type, Class&lt;?&gt;, boolean)</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/TypeConversionHandlerImpl.html" title="class in org.apache.velocity.util.introspection">TypeConversionHandlerImpl</a></dt>
 <dd>
 <div class="block">Check to see if the conversion can be done using an explicit conversion</div>
 </dd>
@@ -4787,7 +4822,7 @@
 <div class="block">This always returns true because logging levels can't be disabled in
  this impl.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/IntrospectionUtils.html#isMethodInvocationConvertible-java.lang.reflect.Type-java.lang.Class-boolean-">isMethodInvocationConvertible(Type, Class, boolean)</a></span> - Static method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/IntrospectionUtils.html" title="class in org.apache.velocity.util.introspection">IntrospectionUtils</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/IntrospectionUtils.html#isMethodInvocationConvertible-java.lang.reflect.Type-java.lang.Class-boolean-">isMethodInvocationConvertible(Type, Class&lt;?&gt;, boolean)</a></span> - Static method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/IntrospectionUtils.html" title="class in org.apache.velocity.util.introspection">IntrospectionUtils</a></dt>
 <dd>
 <div class="block">Determines whether a type represented by a class object is
  convertible to another type represented by a class object using a
@@ -4795,6 +4830,10 @@
  types as if they were primitive types (that is, a Boolean actual
  parameter type matches boolean primitive formal type).</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineFactory.html#isPreferFileSystemAccess--">isPreferFileSystemAccess()</a></span> - Method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineFactory.html" title="class in org.apache.velocity.spring">VelocityEngineFactory</a></dt>
+<dd>
+<div class="block">Return whether to prefer file system access for template loading.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/RuntimeInstance.html#isScopeControlEnabled-java.lang.String-">isScopeControlEnabled(String)</a></span> - Method in class org.apache.velocity.runtime.<a href="org/apache/velocity/runtime/RuntimeInstance.html" title="class in org.apache.velocity.runtime">RuntimeInstance</a></dt>
 <dd>
 <div class="block">Get whether to provide a scope control object for this scope</div>
@@ -4825,6 +4864,8 @@
 <div class="block">Since there is no processing of content,
  there is never a need for an internal scope.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineFactoryBean.html#isSingleton--">isSingleton()</a></span> - Method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineFactoryBean.html" title="class in org.apache.velocity.spring">VelocityEngineFactoryBean</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/io/UnicodeInputStream.html#isSkipBOM--">isSkipBOM()</a></span> - Method in class org.apache.velocity.io.<a href="org/apache/velocity/io/UnicodeInputStream.html" title="class in org.apache.velocity.io">UnicodeInputStream</a></dt>
 <dd>
 <div class="block">Returns true if the input stream discards the BOM.</div>
@@ -4853,7 +4894,9 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/resource/Resource.html#isSourceModified--">isSourceModified()</a></span> - Method in class org.apache.velocity.runtime.resource.<a href="org/apache/velocity/runtime/resource/Resource.html" title="class in org.apache.velocity.runtime.resource">Resource</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/IntrospectionUtils.html#isStrictMethodInvocationConvertible-java.lang.reflect.Type-java.lang.Class-boolean-">isStrictMethodInvocationConvertible(Type, Class, boolean)</a></span> - Static method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/IntrospectionUtils.html" title="class in org.apache.velocity.util.introspection">IntrospectionUtils</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/SpringResourceLoader.html#isSourceModified-org.apache.velocity.runtime.resource.Resource-">isSourceModified(Resource)</a></span> - Method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/SpringResourceLoader.html" title="class in org.apache.velocity.spring">SpringResourceLoader</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/IntrospectionUtils.html#isStrictMethodInvocationConvertible-java.lang.reflect.Type-java.lang.Class-boolean-">isStrictMethodInvocationConvertible(Type, Class&lt;?&gt;, boolean)</a></span> - Static method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/IntrospectionUtils.html" title="class in org.apache.velocity.util.introspection">IntrospectionUtils</a></dt>
 <dd>
 <div class="block">Determines whether a type represented by a class object is
  convertible to another type represented by a class object using a
@@ -5356,6 +5399,10 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/LogContext.html#logger">logger</a></span> - Static variable in class org.apache.velocity.runtime.parser.<a href="org/apache/velocity/runtime/parser/LogContext.html" title="class in org.apache.velocity.runtime.parser">LogContext</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/SpringResourceLoader.html#logger">logger</a></span> - Variable in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/SpringResourceLoader.html" title="class in org.apache.velocity.spring">SpringResourceLoader</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineFactory.html#logger">logger</a></span> - Static variable in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineFactory.html" title="class in org.apache.velocity.spring">VelocityEngineFactory</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/util/DeprecationAwareExtProperties.html#logger">logger</a></span> - Static variable in class org.apache.velocity.util.<a href="org/apache/velocity/util/DeprecationAwareExtProperties.html" title="class in org.apache.velocity.util">DeprecationAwareExtProperties</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
@@ -5534,7 +5581,7 @@
 <div class="block">The AST node structure is merged with the
  context to produce the final output.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/Template.html#merge-org.apache.velocity.context.Context-java.io.Writer-java.util.List-">merge(Context, Writer, List)</a></span> - Method in class org.apache.velocity.<a href="org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/Template.html#merge-org.apache.velocity.context.Context-java.io.Writer-java.util.List-">merge(Context, Writer, List&lt;String&gt;)</a></span> - Method in class org.apache.velocity.<a href="org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></dt>
 <dd>
 <div class="block">The AST node structure is merged with the
  context to produce the final output.</div>
@@ -5547,27 +5594,50 @@
 <dd>
 <div class="block">merges a template and puts the rendered stream into the writer</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineUtils.html#mergeTemplate-org.apache.velocity.app.VelocityEngine-java.lang.String-java.util.Map-java.io.Writer-">mergeTemplate(VelocityEngine, String, Map&lt;String, Object&gt;, Writer)</a></span> - Static method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineUtils.html" title="class in org.apache.velocity.spring">VelocityEngineUtils</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">Use <a href="org/apache/velocity/spring/VelocityEngineUtils.html#mergeTemplate-org.apache.velocity.app.VelocityEngine-java.lang.String-java.lang.String-java.util.Map-java.io.Writer-"><code>VelocityEngineUtils.mergeTemplate(VelocityEngine, String, String, Map, Writer)</code></a>
+ instead, following Velocity 1.6's corresponding deprecation in its own API.</span></div>
+</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineUtils.html#mergeTemplate-org.apache.velocity.app.VelocityEngine-java.lang.String-java.lang.String-java.util.Map-java.io.Writer-">mergeTemplate(VelocityEngine, String, String, Map&lt;String, Object&gt;, Writer)</a></span> - Static method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineUtils.html" title="class in org.apache.velocity.spring">VelocityEngineUtils</a></dt>
+<dd>
+<div class="block">Merge the specified Velocity template with the given model and write the result
+ to the given Writer.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineUtils.html#mergeTemplateIntoString-org.apache.velocity.app.VelocityEngine-java.lang.String-java.util.Map-">mergeTemplateIntoString(VelocityEngine, String, Map&lt;String, Object&gt;)</a></span> - Static method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineUtils.html" title="class in org.apache.velocity.spring">VelocityEngineUtils</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">Use <a href="org/apache/velocity/spring/VelocityEngineUtils.html#mergeTemplateIntoString-org.apache.velocity.app.VelocityEngine-java.lang.String-java.lang.String-java.util.Map-"><code>VelocityEngineUtils.mergeTemplateIntoString(VelocityEngine, String, String, Map)</code></a>
+ instead, following Velocity 1.6's corresponding deprecation in its own API.</span></div>
+</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineUtils.html#mergeTemplateIntoString-org.apache.velocity.app.VelocityEngine-java.lang.String-java.lang.String-java.util.Map-">mergeTemplateIntoString(VelocityEngine, String, String, Map&lt;String, Object&gt;)</a></span> - Static method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineUtils.html" title="class in org.apache.velocity.spring">VelocityEngineUtils</a></dt>
+<dd>
+<div class="block">Merge the specified Velocity template with the given model into a String.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/StandardParser.html#Method--">Method()</a></span> - Method in class org.apache.velocity.runtime.parser.<a href="org/apache/velocity/runtime/parser/StandardParser.html" title="class in org.apache.velocity.runtime.parser">StandardParser</a></dt>
 <dd>
 <div class="block">This method has yet to be fully implemented
  but will allow arbitrarily nested method
  calls</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/ASTMethod.MethodCacheKey.html#MethodCacheKey-java.lang.String-java.lang.Class:A-boolean-">MethodCacheKey(String, Class[], boolean)</a></span> - Constructor for class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/ASTMethod.MethodCacheKey.html" title="class in org.apache.velocity.runtime.parser.node">ASTMethod.MethodCacheKey</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/ASTMethod.MethodCacheKey.html#MethodCacheKey-java.lang.String-java.lang.Class:A-boolean-">MethodCacheKey(String, Class&lt;?&gt;[], boolean)</a></span> - Constructor for class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/ASTMethod.MethodCacheKey.html" title="class in org.apache.velocity.runtime.parser.node">ASTMethod.MethodCacheKey</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/app/event/EventCartridge.html#methodException-org.apache.velocity.context.Context-java.lang.Class-java.lang.String-java.lang.Exception-org.apache.velocity.util.introspection.Info-">methodException(Context, Class, String, Exception, Info)</a></span> - Method in class org.apache.velocity.app.event.<a href="org/apache/velocity/app/event/EventCartridge.html" title="class in org.apache.velocity.app.event">EventCartridge</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/app/event/EventCartridge.html#methodException-org.apache.velocity.context.Context-java.lang.Class-java.lang.String-java.lang.Exception-org.apache.velocity.util.introspection.Info-">methodException(Context, Class&lt;?&gt;, String, Exception, Info)</a></span> - Method in class org.apache.velocity.app.event.<a href="org/apache/velocity/app/event/EventCartridge.html" title="class in org.apache.velocity.app.event">EventCartridge</a></dt>
 <dd>
 <div class="block">Call method exception event handler</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/app/event/EventHandlerUtil.html#methodException-org.apache.velocity.runtime.RuntimeServices-org.apache.velocity.context.InternalContextAdapter-java.lang.Class-java.lang.String-java.lang.Exception-org.apache.velocity.util.introspection.Info-">methodException(RuntimeServices, InternalContextAdapter, Class, String, Exception, Info)</a></span> - Static method in class org.apache.velocity.app.event.<a href="org/apache/velocity/app/ [...]
+<dt><span class="memberNameLink"><a href="org/apache/velocity/app/event/EventHandlerUtil.html#methodException-org.apache.velocity.runtime.RuntimeServices-org.apache.velocity.context.InternalContextAdapter-java.lang.Class-java.lang.String-java.lang.Exception-org.apache.velocity.util.introspection.Info-">methodException(RuntimeServices, InternalContextAdapter, Class&lt;?&gt;, String, Exception, Info)</a></span> - Static method in class org.apache.velocity.app.event.<a href="org/apache/velo [...]
 <dd>
 <div class="block">Called when a method exception is generated during Velocity merge.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/app/event/implement/PrintExceptions.html#methodException-org.apache.velocity.context.Context-java.lang.Class-java.lang.String-java.lang.Exception-org.apache.velocity.util.introspection.Info-">methodException(Context, Class, String, Exception, Info)</a></span> - Method in class org.apache.velocity.app.event.implement.<a href="org/apache/velocity/app/event/implement/PrintExceptions.html" title="class in org.apache.velocity.app.e [...]
+<dt><span class="memberNameLink"><a href="org/apache/velocity/app/event/implement/PrintExceptions.html#methodException-org.apache.velocity.context.Context-java.lang.Class-java.lang.String-java.lang.Exception-org.apache.velocity.util.introspection.Info-">methodException(Context, Class&lt;?&gt;, String, Exception, Info)</a></span> - Method in class org.apache.velocity.app.event.implement.<a href="org/apache/velocity/app/event/implement/PrintExceptions.html" title="class in org.apache.veloc [...]
 <dd>
 <div class="block">Render the method exception, and optionally the exception message and stack trace.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/app/event/MethodExceptionEventHandler.html#methodException-org.apache.velocity.context.Context-java.lang.Class-java.lang.String-java.lang.Exception-org.apache.velocity.util.introspection.Info-">methodException(Context, Class, String, Exception, Info)</a></span> - Method in interface org.apache.velocity.app.event.<a href="org/apache/velocity/app/event/MethodExceptionEventHandler.html" title="interface in org.apache.velocity.app [...]
+<dt><span class="memberNameLink"><a href="org/apache/velocity/app/event/MethodExceptionEventHandler.html#methodException-org.apache.velocity.context.Context-java.lang.Class-java.lang.String-java.lang.Exception-org.apache.velocity.util.introspection.Info-">methodException(Context, Class&lt;?&gt;, String, Exception, Info)</a></span> - Method in interface org.apache.velocity.app.event.<a href="org/apache/velocity/app/event/MethodExceptionEventHandler.html" title="interface in org.apache.vel [...]
 <dd>
 <div class="block">Called when a method throws an exception.</div>
 </dd>
@@ -5661,6 +5731,8 @@
 <dd>
 <div class="block">Name of the resource</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/SpringResourceLoader.html#NAME">NAME</a></span> - Static variable in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/SpringResourceLoader.html" title="class in org.apache.velocity.spring">SpringResourceLoader</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/MathUtils.html#negate-java.lang.Number-">negate(Number)</a></span> - Static method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/MathUtils.html" title="class in org.apache.velocity.runtime.parser.node">MathUtils</a></dt>
 <dd>
 <div class="block">Negate a number</div>
@@ -5675,6 +5747,10 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/Token.html#newToken-int-">newToken(int)</a></span> - Static method in class org.apache.velocity.runtime.parser.<a href="org/apache/velocity/runtime/parser/Token.html" title="class in org.apache.velocity.runtime.parser">Token</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineFactory.html#newVelocityEngine--">newVelocityEngine()</a></span> - Method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineFactory.html" title="class in org.apache.velocity.spring">VelocityEngineFactory</a></dt>
+<dd>
+<div class="block">Return a new VelocityEngine.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/ASTIntegerRange.IntegerRange.RangeIterator.html#next--">next()</a></span> - Method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/ASTIntegerRange.IntegerRange.RangeIterator.html" title="class in org.apache.velocity.runtime.parser.node">ASTIntegerRange.IntegerRange.RangeIterator</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/Token.html#next">next</a></span> - Variable in class org.apache.velocity.runtime.parser.<a href="org/apache/velocity/runtime/parser/Token.html" title="class in org.apache.velocity.runtime.parser">Token</a></dt>
@@ -6050,6 +6126,8 @@
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/velocity/script/package-summary.html">org.apache.velocity.script</a> - package org.apache.velocity.script</dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/apache/velocity/spring/package-summary.html">org.apache.velocity.spring</a> - package org.apache.velocity.spring</dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/velocity/util/package-summary.html">org.apache.velocity.util</a> - package org.apache.velocity.util</dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/velocity/util/introspection/package-summary.html">org.apache.velocity.util.introspection</a> - package org.apache.velocity.util.introspection</dt>
@@ -6234,6 +6312,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/JJTStandardParserState.html#popNode--">popNode()</a></span> - Method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/JJTStandardParserState.html" title="class in org.apache.velocity.runtime.parser.node">JJTStandardParserState</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineFactory.html#postProcessVelocityEngine-org.apache.velocity.app.VelocityEngine-">postProcessVelocityEngine(VelocityEngine)</a></span> - Method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineFactory.html" title="class in org.apache.velocity.spring">VelocityEngineFactory</a></dt>
+<dd>
+<div class="block">To be implemented by subclasses that want to perform custom
+ post-processing of the VelocityEngine after this FactoryBean
+ performed its default configuration (but before VelocityEngine.init).</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/directive/Directive.html#postRender-org.apache.velocity.context.InternalContextAdapter-">postRender(InternalContextAdapter)</a></span> - Method in class org.apache.velocity.runtime.directive.<a href="org/apache/velocity/runtime/directive/Directive.html" title="class in org.apache.velocity.runtime.directive">Directive</a></dt>
 <dd>
 <div class="block">This cleans up any scope control for this directive after rendering,
@@ -6271,7 +6355,7 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/StandardParser.html#PrimaryExpression--">PrimaryExpression()</a></span> - Method in class org.apache.velocity.runtime.parser.<a href="org/apache/velocity/runtime/parser/StandardParser.html" title="class in org.apache.velocity.runtime.parser">StandardParser</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/ASTReference.html#printClass-java.lang.Class-">printClass(Class)</a></span> - Static method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/ASTReference.html" title="class in org.apache.velocity.runtime.parser.node">ASTReference</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/ASTReference.html#printClass-java.lang.Class-">printClass(Class&lt;?&gt;)</a></span> - Static method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/ASTReference.html" title="class in org.apache.velocity.runtime.parser.node">ASTReference</a></dt>
 <dd>
 <div class="block">Utility class to handle nulls when printing a class type</div>
 </dd>
@@ -6306,9 +6390,9 @@
 <dd>
 <div class="block">Returned the value of object property when executed.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/PropertyExecutor.html#PropertyExecutor-org.slf4j.Logger-org.apache.velocity.util.introspection.Introspector-java.lang.Class-java.lang.String-">PropertyExecutor(Logger, Introspector, Class, String)</a></span> - Constructor for class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/PropertyExecutor.html" title="class in org.apache.velocity.runtime.parser.node">PropertyE [...]
+<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/PropertyExecutor.html#PropertyExecutor-org.slf4j.Logger-org.apache.velocity.util.introspection.Introspector-java.lang.Class-java.lang.String-">PropertyExecutor(Logger, Introspector, Class&lt;?&gt;, String)</a></span> - Constructor for class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/PropertyExecutor.html" title="class in org.apache.velocity.runtime.parser.node"> [...]
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/PropertyExecutor.html#PropertyExecutor-org.slf4j.Logger-org.apache.velocity.util.introspection.Introspector-java.lang.Class-java.lang.String-boolean-">PropertyExecutor(Logger, Introspector, Class, String, boolean)</a></span> - Constructor for class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/PropertyExecutor.html" title="class in org.apache.velocity.runtime.parse [...]
+<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/PropertyExecutor.html#PropertyExecutor-org.slf4j.Logger-org.apache.velocity.util.introspection.Introspector-java.lang.Class-java.lang.String-boolean-">PropertyExecutor(Logger, Introspector, Class&lt;?&gt;, String, boolean)</a></span> - Constructor for class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/PropertyExecutor.html" title="class in org.apache.velocity.runt [...]
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/RuntimeConstants.html#PROVIDE_SCOPE_CONTROL">PROVIDE_SCOPE_CONTROL</a></span> - Static variable in interface org.apache.velocity.runtime.<a href="org/apache/velocity/runtime/RuntimeConstants.html" title="interface in org.apache.velocity.runtime">RuntimeConstants</a></dt>
 <dd>
@@ -6320,7 +6404,7 @@
 <dd>
 <div class="block">Returns the value of a public field when executed.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/PublicFieldExecutor.html#PublicFieldExecutor-org.slf4j.Logger-org.apache.velocity.util.introspection.Introspector-java.lang.Class-java.lang.String-">PublicFieldExecutor(Logger, Introspector, Class, String)</a></span> - Constructor for class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/PublicFieldExecutor.html" title="class in org.apache.velocity.runtime.parser.nod [...]
+<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/PublicFieldExecutor.html#PublicFieldExecutor-org.slf4j.Logger-org.apache.velocity.util.introspection.Introspector-java.lang.Class-java.lang.String-">PublicFieldExecutor(Logger, Introspector, Class&lt;?&gt;, String)</a></span> - Constructor for class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/PublicFieldExecutor.html" title="class in org.apache.velocity.runtime.p [...]
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/context/ChainedInternalContextAdapter.html#pushCurrentMacroName-java.lang.String-">pushCurrentMacroName(String)</a></span> - Method in class org.apache.velocity.context.<a href="org/apache/velocity/context/ChainedInternalContextAdapter.html" title="class in org.apache.velocity.context">ChainedInternalContextAdapter</a></dt>
 <dd>&nbsp;</dd>
@@ -6380,7 +6464,7 @@
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Property setter which checks deprecated property keys</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/IntrospectorCache.html#put-java.lang.Class-">put(Class)</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/IntrospectorCache.html" title="class in org.apache.velocity.util.introspection">IntrospectorCache</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/IntrospectorCache.html#put-java.lang.Class-">put(Class&lt;?&gt;)</a></span> - Method in class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/IntrospectorCache.html" title="class in org.apache.velocity.util.introspection">IntrospectorCache</a></dt>
 <dd>
 <div class="block">Creates a class map for specific class and registers it in the
  cache.</div>
@@ -6394,7 +6478,7 @@
 <div class="block">Executor that simply tries to execute a put(key, value)
  operation.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/PutExecutor.html#PutExecutor-org.slf4j.Logger-org.apache.velocity.util.introspection.Introspector-java.lang.Class-java.lang.Object-java.lang.String-">PutExecutor(Logger, Introspector, Class, Object, String)</a></span> - Constructor for class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/PutExecutor.html" title="class in org.apache.velocity.runtime.parser.node">PutE [...]
+<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/PutExecutor.html#PutExecutor-org.slf4j.Logger-org.apache.velocity.util.introspection.Introspector-java.lang.Class-java.lang.Object-java.lang.String-">PutExecutor(Logger, Introspector, Class&lt;?&gt;, Object, String)</a></span> - Constructor for class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/PutExecutor.html" title="class in org.apache.velocity.runtime.parser.n [...]
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/resource/util/StringResourceRepository.html#putStringResource-java.lang.String-java.lang.String-">putStringResource(String, String)</a></span> - Method in interface org.apache.velocity.runtime.resource.util.<a href="org/apache/velocity/runtime/resource/util/StringResourceRepository.html" title="interface in org.apache.velocity.runtime.resource.util">StringResourceRepository</a></dt>
 <dd>
@@ -7152,6 +7236,10 @@
 <dd>
 <div class="block">Set the caching state.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineFactory.html#setConfigLocation-org.springframework.core.io.Resource-">setConfigLocation(Resource)</a></span> - Method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineFactory.html" title="class in org.apache.velocity.spring">VelocityEngineFactory</a></dt>
+<dd>
+<div class="block">Set the location of the Velocity config file.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/RuntimeInstance.html#setConfiguration-org.apache.velocity.util.ExtProperties-">setConfiguration(ExtProperties)</a></span> - Method in class org.apache.velocity.runtime.<a href="org/apache/velocity/runtime/RuntimeInstance.html" title="class in org.apache.velocity.runtime">RuntimeInstance</a></dt>
 <dd>
 <div class="block">Allow an external system to set an ExtProperties
@@ -7278,9 +7366,9 @@
 <dd>
 <div class="block">sets the array of arguments specified in the macro definition</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/context/ChainedInternalContextAdapter.html#setMacroLibraries-java.util.List-">setMacroLibraries(List)</a></span> - Method in class org.apache.velocity.context.<a href="org/apache/velocity/context/ChainedInternalContextAdapter.html" title="class in org.apache.velocity.context">ChainedInternalContextAdapter</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/context/ChainedInternalContextAdapter.html#setMacroLibraries-java.util.List-">setMacroLibraries(List&lt;Template&gt;)</a></span> - Method in class org.apache.velocity.context.<a href="org/apache/velocity/context/ChainedInternalContextAdapter.html" title="class in org.apache.velocity.context">ChainedInternalContextAdapter</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/context/InternalContextAdapterImpl.html#setMacroLibraries-java.util.List-">setMacroLibraries(List)</a></span> - Method in class org.apache.velocity.context.<a href="org/apache/velocity/context/InternalContextAdapterImpl.html" title="class in org.apache.velocity.context">InternalContextAdapterImpl</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/context/InternalContextAdapterImpl.html#setMacroLibraries-java.util.List-">setMacroLibraries(List&lt;Template&gt;)</a></span> - Method in class org.apache.velocity.context.<a href="org/apache/velocity/context/InternalContextAdapterImpl.html" title="class in org.apache.velocity.context">InternalContextAdapterImpl</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/AbstractExecutor.html#setMethod-java.lang.reflect.Method-">setMethod(Method)</a></span> - Method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/AbstractExecutor.html" title="class in org.apache.velocity.runtime.parser.node">AbstractExecutor</a></dt>
 <dd>&nbsp;</dd>
@@ -7329,6 +7417,10 @@
 <dd>
 <div class="block">set indentation postfix</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineFactory.html#setPreferFileSystemAccess-boolean-">setPreferFileSystemAccess(boolean)</a></span> - Method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineFactory.html" title="class in org.apache.velocity.spring">VelocityEngineFactory</a></dt>
+<dd>
+<div class="block">Set whether to prefer file system access for template loading.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/ASTBlock.html#setPrefix-java.lang.String-">setPrefix(String)</a></span> - Method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/ASTBlock.html" title="class in org.apache.velocity.runtime.parser.node">ASTBlock</a></dt>
 <dd>
 <div class="block">set indentation prefix</div>
@@ -7407,13 +7499,13 @@
 <div class="block">Executor for looking up property names in the passed in class
  This will try to find a set&lt;foo&gt;(key, value) method</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/SetPropertyExecutor.html#SetPropertyExecutor-org.slf4j.Logger-org.apache.velocity.util.introspection.Introspector-java.lang.Class-java.lang.String-java.lang.Object-">SetPropertyExecutor(Logger, Introspector, Class, String, Object)</a></span> - Constructor for class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/SetPropertyExecutor.html" title="class in org.apache.ve [...]
+<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/SetPropertyExecutor.html#SetPropertyExecutor-org.slf4j.Logger-org.apache.velocity.util.introspection.Introspector-java.lang.Class-java.lang.String-java.lang.Object-">SetPropertyExecutor(Logger, Introspector, Class&lt;?&gt;, String, Object)</a></span> - Constructor for class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/SetPropertyExecutor.html" title="class in org. [...]
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/velocity/runtime/parser/node/SetPublicFieldExecutor.html" title="class in org.apache.velocity.runtime.parser.node"><span class="typeNameLink">SetPublicFieldExecutor</span></a> - Class in <a href="org/apache/velocity/runtime/parser/node/package-summary.html">org.apache.velocity.runtime.parser.node</a></dt>
 <dd>
 <div class="block">Executor for setting public fields in objects</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/SetPublicFieldExecutor.html#SetPublicFieldExecutor-org.slf4j.Logger-org.apache.velocity.util.introspection.Introspector-java.lang.Class-java.lang.String-java.lang.Object-">SetPublicFieldExecutor(Logger, Introspector, Class, String, Object)</a></span> - Constructor for class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/SetPublicFieldExecutor.html" title="class in o [...]
+<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/SetPublicFieldExecutor.html#SetPublicFieldExecutor-org.slf4j.Logger-org.apache.velocity.util.introspection.Introspector-java.lang.Class-java.lang.String-java.lang.Object-">SetPublicFieldExecutor(Logger, Introspector, Class&lt;?&gt;, String, Object)</a></span> - Constructor for class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/SetPublicFieldExecutor.html" title="c [...]
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/exception/MethodInvocationException.html#setReferenceName-java.lang.String-">setReferenceName(String)</a></span> - Method in exception org.apache.velocity.exception.<a href="org/apache/velocity/exception/MethodInvocationException.html" title="class in org.apache.velocity.exception">MethodInvocationException</a></dt>
 <dd>
@@ -7432,6 +7524,14 @@
 <dd>
 <div class="block">Set the template loader for this template.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineFactory.html#setResourceLoader-org.springframework.core.io.ResourceLoader-">setResourceLoader(ResourceLoader)</a></span> - Method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineFactory.html" title="class in org.apache.velocity.spring">VelocityEngineFactory</a></dt>
+<dd>
+<div class="block">Set the Spring ResourceLoader to use for loading Velocity template files.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineFactory.html#setResourceLoaderPath-java.lang.String-">setResourceLoaderPath(String)</a></span> - Method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineFactory.html" title="class in org.apache.velocity.spring">VelocityEngineFactory</a></dt>
+<dd>
+<div class="block">Set the Velocity resource loader path via a Spring resource location.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/app/event/EventCartridge.html#setRuntimeServices-org.apache.velocity.runtime.RuntimeServices-">setRuntimeServices(RuntimeServices)</a></span> - Method in class org.apache.velocity.app.event.<a href="org/apache/velocity/app/event/EventCartridge.html" title="class in org.apache.velocity.app.event">EventCartridge</a></dt>
 <dd>
 <div class="block">runtime services setter, called during initialization</div>
@@ -7473,6 +7573,15 @@
 <div class="block">Sets the value of a complex reference (something like $foo.bar)
   Currently used by ASTSetReference()</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineFactory.html#setVelocityProperties-java.util.Properties-">setVelocityProperties(Properties)</a></span> - Method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineFactory.html" title="class in org.apache.velocity.spring">VelocityEngineFactory</a></dt>
+<dd>
+<div class="block">Set Velocity properties, like "file.resource.loader.path".</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineFactory.html#setVelocityPropertiesMap-java.util.Map-">setVelocityPropertiesMap(Map&lt;String, Object&gt;)</a></span> - Method in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineFactory.html" title="class in org.apache.velocity.spring">VelocityEngineFactory</a></dt>
+<dd>
+<div class="block">Set Velocity properties as Map, to allow for non-String values
+ like "ds.resource.loader.instance".</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/visitor/BaseVisitor.html#setWriter-java.io.Writer-">setWriter(Writer)</a></span> - Method in class org.apache.velocity.runtime.visitor.<a href="org/apache/velocity/runtime/visitor/BaseVisitor.html" title="class in org.apache.velocity.runtime.visitor">BaseVisitor</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/velocity/runtime/parser/node/SimpleNode.html" title="class in org.apache.velocity.runtime.parser.node"><span class="typeNameLink">SimpleNode</span></a> - Class in <a href="org/apache/velocity/runtime/parser/node/package-summary.html">org.apache.velocity.runtime.parser.node</a></dt>
@@ -7522,6 +7631,20 @@
 <div class="block">This field is used to access special tokens that occur prior to this
  token, but after the immediately preceding regular (non-special) token.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/SpringResourceLoader.html#SPRING_RESOURCE_LOADER">SPRING_RESOURCE_LOADER</a></span> - Static variable in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/SpringResourceLoader.html" title="class in org.apache.velocity.spring">SpringResourceLoader</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/SpringResourceLoader.html#SPRING_RESOURCE_LOADER_CACHE">SPRING_RESOURCE_LOADER_CACHE</a></span> - Static variable in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/SpringResourceLoader.html" title="class in org.apache.velocity.spring">SpringResourceLoader</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/SpringResourceLoader.html#SPRING_RESOURCE_LOADER_CLASS">SPRING_RESOURCE_LOADER_CLASS</a></span> - Static variable in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/SpringResourceLoader.html" title="class in org.apache.velocity.spring">SpringResourceLoader</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/SpringResourceLoader.html#SPRING_RESOURCE_LOADER_PATH">SPRING_RESOURCE_LOADER_PATH</a></span> - Static variable in class org.apache.velocity.spring.<a href="org/apache/velocity/spring/SpringResourceLoader.html" title="class in org.apache.velocity.spring">SpringResourceLoader</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/apache/velocity/spring/SpringResourceLoader.html" title="class in org.apache.velocity.spring"><span class="typeNameLink">SpringResourceLoader</span></a> - Class in <a href="org/apache/velocity/spring/package-summary.html">org.apache.velocity.spring</a></dt>
+<dd>
+<div class="block">Velocity ResourceLoader adapter that loads via a Spring ResourceLoader.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/SpringResourceLoader.html#SpringResourceLoader--">SpringResourceLoader()</a></span> - Constructor for class org.apache.velocity.spring.<a href="org/apache/velocity/spring/SpringResourceLoader.html" title="class in org.apache.velocity.spring">SpringResourceLoader</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/velocity/runtime/parser/StandardParser.html" title="class in org.apache.velocity.runtime.parser"><span class="typeNameLink">StandardParser</span></a> - Class in <a href="org/apache/velocity/runtime/parser/package-summary.html">org.apache.velocity.runtime.parser</a></dt>
 <dd>
 <div class="block">This class is responsible for parsing a Velocity
@@ -8181,7 +8304,7 @@ the order they are declared.</div>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/UberspectImpl.VelMethodImpl.html#VelMethodImpl-java.lang.reflect.Method-boolean-">VelMethodImpl(Method, boolean)</a></span> - Constructor for class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/UberspectImpl.VelMethodImpl.html" title="class in org.apache.velocity.util.introspection">UberspectImpl.VelMethodImpl</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/UberspectImpl.VelMethodImpl.html#VelMethodImpl-java.lang.reflect.Method-boolean-org.apache.velocity.util.introspection.Converter:A-">VelMethodImpl(Method, boolean, Converter[])</a></span> - Constructor for class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/UberspectImpl.VelMethodImpl.html" title="class in org.apache.velocity.util.introspection">UberspectImpl.VelMetho [...]
+<dt><span class="memberNameLink"><a href="org/apache/velocity/util/introspection/UberspectImpl.VelMethodImpl.html#VelMethodImpl-java.lang.reflect.Method-boolean-org.apache.velocity.util.introspection.Converter:A-">VelMethodImpl(Method, boolean, Converter&lt;?&gt;[])</a></span> - Constructor for class org.apache.velocity.util.introspection.<a href="org/apache/velocity/util/introspection/UberspectImpl.VelMethodImpl.html" title="class in org.apache.velocity.util.introspection">UberspectImpl [...]
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/velocity/runtime/VelocimacroFactory.html" title="class in org.apache.velocity.runtime"><span class="typeNameLink">VelocimacroFactory</span></a> - Class in <a href="org/apache/velocity/runtime/package-summary.html">org.apache.velocity.runtime</a></dt>
 <dd>
@@ -8221,7 +8344,7 @@ the order they are declared.</div>
 <dt><a href="org/apache/velocity/runtime/parser/VelocityCharStream.html" title="class in org.apache.velocity.runtime.parser"><span class="typeNameLink">VelocityCharStream</span></a> - Class in <a href="org/apache/velocity/runtime/parser/package-summary.html">org.apache.velocity.runtime.parser</a></dt>
 <dd>
 <div class="block">An implementation of interface CharStream, where the stream is assumed to
- contain only ASCII characters (without unicode processing).</div>
+  contain only ASCII characters (without unicode processing).</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/VelocityCharStream.html#VelocityCharStream-java.io.Reader-int-int-int-">VelocityCharStream(Reader, int, int, int)</a></span> - Constructor for class org.apache.velocity.runtime.parser.<a href="org/apache/velocity/runtime/parser/VelocityCharStream.html" title="class in org.apache.velocity.runtime.parser">VelocityCharStream</a></dt>
 <dd>&nbsp;</dd>
@@ -8278,6 +8401,25 @@ the order they are declared.</div>
 <dd>
 <div class="block">Construct a VelocityEngine instance with the specified initial properties.</div>
 </dd>
+<dt><a href="org/apache/velocity/spring/VelocityEngineFactory.html" title="class in org.apache.velocity.spring"><span class="typeNameLink">VelocityEngineFactory</span></a> - Class in <a href="org/apache/velocity/spring/package-summary.html">org.apache.velocity.spring</a></dt>
+<dd>
+<div class="block">Factory that configures a VelocityEngine.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineFactory.html#VelocityEngineFactory--">VelocityEngineFactory()</a></span> - Constructor for class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineFactory.html" title="class in org.apache.velocity.spring">VelocityEngineFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/apache/velocity/spring/VelocityEngineFactoryBean.html" title="class in org.apache.velocity.spring"><span class="typeNameLink">VelocityEngineFactoryBean</span></a> - Class in <a href="org/apache/velocity/spring/package-summary.html">org.apache.velocity.spring</a></dt>
+<dd>
+<div class="block">Factory bean that configures a VelocityEngine and provides it as bean
+ reference.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineFactoryBean.html#VelocityEngineFactoryBean--">VelocityEngineFactoryBean()</a></span> - Constructor for class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineFactoryBean.html" title="class in org.apache.velocity.spring">VelocityEngineFactoryBean</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/apache/velocity/spring/VelocityEngineUtils.html" title="class in org.apache.velocity.spring"><span class="typeNameLink">VelocityEngineUtils</span></a> - Class in <a href="org/apache/velocity/spring/package-summary.html">org.apache.velocity.spring</a></dt>
+<dd>
+<div class="block">Utility class for working with a VelocityEngine.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/spring/VelocityEngineUtils.html#VelocityEngineUtils--">VelocityEngineUtils()</a></span> - Constructor for class org.apache.velocity.spring.<a href="org/apache/velocity/spring/VelocityEngineUtils.html" title="class in org.apache.velocity.spring">VelocityEngineUtils</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/velocity/runtime/VelocityEngineVersion.html" title="class in org.apache.velocity.runtime"><span class="typeNameLink">VelocityEngineVersion</span></a> - Class in <a href="org/apache/velocity/runtime/package-summary.html">org.apache.velocity.runtime</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/VelocityEngineVersion.html#VelocityEngineVersion--">VelocityEngineVersion()</a></span> - Constructor for class org.apache.velocity.runtime.<a href="org/apache/velocity/runtime/VelocityEngineVersion.html" title="class in org.apache.velocity.runtime">VelocityEngineVersion</a></dt>
@@ -8857,7 +8999,7 @@ the order they are declared.</div>
 <dd>
 <div class="block">the parent context</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/MathUtils.html#wrapPrimitive-long-java.lang.Class-">wrapPrimitive(long, Class)</a></span> - Static method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/MathUtils.html" title="class in org.apache.velocity.runtime.parser.node">MathUtils</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/velocity/runtime/parser/node/MathUtils.html#wrapPrimitive-long-java.lang.Class-">wrapPrimitive(long, Class&lt;?&gt;)</a></span> - Static method in class org.apache.velocity.runtime.parser.node.<a href="org/apache/velocity/runtime/parser/node/MathUtils.html" title="class in org.apache.velocity.runtime.parser.node">MathUtils</a></dt>
 <dd>
 <div class="block">Wrap the given primitive into the given class if the value is in the
  range of the destination type.</div>
@@ -8971,6 +9113,6 @@ the order they are declared.</div>
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/index.html b/engine/devel/apidocs/index.html
index d209841..45487ba 100644
--- a/engine/devel/apidocs/index.html
+++ b/engine/devel/apidocs/index.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Apache Velocity 2.2 API</title>
+<title>Apache Velocity 2.4-SNAPSHOT API</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
     if (tmpTargetPage != "" && tmpTargetPage != "undefined")
diff --git a/engine/devel/apidocs/org/apache/velocity/Template.html b/engine/devel/apidocs/org/apache/velocity/Template.html
index 38e2637..0d5d065 100644
--- a/engine/devel/apidocs/org/apache/velocity/Template.html
+++ b/engine/devel/apidocs/org/apache/velocity/Template.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:49 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Template (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Template (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Template (Apache Velocity 2.2 API)";
+            parent.document.title="Template (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -135,7 +135,7 @@ extends <a href="../../../org/apache/velocity/runtime/resource/Resource.html" ti
  </pre></div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: Template.java 1866609 2019-09-08 10:42:47Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>, <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a></dd>
 </dl>
@@ -215,7 +215,7 @@ extends <a href="../../../org/apache/velocity/runtime/resource/Resource.html" ti
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/velocity/Template.html#merge-org.apache.velocity.context.Context-java.io.Writer-java.util.List-">merge</a></span>(<a href="../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
      <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
-     <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;macroLibraries)</code>
+     <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;macroLibraries)</code>
 <div class="block">The AST node structure is merged with the
  context to produce the final output.</div>
 </td>
@@ -362,7 +362,7 @@ extends <a href="../../../org/apache/velocity/runtime/resource/Resource.html" ti
 <h4>merge</h4>
 <pre>public&nbsp;void&nbsp;merge(<a href="../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
                   <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
-                  <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;macroLibraries)
+                  <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;macroLibraries)
            throws <a href="../../../org/apache/velocity/exception/ResourceNotFoundException.html" title="class in org.apache.velocity.exception">ResourceNotFoundException</a>,
                   <a href="../../../org/apache/velocity/exception/ParseErrorException.html" title="class in org.apache.velocity.exception">ParseErrorException</a>,
                   <a href="../../../org/apache/velocity/exception/MethodInvocationException.html" title="class in org.apache.velocity.exception">MethodInvocationException</a></pre>
@@ -453,6 +453,6 @@ extends <a href="../../../org/apache/velocity/runtime/resource/Resource.html" ti
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/VelocityContext.html b/engine/devel/apidocs/org/apache/velocity/VelocityContext.html
index 4bf9cdc..a17d82a 100644
--- a/engine/devel/apidocs/org/apache/velocity/VelocityContext.html
+++ b/engine/devel/apidocs/org/apache/velocity/VelocityContext.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:49 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>VelocityContext (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>VelocityContext (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="VelocityContext (Apache Velocity 2.2 API)";
+            parent.document.title="VelocityContext (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -115,13 +115,13 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang">Cloneable</a>, <a href="../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>, <a href="../../../org/apache/velocity/context/InternalEventContext.html" title="interface in org.apache.velocity.context">InternalEventContext</a></dd>
+<dd><a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang">Cloneable</a>, <a href="../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>, <a href="../../../org/apache/velocity/context/InternalEventContext [...]
 </dl>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">VelocityContext</span>
 extends <a href="../../../org/apache/velocity/context/AbstractContext.html" title="class in org.apache.velocity.context">AbstractContext</a>
-implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang">Cloneable</a></pre>
+implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang">Cloneable</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a></pre>
 <div class="block">General purpose implementation of the application Context
   interface for general application use.  This class should
   be used in place of the original Context class.
@@ -137,11 +137,12 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Cloneabl
   your own and extend the interface Context</div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: VelocityContext.java 1780734 2017-01-28 19:21:08Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>, <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>, <a href="mailto:fedor.karpelevitch@home.com">Fedor Karpelevitch</a>, <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a></dd>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context"><code>Context</code></a></dd>
+<dd><a href="../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context"><code>Context</code></a>, 
+<a href="../../../serialized-form.html#org.apache.velocity.VelocityContext">Serialized Form</a></dd>
 </dl>
 </li>
 </ul>
@@ -239,7 +240,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Cloneabl
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/velocity/VelocityContext.html#getEventCartridge--">getEventCartridge</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i7" class="rowColor">
-<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a></code></td>
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/velocity/VelocityContext.html#getMacroLibraries--">getMacroLibraries</a></span>()</code>
 <div class="block">Get the macro library list for the current template.</div>
 </td>
@@ -336,7 +337,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Cloneabl
 </tr>
 <tr id="i22" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/velocity/VelocityContext.html#setMacroLibraries-java.util.List-">setMacroLibraries</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;macroLibraries)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/velocity/VelocityContext.html#setMacroLibraries-java.util.List-">setMacroLibraries</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;&nbsp;macroLibraries)</code>
 <div class="block">Set the macro library list for the current template.</div>
 </td>
 </tr>
@@ -737,7 +738,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Cloneabl
 <ul class="blockList">
 <li class="blockList">
 <h4>setMacroLibraries</h4>
-<pre>public&nbsp;void&nbsp;setMacroLibraries(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;macroLibraries)</pre>
+<pre>public&nbsp;void&nbsp;setMacroLibraries(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;&nbsp;macroLibraries)</pre>
 <div class="block">Set the macro library list for the current template.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -753,7 +754,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Cloneabl
 <ul class="blockList">
 <li class="blockList">
 <h4>getMacroLibraries</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;getMacroLibraries()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;&nbsp;getMacroLibraries()</pre>
 <div class="block">Get the macro library list for the current template.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -866,6 +867,6 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Cloneabl
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/FieldMethodizer.html b/engine/devel/apidocs/org/apache/velocity/app/FieldMethodizer.html
index de5d4fc..147d644 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/FieldMethodizer.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/FieldMethodizer.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>FieldMethodizer (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>FieldMethodizer (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="FieldMethodizer (Apache Velocity 2.2 API)";
+            parent.document.title="FieldMethodizer (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -144,7 +144,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
   to handle them by explicitly placing them into the context.</div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: FieldMethodizer.java 1791336 2017-04-14 10:28:17Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a></dd>
 </dl>
@@ -407,6 +407,6 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/Velocity.html b/engine/devel/apidocs/org/apache/velocity/app/Velocity.html
index e420597..a2512d4 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/Velocity.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/Velocity.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Velocity (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Velocity (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Velocity (Apache Velocity 2.2 API)";
+            parent.document.title="Velocity (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -138,7 +138,7 @@ implements <a href="../../../../org/apache/velocity/runtime/RuntimeConstants.htm
  something you feel is necessary to add here, please, send a patch.</div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: Velocity.java 1855594 2019-03-15 13:51:36Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>, <a href="mailto:Christoph.Reck@dlr.de">Christoph Reck</a>, <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a></dd>
 </dl>
@@ -883,6 +883,6 @@ implements <a href="../../../../org/apache/velocity/runtime/RuntimeConstants.htm
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/VelocityEngine.html b/engine/devel/apidocs/org/apache/velocity/app/VelocityEngine.html
index 8ad811e..173068b 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/VelocityEngine.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/VelocityEngine.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>VelocityEngine (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>VelocityEngine (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="VelocityEngine (Apache Velocity 2.2 API)";
+            parent.document.title="VelocityEngine (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -132,7 +132,7 @@ implements <a href="../../../../org/apache/velocity/runtime/RuntimeConstants.htm
  </p></div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: VelocityEngine.java 1855594 2019-03-15 13:51:36Z cbrisson $</dd>
+<dd>$Id$</dd>
 </dl>
 </li>
 </ul>
@@ -979,6 +979,6 @@ implements <a href="../../../../org/apache/velocity/runtime/RuntimeConstants.htm
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/class-use/FieldMethodizer.html b/engine/devel/apidocs/org/apache/velocity/app/class-use/FieldMethodizer.html
index bb26901..052318d 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/class-use/FieldMethodizer.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/class-use/FieldMethodizer.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.app.FieldMethodizer (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.app.FieldMethodizer (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.app.FieldMethodizer (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.app.FieldMethodizer (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,6 +121,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/class-use/Velocity.html b/engine/devel/apidocs/org/apache/velocity/app/class-use/Velocity.html
index a5defb2..03b7730 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/class-use/Velocity.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/class-use/Velocity.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.app.Velocity (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.app.Velocity (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.app.Velocity (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.app.Velocity (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,6 +121,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/class-use/VelocityEngine.html b/engine/devel/apidocs/org/apache/velocity/app/class-use/VelocityEngine.html
index eccc813..9de6213 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/class-use/VelocityEngine.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/class-use/VelocityEngine.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.app.VelocityEngine (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.app.VelocityEngine (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.app.VelocityEngine (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.app.VelocityEngine (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -73,7 +73,147 @@
 <div class="header">
 <h2 title="Uses of Class org.apache.velocity.app.VelocityEngine" class="title">Uses of Class<br>org.apache.velocity.app.VelocityEngine</h2>
 </div>
-<div class="classUseContainer">No usage of org.apache.velocity.app.VelocityEngine</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../../../../org/apache/velocity/app/VelocityEngine.html" title="class in org.apache.velocity.app">VelocityEngine</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.apache.velocity.spring">org.apache.velocity.spring</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="org.apache.velocity.spring">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../../../org/apache/velocity/app/VelocityEngine.html" title="class in org.apache.velocity.app">VelocityEngine</a> in <a href="../../../../../org/apache/velocity/spring/package-summary.html">org.apache.velocity.spring</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../org/apache/velocity/spring/package-summary.html">org.apache.velocity.spring</a> that return <a href="../../../../../org/apache/velocity/app/VelocityEngine.html" title="class in org.apache.velocity.app">VelocityEngine</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/apache/velocity/app/VelocityEngine.html" title="class in org.apache.velocity.app">VelocityEngine</a></code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngineFactory.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/spring/VelocityEngineFactory.html#createVelocityEngine--">createVelocityEngine</a></span>()</code>
+<div class="block">Prepare the VelocityEngine instance and return it.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../org/apache/velocity/app/VelocityEngine.html" title="class in org.apache.velocity.app">VelocityEngine</a></code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngineFactoryBean.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/spring/VelocityEngineFactoryBean.html#getObject--">getObject</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected <a href="../../../../../org/apache/velocity/app/VelocityEngine.html" title="class in org.apache.velocity.app">VelocityEngine</a></code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngineFactory.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/spring/VelocityEngineFactory.html#newVelocityEngine--">newVelocityEngine</a></span>()</code>
+<div class="block">Return a new VelocityEngine.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../org/apache/velocity/spring/package-summary.html">org.apache.velocity.spring</a> that return types with arguments of type <a href="../../../../../org/apache/velocity/app/VelocityEngine.html" title="class in org.apache.velocity.app">VelocityEngine</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/velocity/app/VelocityEngine.html" title="class in org.apache.velocity.app">VelocityEngine</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngineFactoryBean.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/spring/VelocityEngineFactoryBean.html#getObjectType--">getObjectType</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../org/apache/velocity/spring/package-summary.html">org.apache.velocity.spring</a> with parameters of type <a href="../../../../../org/apache/velocity/app/VelocityEngine.html" title="class in org.apache.velocity.app">VelocityEngine</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngineFactory.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/spring/VelocityEngineFactory.html#initSpringResourceLoader-org.apache.velocity.app.VelocityEngine-java.lang.String-">initSpringResourceLoader</a></span>(<a href="../../../../../org/apache/velocity/app/VelocityEngine.html" title="class in org.apache.velocity.app">VelocityEngine</a>&nbsp;velocityEngine,
+                        <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;resourceLoaderPath)</code>
+<div class="block">Initialize a SpringResourceLoader for the given VelocityEngine.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngineFactory.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/spring/VelocityEngineFactory.html#initVelocityResourceLoader-org.apache.velocity.app.VelocityEngine-java.lang.String-">initVelocityResourceLoader</a></span>(<a href="../../../../../org/apache/velocity/app/VelocityEngine.html" title="class in org.apache.velocity.app">VelocityEngine</a>&nbsp;velocityEngine,
+                          <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;resourceLoaderPath)</code>
+<div class="block">Initialize a Velocity resource loader for the given VelocityEngine:
+ either a standard Velocity FileResourceLoader or a SpringResourceLoader.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngineUtils.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/spring/VelocityEngineUtils.html#mergeTemplate-org.apache.velocity.app.VelocityEngine-java.lang.String-java.util.Map-java.io.Writer-">mergeTemplate</a></span>(<a href="../../../../../org/apache/velocity/app/VelocityEngine.html" title="class in org.apache.velocity.app">VelocityEngine</a>&nbsp;velocityEngine,
+             <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;templateLocation,
+             <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;model,
+             <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">Use <a href="../../../../../org/apache/velocity/spring/VelocityEngineUtils.html#mergeTemplate-org.apache.velocity.app.VelocityEngine-java.lang.String-java.lang.String-java.util.Map-java.io.Writer-"><code>VelocityEngineUtils.mergeTemplate(VelocityEngine, String, String, Map, Writer)</code></a>
+ instead, following Velocity 1.6's corresponding deprecation in its own API.</span></div>
+</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngineUtils.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/spring/VelocityEngineUtils.html#mergeTemplate-org.apache.velocity.app.VelocityEngine-java.lang.String-java.lang.String-java.util.Map-java.io.Writer-">mergeTemplate</a></span>(<a href="../../../../../org/apache/velocity/app/VelocityEngine.html" title="class in org.apache.velocity.app">VelocityEngine</a>&nbsp;velocityEngine,
+             <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;templateLocation,
+             <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding,
+             <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;model,
+             <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>
+<div class="block">Merge the specified Velocity template with the given model and write the result
+ to the given Writer.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngineUtils.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/spring/VelocityEngineUtils.html#mergeTemplateIntoString-org.apache.velocity.app.VelocityEngine-java.lang.String-java.util.Map-">mergeTemplateIntoString</a></span>(<a href="../../../../../org/apache/velocity/app/VelocityEngine.html" title="class in org.apache.velocity.app">VelocityEngine</a>&nbsp;velocityEngine,
+                       <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;templateLocation,
+                       <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;model)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">Use <a href="../../../../../org/apache/velocity/spring/VelocityEngineUtils.html#mergeTemplateIntoString-org.apache.velocity.app.VelocityEngine-java.lang.String-java.lang.String-java.util.Map-"><code>VelocityEngineUtils.mergeTemplateIntoString(VelocityEngine, String, String, Map)</code></a>
+ instead, following Velocity 1.6's corresponding deprecation in its own API.</span></div>
+</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngineUtils.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/spring/VelocityEngineUtils.html#mergeTemplateIntoString-org.apache.velocity.app.VelocityEngine-java.lang.String-java.lang.String-java.util.Map-">mergeTemplateIntoString</a></span>(<a href="../../../../../org/apache/velocity/app/VelocityEngine.html" title="class in org.apache.velocity.app">VelocityEngine</a>&nbsp;velocityEngine,
+                       <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;templateLocation,
+                       <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding,
+                       <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;model)</code>
+<div class="block">Merge the specified Velocity template with the given model into a String.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngineFactory.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/spring/VelocityEngineFactory.html#postProcessVelocityEngine-org.apache.velocity.app.VelocityEngine-">postProcessVelocityEngine</a></span>(<a href="../../../../../org/apache/velocity/app/VelocityEngine.html" title="class in org.apache.velocity.app">VelocityEngine</a>&nbsp;velocityEngine)</code>
+<div class="block">To be implemented by subclasses that want to perform custom
+ post-processing of the VelocityEngine after this FactoryBean
+ performed its default configuration (but before VelocityEngine.init).</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
@@ -121,6 +261,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/EventCartridge.html b/engine/devel/apidocs/org/apache/velocity/app/event/EventCartridge.html
index ab22eae..976c366 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/EventCartridge.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/EventCartridge.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>EventCartridge (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>EventCartridge (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="EventCartridge (Apache Velocity 2.2 API)";
+            parent.document.title="EventCartridge (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -126,7 +126,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
  for more details.</p></div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: EventCartridge.java 1855206 2019-03-11 11:09:53Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:wglass@wglass@forio.com">Will Glass-Husain </a>, <a href="mailto:geirm@optonline.net">Geir Magnusson Jr. </a>, <a href="mailto:j_a_fernandez@yahoo.com">Jose Alberto Fernandez </a></dd>
 </dl>
@@ -267,7 +267,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <tr id="i11" class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/event/EventCartridge.html#methodException-org.apache.velocity.context.Context-java.lang.Class-java.lang.String-java.lang.Exception-org.apache.velocity.util.introspection.Info-">methodException</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
-               <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&nbsp;claz,
+               <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;claz,
                <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;method,
                <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a>&nbsp;e,
                <a href="../../../../../org/apache/velocity/util/introspection/Info.html" title="class in org.apache.velocity.util.introspection">Info</a>&nbsp;info)</code>
@@ -505,7 +505,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <li class="blockList">
 <h4>methodException</h4>
 <pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;methodException(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
-                              <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&nbsp;claz,
+                              <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;claz,
                               <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;method,
                               <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a>&nbsp;e,
                               <a href="../../../../../org/apache/velocity/util/introspection/Info.html" title="class in org.apache.velocity.util.introspection">Info</a>&nbsp;info)</pre>
@@ -711,6 +711,6 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/EventHandler.html b/engine/devel/apidocs/org/apache/velocity/app/event/EventHandler.html
index a3ce2ed..0f5463f 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/EventHandler.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/EventHandler.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>EventHandler (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>EventHandler (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="EventHandler (Apache Velocity 2.2 API)";
+            parent.document.title="EventHandler (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -108,7 +108,7 @@
 <div class="block">Base interface for all event handlers</div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: EventHandler.java 1780307 2017-01-26 01:57:00Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a></dd>
 </dl>
@@ -179,6 +179,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/EventHandlerUtil.html b/engine/devel/apidocs/org/apache/velocity/app/event/EventHandlerUtil.html
index 1d032be..4c8ae54 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/EventHandlerUtil.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/EventHandlerUtil.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>EventHandlerUtil (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>EventHandlerUtil (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="EventHandlerUtil (Apache Velocity 2.2 API)";
+            parent.document.title="EventHandlerUtil (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,7 +121,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <dt><span class="simpleTagLabel">Since:</span></dt>
 <dd>1.5</dd>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: EventHandlerUtil.java 1866609 2019-09-08 10:42:47Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:wglass@wglass@forio.com">Will Glass-Husain </a></dd>
 </dl>
@@ -207,7 +207,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <td class="colFirst"><code>static <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/event/EventHandlerUtil.html#methodException-org.apache.velocity.runtime.RuntimeServices-org.apache.velocity.context.InternalContextAdapter-java.lang.Class-java.lang.String-java.lang.Exception-org.apache.velocity.util.introspection.Info-">methodException</a></span>(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html" title="interface in org.apache.velocity.runtime">R [...]
                <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
-               <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&nbsp;claz,
+               <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;claz,
                <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;method,
                <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a>&nbsp;e,
                <a href="../../../../../org/apache/velocity/util/introspection/Info.html" title="class in org.apache.velocity.util.introspection">Info</a>&nbsp;info)</code>
@@ -295,7 +295,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <h4>methodException</h4>
 <pre>public static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;methodException(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html" title="interface in org.apache.velocity.runtime">RuntimeServices</a>&nbsp;rsvc,
                                      <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
-                                     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&nbsp;claz,
+                                     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;claz,
                                      <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;method,
                                      <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a>&nbsp;e,
                                      <a href="../../../../../org/apache/velocity/util/introspection/Info.html" title="class in org.apache.velocity.util.introspection">Info</a>&nbsp;info)
@@ -491,6 +491,6 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/IncludeEventHandler.html b/engine/devel/apidocs/org/apache/velocity/app/event/IncludeEventHandler.html
index f7e3ac7..c26f1f7 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/IncludeEventHandler.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/IncludeEventHandler.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>IncludeEventHandler (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>IncludeEventHandler (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="IncludeEventHandler (Apache Velocity 2.2 API)";
+            parent.document.title="IncludeEventHandler (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -118,7 +118,7 @@ extends <a href="../../../../../org/apache/velocity/app/event/EventHandler.html"
 <dt><span class="simpleTagLabel">Since:</span></dt>
 <dd>1.5</dd>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: IncludeEventHandler.java 1855186 2019-03-11 00:34:05Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:wglass@forio.com">Will Glass-Husain</a></dd>
 </dl>
@@ -263,6 +263,6 @@ extends <a href="../../../../../org/apache/velocity/app/event/EventHandler.html"
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/InvalidReferenceEventHandler.html b/engine/devel/apidocs/org/apache/velocity/app/event/InvalidReferenceEventHandler.html
index 2c0cbff..ac9d202 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/InvalidReferenceEventHandler.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/InvalidReferenceEventHandler.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>InvalidReferenceEventHandler (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>InvalidReferenceEventHandler (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="InvalidReferenceEventHandler (Apache Velocity 2.2 API)";
+            parent.document.title="InvalidReferenceEventHandler (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,7 +121,7 @@ extends <a href="../../../../../org/apache/velocity/app/event/EventHandler.html"
 <dt><span class="simpleTagLabel">Since:</span></dt>
 <dd>1.5</dd>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: InvalidReferenceEventHandler.java 1780734 2017-01-28 19:21:08Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:wglass@forio.com">Will Glass-Husain</a></dd>
 </dl>
@@ -339,6 +339,6 @@ extends <a href="../../../../../org/apache/velocity/app/event/EventHandler.html"
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/MethodExceptionEventHandler.html b/engine/devel/apidocs/org/apache/velocity/app/event/MethodExceptionEventHandler.html
index fe11f90..ed0b7db 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/MethodExceptionEventHandler.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/MethodExceptionEventHandler.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>MethodExceptionEventHandler (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>MethodExceptionEventHandler (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="MethodExceptionEventHandler (Apache Velocity 2.2 API)";
+            parent.document.title="MethodExceptionEventHandler (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -119,7 +119,7 @@ extends <a href="../../../../../org/apache/velocity/app/event/EventHandler.html"
   Please return what you want rendered into the output stream.</div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: MethodExceptionEventHandler.java 1780734 2017-01-28 19:21:08Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:wglass@forio.com">Will Glass-Husain</a>, <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a></dd>
 </dl>
@@ -144,7 +144,7 @@ extends <a href="../../../../../org/apache/velocity/app/event/EventHandler.html"
 <tr id="i0" class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/event/MethodExceptionEventHandler.html#methodException-org.apache.velocity.context.Context-java.lang.Class-java.lang.String-java.lang.Exception-org.apache.velocity.util.introspection.Info-">methodException</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
-               <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&nbsp;claz,
+               <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;claz,
                <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;method,
                <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a>&nbsp;e,
                <a href="../../../../../org/apache/velocity/util/introspection/Info.html" title="class in org.apache.velocity.util.introspection">Info</a>&nbsp;info)</code>
@@ -173,7 +173,7 @@ extends <a href="../../../../../org/apache/velocity/app/event/EventHandler.html"
 <li class="blockList">
 <h4>methodException</h4>
 <pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;methodException(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
-                       <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&nbsp;claz,
+                       <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;claz,
                        <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;method,
                        <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a>&nbsp;e,
                        <a href="../../../../../org/apache/velocity/util/introspection/Info.html" title="class in org.apache.velocity.util.introspection">Info</a>&nbsp;info)</pre>
@@ -263,6 +263,6 @@ extends <a href="../../../../../org/apache/velocity/app/event/EventHandler.html"
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/ReferenceInsertionEventHandler.html b/engine/devel/apidocs/org/apache/velocity/app/event/ReferenceInsertionEventHandler.html
index 59fb046..42799cc 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/ReferenceInsertionEventHandler.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/ReferenceInsertionEventHandler.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ReferenceInsertionEventHandler (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>ReferenceInsertionEventHandler (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ReferenceInsertionEventHandler (Apache Velocity 2.2 API)";
+            parent.document.title="ReferenceInsertionEventHandler (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -118,7 +118,7 @@ extends <a href="../../../../../org/apache/velocity/app/event/EventHandler.html"
   Please return an Object that will toString() nicely :)</div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: ReferenceInsertionEventHandler.java 1780734 2017-01-28 19:21:08Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:wglass@forio.com">Will Glass-Husain</a>, <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a></dd>
 </dl>
@@ -259,6 +259,6 @@ extends <a href="../../../../../org/apache/velocity/app/event/EventHandler.html"
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/class-use/EventCartridge.html b/engine/devel/apidocs/org/apache/velocity/app/event/class-use/EventCartridge.html
index 8d54a16..d6eb138 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/class-use/EventCartridge.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/class-use/EventCartridge.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.app.event.EventCartridge (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.app.event.EventCartridge (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.app.event.EventCartridge (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.app.event.EventCartridge (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -109,11 +109,11 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/velocity/app/event/EventCartridge.html" title="class in org.apache.velocity.app.event">EventCartridge</a></code></td>
-<td class="colLast"><span class="typeNameLabel">InternalContextAdapterImpl.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/velocity/context/InternalContextAdapterImpl.html#attachEventCartridge-org.apache.velocity.app.event.EventCartridge-">attachEventCartridge</a></span>(<a href="../../../../../../org/apache/velocity/app/event/EventCartridge.html" title="class in org.apache.velocity.app.event">EventCartridge</a>&nbsp;ec)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">InternalEventContext.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/velocity/context/InternalEventContext.html#attachEventCartridge-org.apache.velocity.app.event.EventCartridge-">attachEventCartridge</a></span>(<a href="../../../../../../org/apache/velocity/app/event/EventCartridge.html" title="class in org.apache.velocity.app.event">EventCartridge</a>&nbsp;ec)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/velocity/app/event/EventCartridge.html" title="class in org.apache.velocity.app.event">EventCartridge</a></code></td>
-<td class="colLast"><span class="typeNameLabel">InternalEventContext.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/velocity/context/InternalEventContext.html#attachEventCartridge-org.apache.velocity.app.event.EventCartridge-">attachEventCartridge</a></span>(<a href="../../../../../../org/apache/velocity/app/event/EventCartridge.html" title="class in org.apache.velocity.app.event">EventCartridge</a>&nbsp;ec)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">InternalContextAdapterImpl.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/velocity/context/InternalContextAdapterImpl.html#attachEventCartridge-org.apache.velocity.app.event.EventCartridge-">attachEventCartridge</a></span>(<a href="../../../../../../org/apache/velocity/app/event/EventCartridge.html" title="class in org.apache.velocity.app.event">EventCartridge</a>&nbsp;ec)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/velocity/app/event/EventCartridge.html" title="class in org.apache.velocity.app.event">EventCartridge</a></code></td>
@@ -121,11 +121,11 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/velocity/app/event/EventCartridge.html" title="class in org.apache.velocity.app.event">EventCartridge</a></code></td>
-<td class="colLast"><span class="typeNameLabel">InternalContextAdapterImpl.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/velocity/context/InternalContextAdapterImpl.html#getEventCartridge--">getEventCartridge</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">InternalEventContext.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/velocity/context/InternalEventContext.html#getEventCartridge--">getEventCartridge</a></span>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/velocity/app/event/EventCartridge.html" title="class in org.apache.velocity.app.event">EventCartridge</a></code></td>
-<td class="colLast"><span class="typeNameLabel">InternalEventContext.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/velocity/context/InternalEventContext.html#getEventCartridge--">getEventCartridge</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">InternalContextAdapterImpl.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/velocity/context/InternalContextAdapterImpl.html#getEventCartridge--">getEventCartridge</a></span>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/velocity/app/event/EventCartridge.html" title="class in org.apache.velocity.app.event">EventCartridge</a></code></td>
@@ -142,11 +142,11 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/velocity/app/event/EventCartridge.html" title="class in org.apache.velocity.app.event">EventCartridge</a></code></td>
-<td class="colLast"><span class="typeNameLabel">InternalContextAdapterImpl.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/velocity/context/InternalContextAdapterImpl.html#attachEventCartridge-org.apache.velocity.app.event.EventCartridge-">attachEventCartridge</a></span>(<a href="../../../../../../org/apache/velocity/app/event/EventCartridge.html" title="class in org.apache.velocity.app.event">EventCartridge</a>&nbsp;ec)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">InternalEventContext.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/velocity/context/InternalEventContext.html#attachEventCartridge-org.apache.velocity.app.event.EventCartridge-">attachEventCartridge</a></span>(<a href="../../../../../../org/apache/velocity/app/event/EventCartridge.html" title="class in org.apache.velocity.app.event">EventCartridge</a>&nbsp;ec)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/velocity/app/event/EventCartridge.html" title="class in org.apache.velocity.app.event">EventCartridge</a></code></td>
-<td class="colLast"><span class="typeNameLabel">InternalEventContext.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/velocity/context/InternalEventContext.html#attachEventCartridge-org.apache.velocity.app.event.EventCartridge-">attachEventCartridge</a></span>(<a href="../../../../../../org/apache/velocity/app/event/EventCartridge.html" title="class in org.apache.velocity.app.event">EventCartridge</a>&nbsp;ec)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">InternalContextAdapterImpl.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/velocity/context/InternalContextAdapterImpl.html#attachEventCartridge-org.apache.velocity.app.event.EventCartridge-">attachEventCartridge</a></span>(<a href="../../../../../../org/apache/velocity/app/event/EventCartridge.html" title="class in org.apache.velocity.app.event">EventCartridge</a>&nbsp;ec)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/velocity/app/event/EventCartridge.html" title="class in org.apache.velocity.app.event">EventCartridge</a></code></td>
@@ -168,13 +168,13 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/velocity/app/event/EventCartridge.html" title="class in org.apache.velocity.app.event">EventCartridge</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/velocity/runtime/RuntimeInstance.html#getApplicationEventCartridge--">getApplicationEventCartridge</a></span>()</code>
+<td class="colLast"><span class="typeNameLabel">RuntimeServices.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/velocity/runtime/RuntimeServices.html#getApplicationEventCartridge--">getApplicationEventCartridge</a></span>()</code>
 <div class="block">Returns the event handlers for the application.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/velocity/app/event/EventCartridge.html" title="class in org.apache.velocity.app.event">EventCartridge</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeServices.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/velocity/runtime/RuntimeServices.html#getApplicationEventCartridge--">getApplicationEventCartridge</a></span>()</code>
+<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/velocity/runtime/RuntimeInstance.html#getApplicationEventCartridge--">getApplicationEventCartridge</a></span>()</code>
 <div class="block">Returns the event handlers for the application.</div>
 </td>
 </tr>
@@ -238,6 +238,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/class-use/EventHandler.html b/engine/devel/apidocs/org/apache/velocity/app/event/class-use/EventHandler.html
index 43c7292..fd1f8d6 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/class-use/EventHandler.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/class-use/EventHandler.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface org.apache.velocity.app.event.EventHandler (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Interface org.apache.velocity.app.event.EventHandler (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface org.apache.velocity.app.event.EventHandler (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Interface org.apache.velocity.app.event.EventHandler (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -307,6 +307,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/class-use/EventHandlerUtil.html b/engine/devel/apidocs/org/apache/velocity/app/event/class-use/EventHandlerUtil.html
index c135b15..70dd30f 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/class-use/EventHandlerUtil.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/class-use/EventHandlerUtil.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.app.event.EventHandlerUtil (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.app.event.EventHandlerUtil (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.app.event.EventHandlerUtil (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.app.event.EventHandlerUtil (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,6 +121,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/class-use/IncludeEventHandler.html b/engine/devel/apidocs/org/apache/velocity/app/event/class-use/IncludeEventHandler.html
index 5bad20f..d9c18e5 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/class-use/IncludeEventHandler.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/class-use/IncludeEventHandler.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface org.apache.velocity.app.event.IncludeEventHandler (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Interface org.apache.velocity.app.event.IncludeEventHandler (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface org.apache.velocity.app.event.IncludeEventHandler (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Interface org.apache.velocity.app.event.IncludeEventHandler (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -194,6 +194,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/class-use/InvalidReferenceEventHandler.html b/engine/devel/apidocs/org/apache/velocity/app/event/class-use/InvalidReferenceEventHandler.html
index adc6f2e..f17123d 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/class-use/InvalidReferenceEventHandler.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/class-use/InvalidReferenceEventHandler.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface org.apache.velocity.app.event.InvalidReferenceEventHandler (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Interface org.apache.velocity.app.event.InvalidReferenceEventHandler (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface org.apache.velocity.app.event.InvalidReferenceEventHandler (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Interface org.apache.velocity.app.event.InvalidReferenceEventHandler (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -212,6 +212,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/class-use/MethodExceptionEventHandler.html b/engine/devel/apidocs/org/apache/velocity/app/event/class-use/MethodExceptionEventHandler.html
index 308f56b..acb4159 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/class-use/MethodExceptionEventHandler.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/class-use/MethodExceptionEventHandler.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface org.apache.velocity.app.event.MethodExceptionEventHandler (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Interface org.apache.velocity.app.event.MethodExceptionEventHandler (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface org.apache.velocity.app.event.MethodExceptionEventHandler (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Interface org.apache.velocity.app.event.MethodExceptionEventHandler (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -213,6 +213,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/class-use/ReferenceInsertionEventHandler.html b/engine/devel/apidocs/org/apache/velocity/app/event/class-use/ReferenceInsertionEventHandler.html
index 997c418..09088a2 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/class-use/ReferenceInsertionEventHandler.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/class-use/ReferenceInsertionEventHandler.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface org.apache.velocity.app.event.ReferenceInsertionEventHandler (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Interface org.apache.velocity.app.event.ReferenceInsertionEventHandler (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface org.apache.velocity.app.event.ReferenceInsertionEventHandler (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Interface org.apache.velocity.app.event.ReferenceInsertionEventHandler (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -242,6 +242,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/implement/EscapeHtmlReference.html b/engine/devel/apidocs/org/apache/velocity/app/event/implement/EscapeHtmlReference.html
index 9f294aa..3c38370 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/implement/EscapeHtmlReference.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/implement/EscapeHtmlReference.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>EscapeHtmlReference (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>EscapeHtmlReference (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="EscapeHtmlReference (Apache Velocity 2.2 API)";
+            parent.document.title="EscapeHtmlReference (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -361,6 +361,6 @@ extends <a href="../../../../../../org/apache/velocity/app/event/implement/Escap
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.html b/engine/devel/apidocs/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.html
index ac180db..2aa1c9d 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>EscapeJavaScriptReference (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>EscapeJavaScriptReference (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="EscapeJavaScriptReference (Apache Velocity 2.2 API)";
+            parent.document.title="EscapeJavaScriptReference (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -361,6 +361,6 @@ extends <a href="../../../../../../org/apache/velocity/app/event/implement/Escap
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/implement/EscapeReference.html b/engine/devel/apidocs/org/apache/velocity/app/event/implement/EscapeReference.html
index d33c59a..9099ce3 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/implement/EscapeReference.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/implement/EscapeReference.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>EscapeReference (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>EscapeReference (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="EscapeReference (Apache Velocity 2.2 API)";
+            parent.document.title="EscapeReference (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -145,7 +145,7 @@ implements <a href="../../../../../../org/apache/velocity/app/event/ReferenceIns
 <dt><span class="simpleTagLabel">Since:</span></dt>
 <dd>1.5</dd>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: EscapeReference.java 1780721 2017-01-28 16:49:32Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:wglass@forio.com">Will Glass-Husain </a></dd>
 </dl>
@@ -449,6 +449,6 @@ implements <a href="../../../../../../org/apache/velocity/app/event/ReferenceIns
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/implement/EscapeSqlReference.html b/engine/devel/apidocs/org/apache/velocity/app/event/implement/EscapeSqlReference.html
index b2992e2..8d4e31a 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/implement/EscapeSqlReference.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/implement/EscapeSqlReference.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>EscapeSqlReference (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>EscapeSqlReference (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="EscapeSqlReference (Apache Velocity 2.2 API)";
+            parent.document.title="EscapeSqlReference (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -345,6 +345,6 @@ extends <a href="../../../../../../org/apache/velocity/app/event/implement/Escap
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/implement/EscapeXmlReference.html b/engine/devel/apidocs/org/apache/velocity/app/event/implement/EscapeXmlReference.html
index 009c74a..f61d32b 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/implement/EscapeXmlReference.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/implement/EscapeXmlReference.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>EscapeXmlReference (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>EscapeXmlReference (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="EscapeXmlReference (Apache Velocity 2.2 API)";
+            parent.document.title="EscapeXmlReference (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -360,6 +360,6 @@ extends <a href="../../../../../../org/apache/velocity/app/event/implement/Escap
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/implement/IncludeNotFound.html b/engine/devel/apidocs/org/apache/velocity/app/event/implement/IncludeNotFound.html
index 654f023..6a35cfc 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/implement/IncludeNotFound.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/implement/IncludeNotFound.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>IncludeNotFound (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>IncludeNotFound (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="IncludeNotFound (Apache Velocity 2.2 API)";
+            parent.document.title="IncludeNotFound (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -135,7 +135,7 @@ implements <a href="../../../../../../org/apache/velocity/app/event/IncludeEvent
 <dt><span class="simpleTagLabel">Since:</span></dt>
 <dd>1.5</dd>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: IncludeNotFound.java 1855206 2019-03-11 11:09:53Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:wglass@forio.com">Will Glass-Husain</a></dd>
 </dl>
@@ -402,6 +402,6 @@ implements <a href="../../../../../../org/apache/velocity/app/event/IncludeEvent
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/implement/IncludeRelativePath.html b/engine/devel/apidocs/org/apache/velocity/app/event/implement/IncludeRelativePath.html
index e2ecb78..6cd6f16 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/implement/IncludeRelativePath.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/implement/IncludeRelativePath.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>IncludeRelativePath (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>IncludeRelativePath (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="IncludeRelativePath (Apache Velocity 2.2 API)";
+            parent.document.title="IncludeRelativePath (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -124,7 +124,7 @@ implements <a href="../../../../../../org/apache/velocity/app/event/IncludeEvent
 <dt><span class="simpleTagLabel">Since:</span></dt>
 <dd>1.5</dd>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: IncludeRelativePath.java 1780307 2017-01-26 01:57:00Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:wglass@forio.com">Will Glass-Husain </a></dd>
 </dl>
@@ -306,6 +306,6 @@ implements <a href="../../../../../../org/apache/velocity/app/event/IncludeEvent
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/implement/InvalidReferenceInfo.html b/engine/devel/apidocs/org/apache/velocity/app/event/implement/InvalidReferenceInfo.html
index 93fd69b..4862a68 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/implement/InvalidReferenceInfo.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/implement/InvalidReferenceInfo.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>InvalidReferenceInfo (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>InvalidReferenceInfo (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="InvalidReferenceInfo (Apache Velocity 2.2 API)";
+            parent.document.title="InvalidReferenceInfo (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -123,7 +123,7 @@ extends <a href="../../../../../../org/apache/velocity/util/introspection/Info.h
 <dt><span class="simpleTagLabel">Since:</span></dt>
 <dd>1.5</dd>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: InvalidReferenceInfo.java 1780307 2017-01-26 01:57:00Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:wglass@forio.com">Will Glass-Husain </a></dd>
 </dl>
@@ -323,6 +323,6 @@ extends <a href="../../../../../../org/apache/velocity/util/introspection/Info.h
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/implement/PrintExceptions.html b/engine/devel/apidocs/org/apache/velocity/app/event/implement/PrintExceptions.html
index 2b3e2b8..cf07b90 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/implement/PrintExceptions.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/implement/PrintExceptions.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>PrintExceptions (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>PrintExceptions (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="PrintExceptions (Apache Velocity 2.2 API)";
+            parent.document.title="PrintExceptions (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -132,7 +132,7 @@ implements <a href="../../../../../../org/apache/velocity/app/event/MethodExcept
 <dt><span class="simpleTagLabel">Since:</span></dt>
 <dd>1.5</dd>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: PrintExceptions.java 1780734 2017-01-28 19:21:08Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:wglass@forio.com">Will Glass-Husain</a>, <a href="mailto:claude.brisson@gmail.com">Claude Brisson</a></dd>
 </dl>
@@ -174,7 +174,7 @@ implements <a href="../../../../../../org/apache/velocity/app/event/MethodExcept
 <tr id="i0" class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/velocity/app/event/implement/PrintExceptions.html#methodException-org.apache.velocity.context.Context-java.lang.Class-java.lang.String-java.lang.Exception-org.apache.velocity.util.introspection.Info-">methodException</a></span>(<a href="../../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
-               <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&nbsp;claz,
+               <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;claz,
                <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;method,
                <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a>&nbsp;e,
                <a href="../../../../../../org/apache/velocity/util/introspection/Info.html" title="class in org.apache.velocity.util.introspection">Info</a>&nbsp;info)</code>
@@ -233,7 +233,7 @@ implements <a href="../../../../../../org/apache/velocity/app/event/MethodExcept
 <li class="blockList">
 <h4>methodException</h4>
 <pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;methodException(<a href="../../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
-                              <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&nbsp;claz,
+                              <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;claz,
                               <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;method,
                               <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a>&nbsp;e,
                               <a href="../../../../../../org/apache/velocity/util/introspection/Info.html" title="class in org.apache.velocity.util.introspection">Info</a>&nbsp;info)</pre>
@@ -340,6 +340,6 @@ implements <a href="../../../../../../org/apache/velocity/app/event/MethodExcept
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/implement/ReportInvalidReferences.html b/engine/devel/apidocs/org/apache/velocity/app/event/implement/ReportInvalidReferences.html
index 404b684..bfa7261 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/implement/ReportInvalidReferences.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/implement/ReportInvalidReferences.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ReportInvalidReferences (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>ReportInvalidReferences (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ReportInvalidReferences (Apache Velocity 2.2 API)";
+            parent.document.title="ReportInvalidReferences (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -144,7 +144,7 @@ implements <a href="../../../../../../org/apache/velocity/app/event/InvalidRefer
 <dt><span class="simpleTagLabel">Since:</span></dt>
 <dd>1.5</dd>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: ReportInvalidReferences.java 1860691 2019-06-05 23:46:02Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:wglass@forio.com">Will Glass-Husain</a></dd>
 </dl>
@@ -209,7 +209,7 @@ implements <a href="../../../../../../org/apache/velocity/app/event/InvalidRefer
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a></code></td>
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/velocity/app/event/implement/InvalidReferenceInfo.html" title="class in org.apache.velocity.app.event.implement">InvalidReferenceInfo</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/velocity/app/event/implement/ReportInvalidReferences.html#getInvalidReferences--">getInvalidReferences</a></span>()</code>
 <div class="block">All invalid references during the processing of this page.</div>
 </td>
@@ -410,7 +410,7 @@ public static final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java
 <ul class="blockList">
 <li class="blockList">
 <h4>getInvalidReferences</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;getInvalidReferences()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/velocity/app/event/implement/InvalidReferenceInfo.html" title="class in org.apache.velocity.app.event.implement">InvalidReferenceInfo</a>&gt;&nbsp;getInvalidReferences()</pre>
 <div class="block">All invalid references during the processing of this page.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -503,6 +503,6 @@ public static final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/EscapeHtmlReference.html b/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/EscapeHtmlReference.html
index fa386e1..87014bd 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/EscapeHtmlReference.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/EscapeHtmlReference.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.app.event.implement.EscapeHtmlReference (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.app.event.implement.EscapeHtmlReference (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.app.event.implement.EscapeHtmlReference (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.app.event.implement.EscapeHtmlReference (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,6 +121,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/EscapeJavaScriptReference.html b/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/EscapeJavaScriptReference.html
index aba14f1..3b9a031 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/EscapeJavaScriptReference.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/EscapeJavaScriptReference.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.app.event.implement.EscapeJavaScriptReference (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.app.event.implement.EscapeJavaScriptReference (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.app.event.implement.EscapeJavaScriptReference (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.app.event.implement.EscapeJavaScriptReference (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,6 +121,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/EscapeReference.html b/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/EscapeReference.html
index d76417a..262a099 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/EscapeReference.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/EscapeReference.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.app.event.implement.EscapeReference (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.app.event.implement.EscapeReference (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.app.event.implement.EscapeReference (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.app.event.implement.EscapeReference (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -187,6 +187,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/EscapeSqlReference.html b/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/EscapeSqlReference.html
index a4aea0c..fb81828 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/EscapeSqlReference.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/EscapeSqlReference.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.app.event.implement.EscapeSqlReference (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.app.event.implement.EscapeSqlReference (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.app.event.implement.EscapeSqlReference (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.app.event.implement.EscapeSqlReference (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,6 +121,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/EscapeXmlReference.html b/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/EscapeXmlReference.html
index d4ecbe0..30acbbc 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/EscapeXmlReference.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/EscapeXmlReference.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.app.event.implement.EscapeXmlReference (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.app.event.implement.EscapeXmlReference (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.app.event.implement.EscapeXmlReference (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.app.event.implement.EscapeXmlReference (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,6 +121,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/IncludeNotFound.html b/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/IncludeNotFound.html
index 2b56a4a..be24403 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/IncludeNotFound.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/IncludeNotFound.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.app.event.implement.IncludeNotFound (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.app.event.implement.IncludeNotFound (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.app.event.implement.IncludeNotFound (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.app.event.implement.IncludeNotFound (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,6 +121,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/IncludeRelativePath.html b/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/IncludeRelativePath.html
index f0c5d2c..7e23d30 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/IncludeRelativePath.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/IncludeRelativePath.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.app.event.implement.IncludeRelativePath (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.app.event.implement.IncludeRelativePath (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.app.event.implement.IncludeRelativePath (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.app.event.implement.IncludeRelativePath (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,6 +121,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/InvalidReferenceInfo.html b/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/InvalidReferenceInfo.html
index bda1e0b..a6a086c 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/InvalidReferenceInfo.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/InvalidReferenceInfo.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.app.event.implement.InvalidReferenceInfo (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.app.event.implement.InvalidReferenceInfo (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.app.event.implement.InvalidReferenceInfo (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.app.event.implement.InvalidReferenceInfo (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -73,7 +73,49 @@
 <div class="header">
 <h2 title="Uses of Class org.apache.velocity.app.event.implement.InvalidReferenceInfo" class="title">Uses of Class<br>org.apache.velocity.app.event.implement.InvalidReferenceInfo</h2>
 </div>
-<div class="classUseContainer">No usage of org.apache.velocity.app.event.implement.InvalidReferenceInfo</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../../../../../../org/apache/velocity/app/event/implement/InvalidReferenceInfo.html" title="class in org.apache.velocity.app.event.implement">InvalidReferenceInfo</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.apache.velocity.app.event.implement">org.apache.velocity.app.event.implement</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="org.apache.velocity.app.event.implement">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../../../../../org/apache/velocity/app/event/implement/InvalidReferenceInfo.html" title="class in org.apache.velocity.app.event.implement">InvalidReferenceInfo</a> in <a href="../../../../../../../org/apache/velocity/app/event/implement/package-summary.html">org.apache.velocity.app.event.implement</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../../../org/apache/velocity/app/event/implement/package-summary.html">org.apache.velocity.app.event.implement</a> that return types with arguments of type <a href="../../../../../../../org/apache/velocity/app/event/implement/InvalidReferenceInfo.html" title="class in org.apache.velocity.app.event.implement">InvalidReferenceInfo</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../../org/apache/velocity/app/event/implement/InvalidReferenceInfo.html" title="class in org.apache.velocity.app.event.implement">InvalidReferenceInfo</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">ReportInvalidReferences.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/velocity/app/event/implement/ReportInvalidReferences.html#getInvalidReferences--">getInvalidReferences</a></span>()</code>
+<div class="block">All invalid references during the processing of this page.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
@@ -121,6 +163,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/PrintExceptions.html b/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/PrintExceptions.html
index 38e070a..753c10f 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/PrintExceptions.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/PrintExceptions.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.app.event.implement.PrintExceptions (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.app.event.implement.PrintExceptions (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.app.event.implement.PrintExceptions (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.app.event.implement.PrintExceptions (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,6 +121,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/ReportInvalidReferences.html b/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/ReportInvalidReferences.html
index 10b17fb..f9b3e85 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/ReportInvalidReferences.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/implement/class-use/ReportInvalidReferences.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.app.event.implement.ReportInvalidReferences (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.app.event.implement.ReportInvalidReferences (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.app.event.implement.ReportInvalidReferences (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.app.event.implement.ReportInvalidReferences (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,6 +121,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/implement/package-frame.html b/engine/devel/apidocs/org/apache/velocity/app/event/implement/package-frame.html
index 46f807f..f351307 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/implement/package-frame.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/implement/package-frame.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.velocity.app.event.implement (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>org.apache.velocity.app.event.implement (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/implement/package-summary.html b/engine/devel/apidocs/org/apache/velocity/app/event/implement/package-summary.html
index ce834a8..22ca2ab 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/implement/package-summary.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/implement/package-summary.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.velocity.app.event.implement (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>org.apache.velocity.app.event.implement (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.velocity.app.event.implement (Apache Velocity 2.2 API)";
+            parent.document.title="org.apache.velocity.app.event.implement (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -198,6 +198,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/implement/package-tree.html b/engine/devel/apidocs/org/apache/velocity/app/event/implement/package-tree.html
index f46a5de..218deba 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/implement/package-tree.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/implement/package-tree.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.velocity.app.event.implement Class Hierarchy (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>org.apache.velocity.app.event.implement Class Hierarchy (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.velocity.app.event.implement Class Hierarchy (Apache Velocity 2.2 API)";
+            parent.document.title="org.apache.velocity.app.event.implement Class Hierarchy (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -150,6 +150,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/implement/package-use.html b/engine/devel/apidocs/org/apache/velocity/app/event/implement/package-use.html
index 1cc09f9..7d17177 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/implement/package-use.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/implement/package-use.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Package org.apache.velocity.app.event.implement (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Package org.apache.velocity.app.event.implement (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package org.apache.velocity.app.event.implement (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Package org.apache.velocity.app.event.implement (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -104,6 +104,12 @@
 <div class="block">Base class for escaping references.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../../../../../org/apache/velocity/app/event/implement/class-use/InvalidReferenceInfo.html#org.apache.velocity.app.event.implement">InvalidReferenceInfo</a>
+<div class="block">Convenience class to use when reporting out invalid syntax
+ with line, column, and template name.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
@@ -156,6 +162,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/package-frame.html b/engine/devel/apidocs/org/apache/velocity/app/event/package-frame.html
index 8b645c7..9fcae60 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/package-frame.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/package-frame.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.velocity.app.event (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>org.apache.velocity.app.event (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/package-summary.html b/engine/devel/apidocs/org/apache/velocity/app/event/package-summary.html
index 9eb5050..23a48c5 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/package-summary.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/package-summary.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.velocity.app.event (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>org.apache.velocity.app.event (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.velocity.app.event (Apache Velocity 2.2 API)";
+            parent.document.title="org.apache.velocity.app.event (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -188,6 +188,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/package-tree.html b/engine/devel/apidocs/org/apache/velocity/app/event/package-tree.html
index 55fbad5..c50c24f 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/package-tree.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/package-tree.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.velocity.app.event Class Hierarchy (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>org.apache.velocity.app.event Class Hierarchy (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.velocity.app.event Class Hierarchy (Apache Velocity 2.2 API)";
+            parent.document.title="org.apache.velocity.app.event Class Hierarchy (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -146,6 +146,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/event/package-use.html b/engine/devel/apidocs/org/apache/velocity/app/event/package-use.html
index 4beb2ea..0d23ca8 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/event/package-use.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/event/package-use.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Package org.apache.velocity.app.event (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Package org.apache.velocity.app.event (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package org.apache.velocity.app.event (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Package org.apache.velocity.app.event (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -295,6 +295,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/package-frame.html b/engine/devel/apidocs/org/apache/velocity/app/package-frame.html
index 5c5ceb2..5e85d61 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/package-frame.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/package-frame.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.velocity.app (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>org.apache.velocity.app (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/package-summary.html b/engine/devel/apidocs/org/apache/velocity/app/package-summary.html
index 126752c..d1aa17e 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/package-summary.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/package-summary.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.velocity.app (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>org.apache.velocity.app (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.velocity.app (Apache Velocity 2.2 API)";
+            parent.document.title="org.apache.velocity.app (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -160,6 +160,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/package-tree.html b/engine/devel/apidocs/org/apache/velocity/app/package-tree.html
index fa1af02..0697063 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/package-tree.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/package-tree.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.velocity.app Class Hierarchy (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>org.apache.velocity.app Class Hierarchy (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.velocity.app Class Hierarchy (Apache Velocity 2.2 API)";
+            parent.document.title="org.apache.velocity.app Class Hierarchy (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -136,6 +136,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/app/package-use.html b/engine/devel/apidocs/org/apache/velocity/app/package-use.html
index c17906e..4bfd91f 100644
--- a/engine/devel/apidocs/org/apache/velocity/app/package-use.html
+++ b/engine/devel/apidocs/org/apache/velocity/app/package-use.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Package org.apache.velocity.app (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Package org.apache.velocity.app (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package org.apache.velocity.app (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Package org.apache.velocity.app (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -73,7 +73,44 @@
 <div class="header">
 <h1 title="Uses of Package org.apache.velocity.app" class="title">Uses of Package<br>org.apache.velocity.app</h1>
 </div>
-<div class="contentContainer">No usage of org.apache.velocity.app</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../../../org/apache/velocity/app/package-summary.html">org.apache.velocity.app</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.apache.velocity.spring">org.apache.velocity.spring</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.apache.velocity.spring">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../../../org/apache/velocity/app/package-summary.html">org.apache.velocity.app</a> used by <a href="../../../../org/apache/velocity/spring/package-summary.html">org.apache.velocity.spring</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../../../../org/apache/velocity/app/class-use/VelocityEngine.html#org.apache.velocity.spring">VelocityEngine</a>
+<div class="block">
+ This class provides a separate new-able instance of the
+ Velocity template engine.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
@@ -121,6 +158,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/class-use/Template.html b/engine/devel/apidocs/org/apache/velocity/class-use/Template.html
index 85076fa..bccf8c9 100644
--- a/engine/devel/apidocs/org/apache/velocity/class-use/Template.html
+++ b/engine/devel/apidocs/org/apache/velocity/class-use/Template.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.Template (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.Template (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.Template (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.Template (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -88,22 +88,26 @@
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="#org.apache.velocity.runtime">org.apache.velocity.runtime</a></td>
+<td class="colFirst"><a href="#org.apache.velocity.context">org.apache.velocity.context</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="#org.apache.velocity.runtime.directive">org.apache.velocity.runtime.directive</a></td>
+<td class="colFirst"><a href="#org.apache.velocity.runtime">org.apache.velocity.runtime</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="#org.apache.velocity.runtime.parser">org.apache.velocity.runtime.parser</a></td>
+<td class="colFirst"><a href="#org.apache.velocity.runtime.directive">org.apache.velocity.runtime.directive</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="#org.apache.velocity.runtime.parser.node">org.apache.velocity.runtime.parser.node</a></td>
+<td class="colFirst"><a href="#org.apache.velocity.runtime.parser">org.apache.velocity.runtime.parser</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="#org.apache.velocity.runtime.parser.node">org.apache.velocity.runtime.parser.node</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="#org.apache.velocity.script">org.apache.velocity.script</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -124,30 +128,30 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>static <a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
-<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/app/Velocity.html#getTemplate-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<td class="colFirst"><code><a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/app/VelocityEngine.html#getTemplate-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
 <div class="block">Returns a <code>Template</code> from the Velocity
   resource management system.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
-<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/app/VelocityEngine.html#getTemplate-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<td class="colFirst"><code>static <a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/app/Velocity.html#getTemplate-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
 <div class="block">Returns a <code>Template</code> from the Velocity
   resource management system.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static <a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
-<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/app/Velocity.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<td class="colFirst"><code><a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/app/VelocityEngine.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)</code>
 <div class="block">Returns a <code>Template</code> from the Velocity
   resource management system.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
-<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/app/VelocityEngine.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<td class="colFirst"><code>static <a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/app/Velocity.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)</code>
 <div class="block">Returns a <code>Template</code> from the Velocity
   resource management system.</div>
@@ -156,6 +160,45 @@
 </tbody>
 </table>
 </li>
+<li class="blockList"><a name="org.apache.velocity.context">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a> in <a href="../../../../org/apache/velocity/context/package-summary.html">org.apache.velocity.context</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../org/apache/velocity/context/package-summary.html">org.apache.velocity.context</a> that return types with arguments of type <a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">InternalContextAdapterImpl.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/context/InternalContextAdapterImpl.html#getMacroLibraries--">getMacroLibraries</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">ChainedInternalContextAdapter.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/context/ChainedInternalContextAdapter.html#getMacroLibraries--">getMacroLibraries</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Method parameters in <a href="../../../../org/apache/velocity/context/package-summary.html">org.apache.velocity.context</a> with type arguments of type <a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">InternalContextAdapterImpl.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/context/InternalContextAdapterImpl.html#setMacroLibraries-java.util.List-">setMacroLibraries</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.veloci [...]
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ChainedInternalContextAdapter.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/context/ChainedInternalContextAdapter.html#setMacroLibraries-java.util.List-">setMacroLibraries</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache. [...]
+</tr>
+</tbody>
+</table>
+</li>
 <li class="blockList"><a name="org.apache.velocity.runtime">
 <!--   -->
 </a>
@@ -168,8 +211,8 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code><a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/runtime/RuntimeInstance.html#getTemplate-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<td class="colFirst"><code>static <a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/runtime/RuntimeSingleton.html#getTemplate-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
 <div class="block">Returns a <code>Template</code> from the resource manager.</div>
 </td>
 </tr>
@@ -180,14 +223,14 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static <a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/runtime/RuntimeSingleton.html#getTemplate-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<td class="colFirst"><code><a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/runtime/RuntimeInstance.html#getTemplate-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
 <div class="block">Returns a <code>Template</code> from the resource manager.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/runtime/RuntimeInstance.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<td class="colFirst"><code>static <a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/runtime/RuntimeSingleton.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)</code>
 <div class="block">Returns a <code>Template</code> from the resource manager</div>
 </td>
@@ -200,8 +243,8 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>static <a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/runtime/RuntimeSingleton.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<td class="colFirst"><code><a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/runtime/RuntimeInstance.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)</code>
 <div class="block">Returns a <code>Template</code> from the resource manager</div>
 </td>
@@ -225,8 +268,8 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/runtime/RuntimeInstance.html#addVelocimacro-java.lang.String-org.apache.velocity.runtime.parser.node.Node-java.util.List-org.apache.velocity.Template-">addVelocimacro</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/runtime/RuntimeSingleton.html#addVelocimacro-java.lang.String-org.apache.velocity.runtime.parser.node.Node-java.util.List-org.apache.velocity.Template-">addVelocimacro</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
               <a href="../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;macro,
               <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/runtime/directive/Macro.MacroArg.html" title="class in org.apache.velocity.runtime.directive">Macro.MacroArg</a>&gt;&nbsp;macroArgs,
               <a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&nbsp;definingTemplate)</code>
@@ -243,8 +286,8 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/runtime/RuntimeSingleton.html#addVelocimacro-java.lang.String-org.apache.velocity.runtime.parser.node.Node-java.util.List-org.apache.velocity.Template-">addVelocimacro</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/runtime/RuntimeInstance.html#addVelocimacro-java.lang.String-org.apache.velocity.runtime.parser.node.Node-java.util.List-org.apache.velocity.Template-">addVelocimacro</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
               <a href="../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;macro,
               <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/runtime/directive/Macro.MacroArg.html" title="class in org.apache.velocity.runtime.directive">Macro.MacroArg</a>&gt;&nbsp;macroArgs,
               <a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&nbsp;definingTemplate)</code>
@@ -287,11 +330,11 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code><a href="../../../../org/apache/velocity/runtime/directive/Directive.html" title="class in org.apache.velocity.runtime.directive">Directive</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/runtime/RuntimeInstance.html#getVelocimacro-java.lang.String-org.apache.velocity.Template-org.apache.velocity.Template-">getVelocimacro</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;vmName,
+<td class="colFirst"><code>static <a href="../../../../org/apache/velocity/runtime/directive/Directive.html" title="class in org.apache.velocity.runtime.directive">Directive</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/runtime/RuntimeSingleton.html#getVelocimacro-java.lang.String-org.apache.velocity.Template-org.apache.velocity.Template-">getVelocimacro</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;vmName,
               <a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&nbsp;renderingTemplate,
               <a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&nbsp;template)</code>
-<div class="block">Returns the appropriate VelocimacroProxy object if vmName
+<div class="block">Returns the appropriate VelocimacroProxy object if strVMname
  is a valid current Velocimacro.</div>
 </td>
 </tr>
@@ -305,11 +348,11 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static <a href="../../../../org/apache/velocity/runtime/directive/Directive.html" title="class in org.apache.velocity.runtime.directive">Directive</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/runtime/RuntimeSingleton.html#getVelocimacro-java.lang.String-org.apache.velocity.Template-org.apache.velocity.Template-">getVelocimacro</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;vmName,
+<td class="colFirst"><code><a href="../../../../org/apache/velocity/runtime/directive/Directive.html" title="class in org.apache.velocity.runtime.directive">Directive</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/runtime/RuntimeInstance.html#getVelocimacro-java.lang.String-org.apache.velocity.Template-org.apache.velocity.Template-">getVelocimacro</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;vmName,
               <a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&nbsp;renderingTemplate,
               <a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&nbsp;template)</code>
-<div class="block">Returns the appropriate VelocimacroProxy object if strVMname
+<div class="block">Returns the appropriate VelocimacroProxy object if vmName
  is a valid current Velocimacro.</div>
 </td>
 </tr>
@@ -321,8 +364,8 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/runtime/RuntimeInstance.html#isVelocimacro-java.lang.String-org.apache.velocity.Template-">isVelocimacro</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;vmName,
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/runtime/RuntimeSingleton.html#isVelocimacro-java.lang.String-org.apache.velocity.Template-">isVelocimacro</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;vmName,
              <a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&nbsp;template)</code>
 <div class="block">Checks to see if a VM exists</div>
 </td>
@@ -335,15 +378,15 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/runtime/RuntimeSingleton.html#isVelocimacro-java.lang.String-org.apache.velocity.Template-">isVelocimacro</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;vmName,
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/runtime/RuntimeInstance.html#isVelocimacro-java.lang.String-org.apache.velocity.Template-">isVelocimacro</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;vmName,
              <a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&nbsp;template)</code>
 <div class="block">Checks to see if a VM exists</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/apache/velocity/runtime/parser/node/SimpleNode.html" title="class in org.apache.velocity.runtime.parser.node">SimpleNode</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/runtime/RuntimeInstance.html#parse-java.io.Reader-org.apache.velocity.Template-">parse</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader,
+<td class="colFirst"><code>static <a href="../../../../org/apache/velocity/runtime/parser/node/SimpleNode.html" title="class in org.apache.velocity.runtime.parser.node">SimpleNode</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/runtime/RuntimeSingleton.html#parse-java.io.Reader-org.apache.velocity.Template-">parse</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader,
      <a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&nbsp;template)</code>
 <div class="block">Parse the input and return the root of
  AST node structure.</div>
@@ -358,8 +401,8 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>static <a href="../../../../org/apache/velocity/runtime/parser/node/SimpleNode.html" title="class in org.apache.velocity.runtime.parser.node">SimpleNode</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/runtime/RuntimeSingleton.html#parse-java.io.Reader-org.apache.velocity.Template-">parse</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader,
+<td class="colFirst"><code><a href="../../../../org/apache/velocity/runtime/parser/node/SimpleNode.html" title="class in org.apache.velocity.runtime.parser.node">SimpleNode</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/runtime/RuntimeInstance.html#parse-java.io.Reader-org.apache.velocity.Template-">parse</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader,
      <a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&nbsp;template)</code>
 <div class="block">Parse the input and return the root of
  AST node structure.</div>
@@ -580,6 +623,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/class-use/VelocityContext.html b/engine/devel/apidocs/org/apache/velocity/class-use/VelocityContext.html
index e2027cd..db1511f 100644
--- a/engine/devel/apidocs/org/apache/velocity/class-use/VelocityContext.html
+++ b/engine/devel/apidocs/org/apache/velocity/class-use/VelocityContext.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.VelocityContext (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.VelocityContext (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.VelocityContext (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.VelocityContext (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -161,6 +161,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/context/AbstractContext.html b/engine/devel/apidocs/org/apache/velocity/context/AbstractContext.html
index 7585a4c..e83c773 100644
--- a/engine/devel/apidocs/org/apache/velocity/context/AbstractContext.html
+++ b/engine/devel/apidocs/org/apache/velocity/context/AbstractContext.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:49 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AbstractContext (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>AbstractContext (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AbstractContext (Apache Velocity 2.2 API)";
+            parent.document.title="AbstractContext (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -144,7 +144,7 @@ implements <a href="../../../../org/apache/velocity/context/Context.html" title=
   All thanks to Fedor for the chaining idea.</div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: AbstractContext.java 1855186 2019-03-11 00:34:05Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>, <a href="mailto:fedor.karpelevitch@home.com">Fedor Karpelevitch</a>, <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a></dd>
 </dl>
@@ -248,7 +248,7 @@ implements <a href="../../../../org/apache/velocity/context/Context.html" title=
 </td>
 </tr>
 <tr id="i10" class="altColor">
-<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a></code></td>
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/context/AbstractContext.html#getMacroLibraries--">getMacroLibraries</a></span>()</code>
 <div class="block">Get the macro library list for the current template.</div>
 </td>
@@ -355,7 +355,7 @@ implements <a href="../../../../org/apache/velocity/context/Context.html" title=
 </tr>
 <tr id="i27" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/context/AbstractContext.html#setMacroLibraries-java.util.List-">setMacroLibraries</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;macroLibraries)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/context/AbstractContext.html#setMacroLibraries-java.util.List-">setMacroLibraries</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;&nbsp;macroLibraries)</code>
 <div class="block">Set the macro library list for the current template.</div>
 </td>
 </tr>
@@ -813,7 +813,7 @@ implements <a href="../../../../org/apache/velocity/context/Context.html" title=
 <ul class="blockList">
 <li class="blockList">
 <h4>setMacroLibraries</h4>
-<pre>public&nbsp;void&nbsp;setMacroLibraries(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;macroLibraries)</pre>
+<pre>public&nbsp;void&nbsp;setMacroLibraries(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;&nbsp;macroLibraries)</pre>
 <div class="block">Set the macro library list for the current template.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -829,7 +829,7 @@ implements <a href="../../../../org/apache/velocity/context/Context.html" title=
 <ul class="blockList">
 <li class="blockList">
 <h4>getMacroLibraries</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;getMacroLibraries()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;&nbsp;getMacroLibraries()</pre>
 <div class="block">Get the macro library list for the current template.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -942,6 +942,6 @@ implements <a href="../../../../org/apache/velocity/context/Context.html" title=
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/context/ChainedInternalContextAdapter.html b/engine/devel/apidocs/org/apache/velocity/context/ChainedInternalContextAdapter.html
index eb03848..9ba2e8e 100644
--- a/engine/devel/apidocs/org/apache/velocity/context/ChainedInternalContextAdapter.html
+++ b/engine/devel/apidocs/org/apache/velocity/context/ChainedInternalContextAdapter.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:49 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ChainedInternalContextAdapter (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>ChainedInternalContextAdapter (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ChainedInternalContextAdapter (Apache Velocity 2.2 API)";
+            parent.document.title="ChainedInternalContextAdapter (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -255,7 +255,7 @@ implements <a href="../../../../org/apache/velocity/context/InternalContextAdapt
 </td>
 </tr>
 <tr id="i11" class="rowColor">
-<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a></code></td>
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/context/ChainedInternalContextAdapter.html#getMacroLibraries--">getMacroLibraries</a></span>()</code>
 <div class="block">Get the macro library list for the current template.</div>
 </td>
@@ -330,7 +330,7 @@ implements <a href="../../../../org/apache/velocity/context/InternalContextAdapt
 </tr>
 <tr id="i23" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/context/ChainedInternalContextAdapter.html#setMacroLibraries-java.util.List-">setMacroLibraries</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;macroLibraries)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/context/ChainedInternalContextAdapter.html#setMacroLibraries-java.util.List-">setMacroLibraries</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;&nbsp;macroLibraries)</code>
 <div class="block">Set the macro library list for the current template.</div>
 </td>
 </tr>
@@ -721,7 +721,7 @@ implements <a href="../../../../org/apache/velocity/context/InternalContextAdapt
 <ul class="blockList">
 <li class="blockList">
 <h4>setMacroLibraries</h4>
-<pre>public&nbsp;void&nbsp;setMacroLibraries(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;macroLibraries)</pre>
+<pre>public&nbsp;void&nbsp;setMacroLibraries(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;&nbsp;macroLibraries)</pre>
 <div class="block">Set the macro library list for the current template.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -737,7 +737,7 @@ implements <a href="../../../../org/apache/velocity/context/InternalContextAdapt
 <ul class="blockList">
 <li class="blockList">
 <h4>getMacroLibraries</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;getMacroLibraries()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;&nbsp;getMacroLibraries()</pre>
 <div class="block">Get the macro library list for the current template.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -880,6 +880,6 @@ implements <a href="../../../../org/apache/velocity/context/InternalContextAdapt
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/context/Context.html b/engine/devel/apidocs/org/apache/velocity/context/Context.html
index b1845af..64f8899 100644
--- a/engine/devel/apidocs/org/apache/velocity/context/Context.html
+++ b/engine/devel/apidocs/org/apache/velocity/context/Context.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:49 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Context (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Context (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Context (Apache Velocity 2.2 API)";
+            parent.document.title="Context (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -120,7 +120,7 @@ var activeTableTab = "activeTableTab";
   class</div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: Context.java 1780307 2017-01-26 01:57:00Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>, <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a></dd>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -341,6 +341,6 @@ var activeTableTab = "activeTableTab";
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/context/InternalContextAdapter.html b/engine/devel/apidocs/org/apache/velocity/context/InternalContextAdapter.html
index 4827502..8612c0b 100644
--- a/engine/devel/apidocs/org/apache/velocity/context/InternalContextAdapter.html
+++ b/engine/devel/apidocs/org/apache/velocity/context/InternalContextAdapter.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:49 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>InternalContextAdapter (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>InternalContextAdapter (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="InternalContextAdapter (Apache Velocity 2.2 API)";
+            parent.document.title="InternalContextAdapter (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -119,7 +119,7 @@ extends <a href="../../../../org/apache/velocity/context/Context.html" title="in
   I will rename soon :)</div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: InternalContextAdapter.java 1780307 2017-01-26 01:57:00Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a></dd>
 </dl>
@@ -167,7 +167,7 @@ extends <a href="../../../../org/apache/velocity/context/Context.html" title="in
 </td>
 </tr>
 <tr id="i4" class="altColor">
-<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a></code></td>
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/context/InternalContextAdapter.html#getMacroLibraries--">getMacroLibraries</a></span>()</code>
 <div class="block">Get the macro library list for the current template.</div>
 </td>
@@ -229,7 +229,7 @@ extends <a href="../../../../org/apache/velocity/context/Context.html" title="in
 </tr>
 <tr id="i14" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/context/InternalContextAdapter.html#setMacroLibraries-java.util.List-">setMacroLibraries</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;macroLibraries)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/context/InternalContextAdapter.html#setMacroLibraries-java.util.List-">setMacroLibraries</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;&nbsp;macroLibraries)</code>
 <div class="block">Set the macro library list for the current template.</div>
 </td>
 </tr>
@@ -455,7 +455,7 @@ extends <a href="../../../../org/apache/velocity/context/Context.html" title="in
 <ul class="blockList">
 <li class="blockList">
 <h4>setMacroLibraries</h4>
-<pre>void&nbsp;setMacroLibraries(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;macroLibraries)</pre>
+<pre>void&nbsp;setMacroLibraries(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;&nbsp;macroLibraries)</pre>
 <div class="block">Set the macro library list for the current template.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -469,7 +469,7 @@ extends <a href="../../../../org/apache/velocity/context/Context.html" title="in
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getMacroLibraries</h4>
-<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;getMacroLibraries()</pre>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;&nbsp;getMacroLibraries()</pre>
 <div class="block">Get the macro library list for the current template.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -546,6 +546,6 @@ extends <a href="../../../../org/apache/velocity/context/Context.html" title="in
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/context/InternalContextAdapterImpl.html b/engine/devel/apidocs/org/apache/velocity/context/InternalContextAdapterImpl.html
index 7431964..c2c3268 100644
--- a/engine/devel/apidocs/org/apache/velocity/context/InternalContextAdapterImpl.html
+++ b/engine/devel/apidocs/org/apache/velocity/context/InternalContextAdapterImpl.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:49 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>InternalContextAdapterImpl (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>InternalContextAdapterImpl (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="InternalContextAdapterImpl (Apache Velocity 2.2 API)";
+            parent.document.title="InternalContextAdapterImpl (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -146,7 +146,7 @@ implements <a href="../../../../org/apache/velocity/context/InternalContextAdapt
   depending upon application.</div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: InternalContextAdapterImpl.java 1835856 2018-07-13 19:27:31Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a></dd>
 </dl>
@@ -254,7 +254,7 @@ implements <a href="../../../../org/apache/velocity/context/InternalContextAdapt
 </td>
 </tr>
 <tr id="i11" class="rowColor">
-<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a></code></td>
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/context/InternalContextAdapterImpl.html#getMacroLibraries--">getMacroLibraries</a></span>()</code>
 <div class="block">Get the macro library list for the current template.</div>
 </td>
@@ -329,7 +329,7 @@ implements <a href="../../../../org/apache/velocity/context/InternalContextAdapt
 </tr>
 <tr id="i23" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/context/InternalContextAdapterImpl.html#setMacroLibraries-java.util.List-">setMacroLibraries</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;macroLibraries)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/context/InternalContextAdapterImpl.html#setMacroLibraries-java.util.List-">setMacroLibraries</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;&nbsp;macroLibraries)</code>
 <div class="block">Set the macro library list for the current template.</div>
 </td>
 </tr>
@@ -605,7 +605,7 @@ implements <a href="../../../../org/apache/velocity/context/InternalContextAdapt
 <ul class="blockList">
 <li class="blockList">
 <h4>setMacroLibraries</h4>
-<pre>public&nbsp;void&nbsp;setMacroLibraries(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;macroLibraries)</pre>
+<pre>public&nbsp;void&nbsp;setMacroLibraries(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;&nbsp;macroLibraries)</pre>
 <div class="block">Set the macro library list for the current template.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -623,7 +623,7 @@ implements <a href="../../../../org/apache/velocity/context/InternalContextAdapt
 <ul class="blockList">
 <li class="blockList">
 <h4>getMacroLibraries</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;getMacroLibraries()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;&nbsp;getMacroLibraries()</pre>
 <div class="block">Get the macro library list for the current template.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -886,6 +886,6 @@ implements <a href="../../../../org/apache/velocity/context/InternalContextAdapt
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/context/InternalEventContext.html b/engine/devel/apidocs/org/apache/velocity/context/InternalEventContext.html
index d84aca8..3422b7a 100644
--- a/engine/devel/apidocs/org/apache/velocity/context/InternalEventContext.html
+++ b/engine/devel/apidocs/org/apache/velocity/context/InternalEventContext.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:49 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>InternalEventContext (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>InternalEventContext (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="InternalEventContext (Apache Velocity 2.2 API)";
+            parent.document.title="InternalEventContext (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -116,7 +116,7 @@ var activeTableTab = "activeTableTab";
   of the .context package.</div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: InternalEventContext.java 1780734 2017-01-28 19:21:08Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a></dd>
 </dl>
@@ -258,6 +258,6 @@ var activeTableTab = "activeTableTab";
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/context/InternalWrapperContext.html b/engine/devel/apidocs/org/apache/velocity/context/InternalWrapperContext.html
index 2137a19..eee80af 100644
--- a/engine/devel/apidocs/org/apache/velocity/context/InternalWrapperContext.html
+++ b/engine/devel/apidocs/org/apache/velocity/context/InternalWrapperContext.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:49 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:11 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>InternalWrapperContext (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>InternalWrapperContext (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="InternalWrapperContext (Apache Velocity 2.2 API)";
+            parent.document.title="InternalWrapperContext (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -114,7 +114,7 @@ var activeTableTab = "activeTableTab";
 <div class="block">interface for internal context wrapping functionality</div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: InternalWrapperContext.java 1855206 2019-03-11 11:09:53Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a></dd>
 </dl>
@@ -329,6 +329,6 @@ var activeTableTab = "activeTableTab";
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/context/class-use/AbstractContext.html b/engine/devel/apidocs/org/apache/velocity/context/class-use/AbstractContext.html
index e7c2625..e3d394d 100644
--- a/engine/devel/apidocs/org/apache/velocity/context/class-use/AbstractContext.html
+++ b/engine/devel/apidocs/org/apache/velocity/context/class-use/AbstractContext.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.context.AbstractContext (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.context.AbstractContext (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.context.AbstractContext (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.context.AbstractContext (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -207,6 +207,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/context/class-use/ChainedInternalContextAdapter.html b/engine/devel/apidocs/org/apache/velocity/context/class-use/ChainedInternalContextAdapter.html
index 3bf5f65..2e4db06 100644
--- a/engine/devel/apidocs/org/apache/velocity/context/class-use/ChainedInternalContextAdapter.html
+++ b/engine/devel/apidocs/org/apache/velocity/context/class-use/ChainedInternalContextAdapter.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.context.ChainedInternalContextAdapter (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.context.ChainedInternalContextAdapter (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.context.ChainedInternalContextAdapter (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.context.ChainedInternalContextAdapter (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,6 +121,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/context/class-use/Context.html b/engine/devel/apidocs/org/apache/velocity/context/class-use/Context.html
index c710d3c..227a776 100644
--- a/engine/devel/apidocs/org/apache/velocity/context/class-use/Context.html
+++ b/engine/devel/apidocs/org/apache/velocity/context/class-use/Context.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface org.apache.velocity.context.Context (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Interface org.apache.velocity.context.Context (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface org.apache.velocity.context.Context (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Interface org.apache.velocity.context.Context (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -159,7 +159,7 @@
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">Template.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/Template.html#merge-org.apache.velocity.context.Context-java.io.Writer-java.util.List-">merge</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
      <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
-     <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;macroLibraries)</code>
+     <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;macroLibraries)</code>
 <div class="block">The AST node structure is merged with the
  context to produce the final output.</div>
 </td>
@@ -200,8 +200,8 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.io.Reader-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.io.Reader-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;logTag,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader)</code>
@@ -209,8 +209,8 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.io.Reader-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.io.Reader-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;logTag,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader)</code>
@@ -218,8 +218,8 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.lang.String-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.lang.String-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;logTag,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;instring)</code>
@@ -227,8 +227,8 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.lang.String-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.lang.String-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;logTag,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;instring)</code>
@@ -236,8 +236,8 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#invokeVelocimacro-java.lang.String-java.lang.String-java.lang.String:A-org.apache.velocity.context.Context-java.io.Writer-">invokeVelocimacro</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;vmName,
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#invokeVelocimacro-java.lang.String-java.lang.String-java.lang.String:A-org.apache.velocity.context.Context-java.io.Writer-">invokeVelocimacro</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;vmName,
                  <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;logTag,
                  <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;params,
                  <a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
@@ -247,8 +247,8 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#invokeVelocimacro-java.lang.String-java.lang.String-java.lang.String:A-org.apache.velocity.context.Context-java.io.Writer-">invokeVelocimacro</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;vmName,
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#invokeVelocimacro-java.lang.String-java.lang.String-java.lang.String:A-org.apache.velocity.context.Context-java.io.Writer-">invokeVelocimacro</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;vmName,
                  <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;logTag,
                  <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;params,
                  <a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
@@ -258,21 +258,21 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#mergeTemplate-java.lang.String-java.lang.String-org.apache.velocity.context.Context-java.io.Writer-">mergeTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;templateName,
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#mergeTemplate-java.lang.String-java.lang.String-org.apache.velocity.context.Context-java.io.Writer-">mergeTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;templateName,
              <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding,
              <a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
              <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>
-<div class="block">Merges a template and puts the rendered stream into the writer</div>
+<div class="block">merges a template and puts the rendered stream into the writer</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#mergeTemplate-java.lang.String-java.lang.String-org.apache.velocity.context.Context-java.io.Writer-">mergeTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;templateName,
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#mergeTemplate-java.lang.String-java.lang.String-org.apache.velocity.context.Context-java.io.Writer-">mergeTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;templateName,
              <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding,
              <a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
              <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>
-<div class="block">merges a template and puts the rendered stream into the writer</div>
+<div class="block">Merges a template and puts the rendered stream into the writer</div>
 </td>
 </tr>
 </tbody>
@@ -318,68 +318,68 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">EventCartridge.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/event/EventCartridge.html#invalidGetMethod-org.apache.velocity.context.Context-java.lang.String-java.lang.Object-java.lang.String-org.apache.velocity.util.introspection.Info-">invalidGetMethod</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">InvalidReferenceEventHandler.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/event/InvalidReferenceEventHandler.html#invalidGetMethod-org.apache.velocity.context.Context-java.lang.String-java.lang.Object-java.lang.String-org.apache.velocity.util.introspection.Info-">invalidGetMethod</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.c [...]
                 <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;reference,
                 <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;object,
                 <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;property,
                 <a href="../../../../../org/apache/velocity/util/introspection/Info.html" title="class in org.apache.velocity.util.introspection">Info</a>&nbsp;info)</code>
-<div class="block">Call invalid reference handlers for an invalid getter</div>
+<div class="block">Called when object is null or there is no getter for the given
+ property.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">InvalidReferenceEventHandler.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/event/InvalidReferenceEventHandler.html#invalidGetMethod-org.apache.velocity.context.Context-java.lang.String-java.lang.Object-java.lang.String-org.apache.velocity.util.introspection.Info-">invalidGetMethod</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.c [...]
+<td class="colLast"><span class="typeNameLabel">EventCartridge.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/event/EventCartridge.html#invalidGetMethod-org.apache.velocity.context.Context-java.lang.String-java.lang.Object-java.lang.String-org.apache.velocity.util.introspection.Info-">invalidGetMethod</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
                 <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;reference,
                 <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;object,
                 <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;property,
                 <a href="../../../../../org/apache/velocity/util/introspection/Info.html" title="class in org.apache.velocity.util.introspection">Info</a>&nbsp;info)</code>
-<div class="block">Called when object is null or there is no getter for the given
- property.</div>
+<div class="block">Call invalid reference handlers for an invalid getter</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">EventCartridge.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/event/EventCartridge.html#invalidMethod-org.apache.velocity.context.Context-java.lang.String-java.lang.Object-java.lang.String-org.apache.velocity.util.introspection.Info-">invalidMethod</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">InvalidReferenceEventHandler.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/event/InvalidReferenceEventHandler.html#invalidMethod-org.apache.velocity.context.Context-java.lang.String-java.lang.Object-java.lang.String-org.apache.velocity.util.introspection.Info-">invalidMethod</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context [...]
              <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;reference,
              <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;object,
              <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;method,
              <a href="../../../../../org/apache/velocity/util/introspection/Info.html" title="class in org.apache.velocity.util.introspection">Info</a>&nbsp;info)</code>
-<div class="block">Call invalid reference handlers for an invalid method call</div>
+<div class="block">Called when object is null or the given method does not exist.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">InvalidReferenceEventHandler.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/event/InvalidReferenceEventHandler.html#invalidMethod-org.apache.velocity.context.Context-java.lang.String-java.lang.Object-java.lang.String-org.apache.velocity.util.introspection.Info-">invalidMethod</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context [...]
+<td class="colLast"><span class="typeNameLabel">EventCartridge.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/event/EventCartridge.html#invalidMethod-org.apache.velocity.context.Context-java.lang.String-java.lang.Object-java.lang.String-org.apache.velocity.util.introspection.Info-">invalidMethod</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
              <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;reference,
              <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;object,
              <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;method,
              <a href="../../../../../org/apache/velocity/util/introspection/Info.html" title="class in org.apache.velocity.util.introspection">Info</a>&nbsp;info)</code>
-<div class="block">Called when object is null or the given method does not exist.</div>
+<div class="block">Call invalid reference handlers for an invalid method call</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">EventCartridge.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/event/EventCartridge.html#invalidSetMethod-org.apache.velocity.context.Context-java.lang.String-java.lang.String-org.apache.velocity.util.introspection.Info-">invalidSetMethod</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">InvalidReferenceEventHandler.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/event/InvalidReferenceEventHandler.html#invalidSetMethod-org.apache.velocity.context.Context-java.lang.String-java.lang.String-org.apache.velocity.util.introspection.Info-">invalidSetMethod</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</ [...]
                 <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;leftreference,
                 <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;rightreference,
                 <a href="../../../../../org/apache/velocity/util/introspection/Info.html" title="class in org.apache.velocity.util.introspection">Info</a>&nbsp;info)</code>
-<div class="block">Call invalid reference handlers for an invalid setter</div>
+<div class="block">Called when object is null or there is no setter for the given
+ property.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">InvalidReferenceEventHandler.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/event/InvalidReferenceEventHandler.html#invalidSetMethod-org.apache.velocity.context.Context-java.lang.String-java.lang.String-org.apache.velocity.util.introspection.Info-">invalidSetMethod</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</ [...]
+<td class="colLast"><span class="typeNameLabel">EventCartridge.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/event/EventCartridge.html#invalidSetMethod-org.apache.velocity.context.Context-java.lang.String-java.lang.String-org.apache.velocity.util.introspection.Info-">invalidSetMethod</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
                 <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;leftreference,
                 <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;rightreference,
                 <a href="../../../../../org/apache/velocity/util/introspection/Info.html" title="class in org.apache.velocity.util.introspection">Info</a>&nbsp;info)</code>
-<div class="block">Called when object is null or there is no setter for the given
- property.</div>
+<div class="block">Call invalid reference handlers for an invalid setter</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
 <td class="colLast"><span class="typeNameLabel">MethodExceptionEventHandler.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/event/MethodExceptionEventHandler.html#methodException-org.apache.velocity.context.Context-java.lang.Class-java.lang.String-java.lang.Exception-org.apache.velocity.util.introspection.Info-">methodException</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.con [...]
-               <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&nbsp;claz,
+               <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;claz,
                <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;method,
                <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a>&nbsp;e,
                <a href="../../../../../org/apache/velocity/util/introspection/Info.html" title="class in org.apache.velocity.util.introspection">Info</a>&nbsp;info)</code>
@@ -389,7 +389,7 @@
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
 <td class="colLast"><span class="typeNameLabel">EventCartridge.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/event/EventCartridge.html#methodException-org.apache.velocity.context.Context-java.lang.Class-java.lang.String-java.lang.Exception-org.apache.velocity.util.introspection.Info-">methodException</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
-               <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&nbsp;claz,
+               <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;claz,
                <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;method,
                <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a>&nbsp;e,
                <a href="../../../../../org/apache/velocity/util/introspection/Info.html" title="class in org.apache.velocity.util.introspection">Info</a>&nbsp;info)</code>
@@ -421,21 +421,21 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><span class="typeNameLabel">IncludeNotFound.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/event/implement/IncludeNotFound.html#includeEvent-org.apache.velocity.context.Context-java.lang.String-java.lang.String-java.lang.String-">includeEvent</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">IncludeRelativePath.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/event/implement/IncludeRelativePath.html#includeEvent-org.apache.velocity.context.Context-java.lang.String-java.lang.String-java.lang.String-">includeEvent</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
             <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;includeResourcePath,
             <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;currentResourcePath,
             <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;directiveName)</code>
-<div class="block">Check to see if included file exists, and display "not found" page if it
- doesn't.</div>
+<div class="block">Return path relative to the current template's path.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><span class="typeNameLabel">IncludeRelativePath.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/event/implement/IncludeRelativePath.html#includeEvent-org.apache.velocity.context.Context-java.lang.String-java.lang.String-java.lang.String-">includeEvent</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">IncludeNotFound.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/event/implement/IncludeNotFound.html#includeEvent-org.apache.velocity.context.Context-java.lang.String-java.lang.String-java.lang.String-">includeEvent</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
             <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;includeResourcePath,
             <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;currentResourcePath,
             <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;directiveName)</code>
-<div class="block">Return path relative to the current template's path.</div>
+<div class="block">Check to see if included file exists, and display "not found" page if it
+ doesn't.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -470,7 +470,7 @@
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
 <td class="colLast"><span class="typeNameLabel">PrintExceptions.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/event/implement/PrintExceptions.html#methodException-org.apache.velocity.context.Context-java.lang.Class-java.lang.String-java.lang.Exception-org.apache.velocity.util.introspection.Info-">methodException</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context< [...]
-               <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&nbsp;claz,
+               <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;claz,
                <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;method,
                <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a>&nbsp;e,
                <a href="../../../../../org/apache/velocity/util/introspection/Info.html" title="class in org.apache.velocity.util.introspection">Info</a>&nbsp;info)</code>
@@ -557,21 +557,21 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a></code></td>
-<td class="colLast"><span class="typeNameLabel">InternalContextAdapterImpl.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/context/InternalContextAdapterImpl.html#getInternalUserContext--">getInternalUserContext</a></span>()</code>
-<div class="block">returns the user data context that
-  we are wrapping</div>
+<td class="colLast"><span class="typeNameLabel">InternalWrapperContext.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/context/InternalWrapperContext.html#getInternalUserContext--">getInternalUserContext</a></span>()</code>
+<div class="block">Returns the wrapped user context.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ChainedInternalContextAdapter.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/context/ChainedInternalContextAdapter.html#getInternalUserContext--">getInternalUserContext</a></span>()</code>
-<div class="block">Return the inner / user context.</div>
+<td class="colLast"><span class="typeNameLabel">InternalContextAdapterImpl.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/context/InternalContextAdapterImpl.html#getInternalUserContext--">getInternalUserContext</a></span>()</code>
+<div class="block">returns the user data context that
+  we are wrapping</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a></code></td>
-<td class="colLast"><span class="typeNameLabel">InternalWrapperContext.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/context/InternalWrapperContext.html#getInternalUserContext--">getInternalUserContext</a></span>()</code>
-<div class="block">Returns the wrapped user context.</div>
+<td class="colLast"><span class="typeNameLabel">ChainedInternalContextAdapter.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/context/ChainedInternalContextAdapter.html#getInternalUserContext--">getInternalUserContext</a></span>()</code>
+<div class="block">Return the inner / user context.</div>
 </td>
 </tr>
 </tbody>
@@ -714,7 +714,7 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeInstance.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.io.Reader-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">RuntimeServices.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.io.Reader-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;logTag,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader)</code>
@@ -723,7 +723,7 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeServices.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.io.Reader-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeInstance.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.io.Reader-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;logTag,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader)</code>
@@ -732,7 +732,7 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeInstance.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.lang.String-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">RuntimeServices.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.lang.String-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;logTag,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;instring)</code>
@@ -741,7 +741,7 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeServices.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.lang.String-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeInstance.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.lang.String-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;logTag,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;instring)</code>
@@ -750,7 +750,7 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeInstance.html#invokeVelocimacro-java.lang.String-java.lang.String-java.lang.String:A-org.apache.velocity.context.Context-java.io.Writer-">invokeVelocimacro</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;vmName,
+<td class="colLast"><span class="typeNameLabel">RuntimeServices.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html#invokeVelocimacro-java.lang.String-java.lang.String-java.lang.String:A-org.apache.velocity.context.Context-java.io.Writer-">invokeVelocimacro</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;vmName,
                  <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;logTag,
                  <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;params,
                  <a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
@@ -761,7 +761,7 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeServices.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html#invokeVelocimacro-java.lang.String-java.lang.String-java.lang.String:A-org.apache.velocity.context.Context-java.io.Writer-">invokeVelocimacro</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;vmName,
+<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeInstance.html#invokeVelocimacro-java.lang.String-java.lang.String-java.lang.String:A-org.apache.velocity.context.Context-java.io.Writer-">invokeVelocimacro</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;vmName,
                  <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;logTag,
                  <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;params,
                  <a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
@@ -854,6 +854,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/context/class-use/InternalContextAdapter.html b/engine/devel/apidocs/org/apache/velocity/context/class-use/InternalContextAdapter.html
index 048a16a..89b9ad2 100644
--- a/engine/devel/apidocs/org/apache/velocity/context/class-use/InternalContextAdapter.html
+++ b/engine/devel/apidocs/org/apache/velocity/context/class-use/InternalContextAdapter.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface org.apache.velocity.context.InternalContextAdapter (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Interface org.apache.velocity.context.InternalContextAdapter (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface org.apache.velocity.context.InternalContextAdapter (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Interface org.apache.velocity.context.InternalContextAdapter (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -178,7 +178,7 @@
 <td class="colFirst"><code>static <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
 <td class="colLast"><span class="typeNameLabel">EventHandlerUtil.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/event/EventHandlerUtil.html#methodException-org.apache.velocity.runtime.RuntimeServices-org.apache.velocity.context.InternalContextAdapter-java.lang.Class-java.lang.String-java.lang.Exception-org.apache.velocity.util.introspection.Info-">methodException</a></span>(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html [...]
                <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
-               <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&nbsp;claz,
+               <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;claz,
                <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;method,
                <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a>&nbsp;e,
                <a href="../../../../../org/apache/velocity/util/introspection/Info.html" title="class in org.apache.velocity.util.introspection">Info</a>&nbsp;info)</code>
@@ -257,20 +257,20 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a></code></td>
-<td class="colLast"><span class="typeNameLabel">InternalContextAdapterImpl.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/context/InternalContextAdapterImpl.html#getBaseContext--">getBaseContext</a></span>()</code>
-<div class="block">Returns the base context that we are
-  wrapping.</div>
+<td class="colLast"><span class="typeNameLabel">InternalWrapperContext.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/context/InternalWrapperContext.html#getBaseContext--">getBaseContext</a></span>()</code>
+<div class="block">Returns the base full context impl.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ChainedInternalContextAdapter.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/context/ChainedInternalContextAdapter.html#getBaseContext--">getBaseContext</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">InternalContextAdapterImpl.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/context/InternalContextAdapterImpl.html#getBaseContext--">getBaseContext</a></span>()</code>
+<div class="block">Returns the base context that we are
+  wrapping.</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a></code></td>
-<td class="colLast"><span class="typeNameLabel">InternalWrapperContext.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/context/InternalWrapperContext.html#getBaseContext--">getBaseContext</a></span>()</code>
-<div class="block">Returns the base full context impl.</div>
-</td>
+<td class="colLast"><span class="typeNameLabel">ChainedInternalContextAdapter.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/context/ChainedInternalContextAdapter.html#getBaseContext--">getBaseContext</a></span>()</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -356,30 +356,31 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Macro.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Macro.html#init-org.apache.velocity.runtime.RuntimeServices-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.Node-">init</a></span>(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html" title="interface in org.apache.velocity.runtime">RuntimeServices</a>&nbsp;rs,
+<td class="colLast"><span class="typeNameLabel">Stop.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Stop.html#init-org.apache.velocity.runtime.RuntimeServices-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.Node-">init</a></span>(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html" title="interface in org.apache.velocity.runtime">RuntimeServices</a>&nbsp;rs,
     <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Directive.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Directive.html#init-org.apache.velocity.runtime.RuntimeServices-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.Node-">init</a></span>(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html" title="interface in org.apache.velocity.runtime">RuntimeServices</a>&nbsp;rs,
+<td class="colLast"><span class="typeNameLabel">Parse.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Parse.html#init-org.apache.velocity.runtime.RuntimeServices-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.Node-">init</a></span>(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html" title="interface in org.apache.velocity.runtime">RuntimeServices</a>&nbsp;rs,
     <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>
-<div class="block">How this directive is to be initialized.</div>
+<div class="block">Init's the #parse directive.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Break.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Break.html#init-org.apache.velocity.runtime.RuntimeServices-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.Node-">init</a></span>(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html" title="interface in org.apache.velocity.runtime">RuntimeServices</a>&nbsp;rs,
+<td class="colLast"><span class="typeNameLabel">Macro.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Macro.html#init-org.apache.velocity.runtime.RuntimeServices-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.Node-">init</a></span>(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html" title="interface in org.apache.velocity.runtime">RuntimeServices</a>&nbsp;rs,
     <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Parse.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Parse.html#init-org.apache.velocity.runtime.RuntimeServices-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.Node-">init</a></span>(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html" title="interface in org.apache.velocity.runtime">RuntimeServices</a>&nbsp;rs,
+<td class="colLast"><span class="typeNameLabel">Include.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Include.html#init-org.apache.velocity.runtime.RuntimeServices-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.Node-">init</a></span>(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html" title="interface in org.apache.velocity.runtime">RuntimeServices</a>&nbsp;rs,
     <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>
-<div class="block">Init's the #parse directive.</div>
+<div class="block">simple init - init the tree and get the elementKey from
+  the AST</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -393,24 +394,23 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Include.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Include.html#init-org.apache.velocity.runtime.RuntimeServices-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.Node-">init</a></span>(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html" title="interface in org.apache.velocity.runtime">RuntimeServices</a>&nbsp;rs,
+<td class="colLast"><span class="typeNameLabel">Evaluate.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Evaluate.html#init-org.apache.velocity.runtime.RuntimeServices-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.Node-">init</a></span>(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html" title="interface in org.apache.velocity.runtime">RuntimeServices</a>&nbsp;rs,
     <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>
-<div class="block">simple init - init the tree and get the elementKey from
-  the AST</div>
+<div class="block">Initialize and check arguments.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Evaluate.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Evaluate.html#init-org.apache.velocity.runtime.RuntimeServices-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.Node-">init</a></span>(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html" title="interface in org.apache.velocity.runtime">RuntimeServices</a>&nbsp;rs,
+<td class="colLast"><span class="typeNameLabel">Directive.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Directive.html#init-org.apache.velocity.runtime.RuntimeServices-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.Node-">init</a></span>(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html" title="interface in org.apache.velocity.runtime">RuntimeServices</a>&nbsp;rs,
     <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>
-<div class="block">Initialize and check arguments.</div>
+<div class="block">How this directive is to be initialized.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Block.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Block.html#init-org.apache.velocity.runtime.RuntimeServices-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.Node-">init</a></span>(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html" title="interface in org.apache.velocity.runtime">RuntimeServices</a>&nbsp;rs,
+<td class="colLast"><span class="typeNameLabel">Define.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Define.html#init-org.apache.velocity.runtime.RuntimeServices-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.Node-">init</a></span>(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html" title="interface in org.apache.velocity.runtime">RuntimeServices</a>&nbsp;rs,
     <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>
 <div class="block">simple init - get the key</div>
@@ -418,13 +418,13 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Stop.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Stop.html#init-org.apache.velocity.runtime.RuntimeServices-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.Node-">init</a></span>(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html" title="interface in org.apache.velocity.runtime">RuntimeServices</a>&nbsp;rs,
+<td class="colLast"><span class="typeNameLabel">Break.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Break.html#init-org.apache.velocity.runtime.RuntimeServices-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.Node-">init</a></span>(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html" title="interface in org.apache.velocity.runtime">RuntimeServices</a>&nbsp;rs,
     <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Define.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Define.html#init-org.apache.velocity.runtime.RuntimeServices-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.Node-">init</a></span>(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html" title="interface in org.apache.velocity.runtime">RuntimeServices</a>&nbsp;rs,
+<td class="colLast"><span class="typeNameLabel">Block.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Block.html#init-org.apache.velocity.runtime.RuntimeServices-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.Node-">init</a></span>(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html" title="interface in org.apache.velocity.runtime">RuntimeServices</a>&nbsp;rs,
     <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>
 <div class="block">simple init - get the key</div>
@@ -432,20 +432,20 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">BlockMacro.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/BlockMacro.html#init-org.apache.velocity.runtime.RuntimeServices-java.lang.String-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.Node-">init</a></span>(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html" title="interface in org.apache.velocity.runtime">RuntimeSer [...]
-    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;macroName,
+<td class="colLast"><span class="typeNameLabel">RuntimeMacro.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/RuntimeMacro.html#init-org.apache.velocity.runtime.RuntimeServices-java.lang.String-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.Node-">init</a></span>(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html" title="interface in org.apache.velocity.runtime">Runtim [...]
+    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
     <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>
-<div class="block">Initializes the directive.</div>
+<div class="block">Initialize the Runtime macro.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeMacro.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/RuntimeMacro.html#init-org.apache.velocity.runtime.RuntimeServices-java.lang.String-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.Node-">init</a></span>(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html" title="interface in org.apache.velocity.runtime">Runtim [...]
-    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<td class="colLast"><span class="typeNameLabel">BlockMacro.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/BlockMacro.html#init-org.apache.velocity.runtime.RuntimeServices-java.lang.String-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.Node-">init</a></span>(<a href="../../../../../org/apache/velocity/runtime/RuntimeServices.html" title="interface in org.apache.velocity.runtime">RuntimeSer [...]
+    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;macroName,
     <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>
-<div class="block">Initialize the Runtime macro.</div>
+<div class="block">Initializes the directive.</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -487,53 +487,50 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Macro.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Macro.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">VelocimacroProxy.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/VelocimacroProxy.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
       <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>
-<div class="block">render() doesn't do anything in the final output rendering.</div>
+<div class="block">Render the macro AST node</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>abstract boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Directive.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Directive.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">Stop.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Stop.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
-      <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>
-<div class="block">How this directive is to be rendered</div>
-</td>
+      <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Break.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Break.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">RuntimeMacro.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/RuntimeMacro.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
       <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>
-<div class="block">This directive throws a StopCommand which signals either
- the nearest Scope or the specified scope to stop rendering
- its content.</div>
+<div class="block">Velocimacro implementation is not known at the init time.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">BlockMacro.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/BlockMacro.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">Parse.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Parse.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
       <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>
-<div class="block">Renders content using the selected macro and the passed AST body.</div>
+<div class="block">iterates through the argument list and renders every
+  argument that is appropriate.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Parse.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Parse.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">Macro.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Macro.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
       <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>
-<div class="block">iterates through the argument list and renders every
-  argument that is appropriate.</div>
+<div class="block">render() doesn't do anything in the final output rendering.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">VelocimacroProxy.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/VelocimacroProxy.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">Include.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Include.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
       <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>
-<div class="block">Render the macro AST node</div>
+<div class="block">iterates through the argument list and renders every
+  argument that is appropriate.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -546,43 +543,46 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Include.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Include.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">Evaluate.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Evaluate.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
       <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>
-<div class="block">iterates through the argument list and renders every
-  argument that is appropriate.</div>
+<div class="block">Evaluate the argument, convert to a String, and evaluate again
+ (with the same context).</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Evaluate.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Evaluate.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colFirst"><code>abstract boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">Directive.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Directive.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
       <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>
-<div class="block">Evaluate the argument, convert to a String, and evaluate again
- (with the same context).</div>
+<div class="block">How this directive is to be rendered</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Stop.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Stop.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">Define.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Define.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
-      <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>&nbsp;</td>
+      <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>
+<div class="block">directive.render() simply makes an instance of the Block inner class
+ and places it into the context as indicated.</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeMacro.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/RuntimeMacro.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">Break.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Break.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
       <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>
-<div class="block">Velocimacro implementation is not known at the init time.</div>
+<div class="block">This directive throws a StopCommand which signals either
+ the nearest Scope or the specified scope to stop rendering
+ its content.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Define.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Define.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">BlockMacro.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/BlockMacro.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
       <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>
-<div class="block">directive.render() simply makes an instance of the Block inner class
- and places it into the context as indicated.</div>
+<div class="block">Renders content using the selected macro and the passed AST body.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -678,64 +678,61 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTTrue.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTTrue.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">SimpleNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/SimpleNode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTComparisonNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTComparisonNode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">Node.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTNENode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTNENode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code></td>
+<td class="colLast"><span class="typeNameLabel">ASTTrue.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTTrue.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTNotNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTNotNode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTStringLiteral.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTStringLiteral.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTOrNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTOrNode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
-<div class="block">the logical or :</div>
+<td class="colLast"><span class="typeNameLabel">ASTReference.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTReference.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
+<div class="block">Computes boolean value of this reference
+   Returns the actual value of reference return type
+   boolean, and 'true' if value is not null</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTMap.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTMap.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTOrNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTOrNode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
+<div class="block">the logical or :</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">SimpleNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/SimpleNode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTObjectArray.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTObjectArray.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTStringLiteral.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTStringLiteral.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTNotNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTNotNode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTReference.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTReference.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
-<div class="block">Computes boolean value of this reference
-   Returns the actual value of reference return type
-   boolean, and 'true' if value is not null</div>
-</td>
+<td class="colLast"><span class="typeNameLabel">ASTNegateNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTNegateNode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Node.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTNENode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTNENode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTIntegerLiteral.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTMap.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTMap.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTFloatingPointLiteral.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTIntegerLiteral.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTElseIfStatement.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTElseIfStatement.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
-<div class="block">An ASTElseStatement is true if the expression
- it contains evaluates to true.</div>
-</td>
+<td class="colLast"><span class="typeNameLabel">ASTFloatingPointLiteral.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
@@ -743,9 +740,7 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTAndNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTAndNode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
-<div class="block">logical and :</div>
-</td>
+<td class="colLast"><span class="typeNameLabel">ASTExpression.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTExpression.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
@@ -756,15 +751,20 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTNegateNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTNegateNode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTElseIfStatement.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTElseIfStatement.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
+<div class="block">An ASTElseStatement is true if the expression
+ it contains evaluates to true.</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTExpression.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTExpression.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTComparisonNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTComparisonNode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTObjectArray.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTObjectArray.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTAndNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTAndNode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
+<div class="block">logical and :</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
@@ -773,7 +773,7 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTIdentifier.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIdentifier.html#execute-java.lang.Object-org.apache.velocity.context.InternalContextAdapter-">execute</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
+<td class="colLast"><span class="typeNameLabel">Node.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html#execute-java.lang.Object-org.apache.velocity.context.InternalContextAdapter-">execute</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
        <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
@@ -785,21 +785,21 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">Node.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html#execute-java.lang.Object-org.apache.velocity.context.InternalContextAdapter-">execute</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
-       <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
 <td class="colLast"><span class="typeNameLabel">ASTMethod.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTMethod.html#execute-java.lang.Object-org.apache.velocity.context.InternalContextAdapter-">execute</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
        <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
 <div class="block">invokes the method.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
 <td class="colLast"><span class="typeNameLabel">ASTIndex.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIndex.html#execute-java.lang.Object-org.apache.velocity.context.InternalContextAdapter-">execute</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
        <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colLast"><span class="typeNameLabel">ASTIdentifier.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIdentifier.html#execute-java.lang.Object-org.apache.velocity.context.InternalContextAdapter-">execute</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
+       <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><span class="typeNameLabel">SimpleNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/SimpleNode.html#getLocation-org.apache.velocity.context.InternalContextAdapter-">getLocation</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
@@ -828,106 +828,105 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTMathNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTMathNode.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
-    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code></td>
+<td class="colLast"><span class="typeNameLabel">SimpleNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/SimpleNode.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTModNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTModNode.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">Node.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTIfStatement.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIfStatement.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTprocess.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTprocess.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTMulNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTMulNode.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTWord.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTWord.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTBinaryOperator.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTBinaryOperator.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTVariable.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTVariable.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTVariable.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTVariable.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTTrue.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTTrue.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTTrue.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTTrue.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTTextblock.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTTextblock.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTBlock.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTBlock.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTText.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTText.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTNotNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTNotNode.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
-    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTStringLiteral.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTStringLiteral.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>
+<div class="block">init : we don't have to do much.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTMap.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTMap.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
-    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTSetDirective.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTSetDirective.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>
+<div class="block">simple init.</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">SimpleNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/SimpleNode.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTReference.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTReference.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTEscapedDirective.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTEscapedDirective.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTObjectArray.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTObjectArray.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTTextblock.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTTextblock.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTNotNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTNotNode.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTIncludeStatement.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIncludeStatement.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
-    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTNegateNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTNegateNode.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTIdentifier.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIdentifier.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
-    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>
-<div class="block">simple init - don't do anything that is context specific.</div>
-</td>
+<td class="colLast"><span class="typeNameLabel">ASTMulNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTMulNode.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTprocess.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTprocess.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTModNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTModNode.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTStringLiteral.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTStringLiteral.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTMethod.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTMethod.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>
-<div class="block">init : we don't have to do much.</div>
+<div class="block">simple init - init our subtree and get what we can from
+  the AST</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTComment.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTComment.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
-    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>
-<div class="block">We need to make sure we catch any of the dreaded MORE tokens.</div>
-</td>
+<td class="colLast"><span class="typeNameLabel">ASTMathNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTMathNode.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTSetDirective.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTSetDirective.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
-    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>
-<div class="block">simple init.</div>
-</td>
+<td class="colLast"><span class="typeNameLabel">ASTMap.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTMap.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
@@ -936,140 +935,141 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTEscape.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTEscape.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTIntegerRange.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIntegerRange.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTAssignment.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTAssignment.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTIntegerLiteral.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTReference.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTReference.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTIndex.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIndex.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">Node.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTIncludeStatement.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIncludeStatement.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTIntegerLiteral.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTIfStatement.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIfStatement.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTMethod.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTMethod.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTIdentifier.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIdentifier.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>
-<div class="block">simple init - init our subtree and get what we can from
-  the AST</div>
+<div class="block">simple init - don't do anything that is context specific.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTIntegerRange.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIntegerRange.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
-    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTFloatingPointLiteral.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>
+<div class="block">Initialization method - doesn't do much but do the object
+  creation.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTDirective.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTDirective.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTFalse.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTFalse.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTDirectiveAssign.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTDirectiveAssign.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTExpression.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTExpression.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTFloatingPointLiteral.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
-    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>
-<div class="block">Initialization method - doesn't do much but do the object
-  creation.</div>
-</td>
+<td class="colLast"><span class="typeNameLabel">ASTEscapedDirective.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTEscapedDirective.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTElseIfStatement.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTElseIfStatement.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTEscape.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTEscape.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTFalse.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTFalse.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTElseStatement.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTElseStatement.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTIndex.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIndex.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTElseIfStatement.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTElseIfStatement.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTText.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTText.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTDirectiveAssign.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTDirectiveAssign.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTWord.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTWord.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTDirective.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTDirective.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTElseStatement.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTElseStatement.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
-    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTComment.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTComment.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>
+<div class="block">We need to make sure we catch any of the dreaded MORE tokens.</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTNegateNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTNegateNode.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
-    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code></td>
+<td class="colLast"><span class="typeNameLabel">ASTBlock.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTBlock.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTExpression.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTExpression.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTBinaryOperator.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTBinaryOperator.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTObjectArray.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTObjectArray.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTAssignment.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTAssignment.html#init-org.apache.velocity.context.InternalContextAdapter-java.lang.Object-">init</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;data)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>abstract <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTMathNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTMathNode.html#perform-java.lang.Number-java.lang.Number-org.apache.velocity.context.InternalContextAdapter-">perform</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;left,
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a></code></td>
+<td class="colLast"><span class="typeNameLabel">ASTSubtractNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTSubtractNode.html#perform-java.lang.Number-java.lang.Number-org.apache.velocity.context.InternalContextAdapter-">perform</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;left,
        <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;right,
-       <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
-<div class="block">Performs the math operation represented by this node.</div>
-</td>
+       <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTModNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTModNode.html#perform-java.lang.Number-java.lang.Number-org.apache.velocity.context.InternalContextAdapter-">perform</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;left,
+<td class="colLast"><span class="typeNameLabel">ASTMulNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTMulNode.html#perform-java.lang.Number-java.lang.Number-org.apache.velocity.context.InternalContextAdapter-">perform</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;left,
        <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;right,
        <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTMulNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTMulNode.html#perform-java.lang.Number-java.lang.Number-org.apache.velocity.context.InternalContextAdapter-">perform</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;left,
+<td class="colLast"><span class="typeNameLabel">ASTModNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTModNode.html#perform-java.lang.Number-java.lang.Number-org.apache.velocity.context.InternalContextAdapter-">perform</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;left,
        <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;right,
        <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTSubtractNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTSubtractNode.html#perform-java.lang.Number-java.lang.Number-org.apache.velocity.context.InternalContextAdapter-">perform</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;left,
+<td class="colFirst"><code>abstract <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a></code></td>
+<td class="colLast"><span class="typeNameLabel">ASTMathNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTMathNode.html#perform-java.lang.Number-java.lang.Number-org.apache.velocity.context.InternalContextAdapter-">perform</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;left,
        <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;right,
-       <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+       <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
+<div class="block">Performs the math operation represented by this node.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTAddNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTAddNode.html#perform-java.lang.Number-java.lang.Number-org.apache.velocity.context.InternalContextAdapter-">perform</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;left,
+<td class="colLast"><span class="typeNameLabel">ASTDivNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTDivNode.html#perform-java.lang.Number-java.lang.Number-org.apache.velocity.context.InternalContextAdapter-">perform</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;left,
        <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;right,
        <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTDivNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTDivNode.html#perform-java.lang.Number-java.lang.Number-org.apache.velocity.context.InternalContextAdapter-">perform</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;left,
+<td class="colLast"><span class="typeNameLabel">ASTAddNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTAddNode.html#perform-java.lang.Number-java.lang.Number-org.apache.velocity.context.InternalContextAdapter-">perform</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;left,
        <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;right,
        <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
@@ -1080,22 +1080,12 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTIfStatement.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIfStatement.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
-      <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTBlock.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTBlock.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
-      <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><span class="typeNameLabel">SimpleNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/SimpleNode.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTEscapedDirective.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTEscapedDirective.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">Node.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
@@ -1105,7 +1095,7 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTComment.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTComment.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTText.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTText.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
@@ -1117,25 +1107,25 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTEscape.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTEscape.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
-      <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><span class="typeNameLabel">ASTReference.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTReference.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>
 <div class="block">gets the value of the reference and outputs it to the
   writer.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">ASTIfStatement.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIfStatement.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+      <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Node.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTEscapedDirective.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTEscapedDirective.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTDirective.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTDirective.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTEscape.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTEscape.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
@@ -1145,7 +1135,17 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTText.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTText.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTDirective.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTDirective.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+      <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">ASTComment.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTComment.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+      <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">ASTBlock.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTBlock.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
@@ -1158,55 +1158,55 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTMathNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTMathNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
-<div class="block">gets the two args and performs the operation on them</div>
-</td>
+<td class="colLast"><span class="typeNameLabel">SimpleNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/SimpleNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTTrue.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTTrue.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">Node.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTComparisonNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTComparisonNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTTrue.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTTrue.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTNotNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTNotNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTStringLiteral.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTStringLiteral.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
+<div class="block">renders the value of the string literal If the properties allow, and the
+ string literal contains a $ or a # the literal is rendered against the
+ context Otherwise, the stringlit is returned.</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTOrNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTOrNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
-<div class="block">Returns the value of the expression.</div>
-</td>
+<td class="colLast"><span class="typeNameLabel">ASTReference.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTReference.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTMap.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTMap.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTOrNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTOrNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
+<div class="block">Returns the value of the expression.</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">SimpleNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/SimpleNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTObjectArray.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTObjectArray.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTStringLiteral.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTStringLiteral.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
-<div class="block">renders the value of the string literal If the properties allow, and the
- string literal contains a $ or a # the literal is rendered against the
- context Otherwise, the stringlit is returned.</div>
-</td>
+<td class="colLast"><span class="typeNameLabel">ASTNotNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTNotNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTReference.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTReference.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTNegateNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTNegateNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">Node.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTMathNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTMathNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
+<div class="block">gets the two args and performs the operation on them</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTIntegerLiteral.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTMap.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTMap.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
@@ -1216,29 +1216,29 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTFloatingPointLiteral.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTIntegerLiteral.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTFalse.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTFalse.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTFloatingPointLiteral.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTAndNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTAndNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
-<div class="block">Returns the value of the expression.</div>
-</td>
+<td class="colLast"><span class="typeNameLabel">ASTFalse.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTFalse.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTNegateNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTNegateNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTExpression.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTExpression.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTExpression.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTExpression.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTComparisonNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTComparisonNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTObjectArray.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTObjectArray.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTAndNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTAndNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
+<div class="block">Returns the value of the expression.</div>
+</td>
 </tr>
 </tbody>
 </table>
@@ -1291,7 +1291,7 @@
 <td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/util/introspection/VelMethod.html" title="interface in org.apache.velocity.util.introspection">VelMethod</a></code></td>
 <td class="colLast"><span class="typeNameLabel">ClassUtils.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/util/ClassUtils.html#getMethod-java.lang.String-java.lang.Object:A-java.lang.Class:A-java.lang.Object-org.apache.velocity.context.InternalContextAdapter-org.apache.velocity.runtime.parser.node.SimpleNode-boolean-">getMethod</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or inter [...]
          <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>[]&nbsp;params,
-         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>[]&nbsp;paramClasses,
+         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;[]&nbsp;paramClasses,
          <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
          <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
          <a href="../../../../../org/apache/velocity/runtime/parser/node/SimpleNode.html" title="class in org.apache.velocity.runtime.parser.node">SimpleNode</a>&nbsp;node,
@@ -1354,6 +1354,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/context/class-use/InternalContextAdapterImpl.html b/engine/devel/apidocs/org/apache/velocity/context/class-use/InternalContextAdapterImpl.html
index 80a6b33..ad46b4d 100644
--- a/engine/devel/apidocs/org/apache/velocity/context/class-use/InternalContextAdapterImpl.html
+++ b/engine/devel/apidocs/org/apache/velocity/context/class-use/InternalContextAdapterImpl.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.context.InternalContextAdapterImpl (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.context.InternalContextAdapterImpl (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.context.InternalContextAdapterImpl (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.context.InternalContextAdapterImpl (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,6 +121,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/context/class-use/InternalEventContext.html b/engine/devel/apidocs/org/apache/velocity/context/class-use/InternalEventContext.html
index 9cd24d0..5a9cb2e 100644
--- a/engine/devel/apidocs/org/apache/velocity/context/class-use/InternalEventContext.html
+++ b/engine/devel/apidocs/org/apache/velocity/context/class-use/InternalEventContext.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface org.apache.velocity.context.InternalEventContext (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Interface org.apache.velocity.context.InternalEventContext (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface org.apache.velocity.context.InternalEventContext (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Interface org.apache.velocity.context.InternalEventContext (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -262,6 +262,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/context/class-use/InternalWrapperContext.html b/engine/devel/apidocs/org/apache/velocity/context/class-use/InternalWrapperContext.html
index 116d061..f447629 100644
--- a/engine/devel/apidocs/org/apache/velocity/context/class-use/InternalWrapperContext.html
+++ b/engine/devel/apidocs/org/apache/velocity/context/class-use/InternalWrapperContext.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface org.apache.velocity.context.InternalWrapperContext (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Interface org.apache.velocity.context.InternalWrapperContext (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface org.apache.velocity.context.InternalWrapperContext (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Interface org.apache.velocity.context.InternalWrapperContext (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -187,6 +187,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/context/package-frame.html b/engine/devel/apidocs/org/apache/velocity/context/package-frame.html
index 35ab9c6..eb6603c 100644
--- a/engine/devel/apidocs/org/apache/velocity/context/package-frame.html
+++ b/engine/devel/apidocs/org/apache/velocity/context/package-frame.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.velocity.context (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>org.apache.velocity.context (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
diff --git a/engine/devel/apidocs/org/apache/velocity/context/package-summary.html b/engine/devel/apidocs/org/apache/velocity/context/package-summary.html
index 79458ca..cd14072 100644
--- a/engine/devel/apidocs/org/apache/velocity/context/package-summary.html
+++ b/engine/devel/apidocs/org/apache/velocity/context/package-summary.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.velocity.context (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>org.apache.velocity.context (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.velocity.context (Apache Velocity 2.2 API)";
+            parent.document.title="org.apache.velocity.context (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -192,6 +192,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/context/package-tree.html b/engine/devel/apidocs/org/apache/velocity/context/package-tree.html
index c70bb85..e0e4361 100644
--- a/engine/devel/apidocs/org/apache/velocity/context/package-tree.html
+++ b/engine/devel/apidocs/org/apache/velocity/context/package-tree.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.velocity.context Class Hierarchy (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>org.apache.velocity.context Class Hierarchy (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.velocity.context Class Hierarchy (Apache Velocity 2.2 API)";
+            parent.document.title="org.apache.velocity.context Class Hierarchy (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -159,6 +159,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/context/package-use.html b/engine/devel/apidocs/org/apache/velocity/context/package-use.html
index a3b8c61..df2c704 100644
--- a/engine/devel/apidocs/org/apache/velocity/context/package-use.html
+++ b/engine/devel/apidocs/org/apache/velocity/context/package-use.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Package org.apache.velocity.context (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Package org.apache.velocity.context (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package org.apache.velocity.context (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Package org.apache.velocity.context (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -439,6 +439,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/example/DBContext.html b/engine/devel/apidocs/org/apache/velocity/example/DBContext.html
index 2cf7fb6..78ce8ec 100644
--- a/engine/devel/apidocs/org/apache/velocity/example/DBContext.html
+++ b/engine/devel/apidocs/org/apache/velocity/example/DBContext.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DBContext (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>DBContext (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DBContext (Apache Velocity 2.2 API)";
+            parent.document.title="DBContext (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -135,7 +135,7 @@ extends <a href="../../../../org/apache/velocity/context/AbstractContext.html" t
   very fragile, crappy code.... just a demo!</div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: DBContext.java 1871468 2019-12-14 12:20:11Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a></dd>
 </dl>
@@ -211,7 +211,7 @@ extends <a href="../../../../org/apache/velocity/context/AbstractContext.html" t
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/example/DBContext.html#getEventCartridge--">getEventCartridge</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i6" class="altColor">
-<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a></code></td>
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/example/DBContext.html#getMacroLibraries--">getMacroLibraries</a></span>()</code>
 <div class="block">Get the macro library list for the current template.</div>
 </td>
@@ -306,7 +306,7 @@ extends <a href="../../../../org/apache/velocity/context/AbstractContext.html" t
 </tr>
 <tr id="i21" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/example/DBContext.html#setMacroLibraries-java.util.List-">setMacroLibraries</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;macroLibraries)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/example/DBContext.html#setMacroLibraries-java.util.List-">setMacroLibraries</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;&nbsp;macroLibraries)</code>
 <div class="block">Set the macro library list for the current template.</div>
 </td>
 </tr>
@@ -654,7 +654,7 @@ extends <a href="../../../../org/apache/velocity/context/AbstractContext.html" t
 <ul class="blockList">
 <li class="blockList">
 <h4>setMacroLibraries</h4>
-<pre>public&nbsp;void&nbsp;setMacroLibraries(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;macroLibraries)</pre>
+<pre>public&nbsp;void&nbsp;setMacroLibraries(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;&nbsp;macroLibraries)</pre>
 <div class="block">Set the macro library list for the current template.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -670,7 +670,7 @@ extends <a href="../../../../org/apache/velocity/context/AbstractContext.html" t
 <ul class="blockList">
 <li class="blockList">
 <h4>getMacroLibraries</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;getMacroLibraries()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;&nbsp;getMacroLibraries()</pre>
 <div class="block">Get the macro library list for the current template.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -783,6 +783,6 @@ extends <a href="../../../../org/apache/velocity/context/AbstractContext.html" t
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/example/DBContextTest.html b/engine/devel/apidocs/org/apache/velocity/example/DBContextTest.html
index c44b459..9c26894 100644
--- a/engine/devel/apidocs/org/apache/velocity/example/DBContextTest.html
+++ b/engine/devel/apidocs/org/apache/velocity/example/DBContextTest.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DBContextTest (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>DBContextTest (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DBContextTest (Apache Velocity 2.2 API)";
+            parent.document.title="DBContextTest (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -118,7 +118,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
   into the context and then rendering a simple template with it.</div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: DBContextTest.java 1780314 2017-01-26 02:28:46Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a></dd>
 </dl>
@@ -278,6 +278,6 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/example/EventExample.html b/engine/devel/apidocs/org/apache/velocity/example/EventExample.html
index 64299d7..071b20b 100644
--- a/engine/devel/apidocs/org/apache/velocity/example/EventExample.html
+++ b/engine/devel/apidocs/org/apache/velocity/example/EventExample.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>EventExample (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>EventExample (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="EventExample (Apache Velocity 2.2 API)";
+            parent.document.title="EventExample (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -128,7 +128,7 @@ implements <a href="../../../../org/apache/velocity/app/event/ReferenceInsertion
    when testing the InvalidReferenceEventHandler.</div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: EventExample.java 1871468 2019-12-14 12:20:11Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a></dd>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -1319,6 +1319,6 @@ implements <a href="../../../../org/apache/velocity/app/event/ReferenceInsertion
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/example/Example.html b/engine/devel/apidocs/org/apache/velocity/example/Example.html
index 2f9b82b..d90c2cb 100644
--- a/engine/devel/apidocs/org/apache/velocity/example/Example.html
+++ b/engine/devel/apidocs/org/apache/velocity/example/Example.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Example (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Example (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Example (Apache Velocity 2.2 API)";
+            parent.document.title="Example (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -116,7 +116,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
  can be used in a standalone application.</div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: Example.java 1780734 2017-01-28 19:21:08Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>, <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a></dd>
 </dl>
@@ -289,6 +289,6 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/example/Example2.html b/engine/devel/apidocs/org/apache/velocity/example/Example2.html
index 367263f..2f8cde6 100644
--- a/engine/devel/apidocs/org/apache/velocity/example/Example2.html
+++ b/engine/devel/apidocs/org/apache/velocity/example/Example2.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Example2 (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Example2 (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Example2 (Apache Velocity 2.2 API)";
+            parent.document.title="Example2 (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -119,7 +119,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
  class, mergeTemplate() and evaluate().</div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: Example2.java 1871468 2019-12-14 12:20:11Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a></dd>
 </dl>
@@ -279,6 +279,6 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/example/TreeMapContext.html b/engine/devel/apidocs/org/apache/velocity/example/TreeMapContext.html
index dfd02fd..b603170 100644
--- a/engine/devel/apidocs/org/apache/velocity/example/TreeMapContext.html
+++ b/engine/devel/apidocs/org/apache/velocity/example/TreeMapContext.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>TreeMapContext (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>TreeMapContext (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="TreeMapContext (Apache Velocity 2.2 API)";
+            parent.document.title="TreeMapContext (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -128,7 +128,7 @@ extends <a href="../../../../org/apache/velocity/context/AbstractContext.html" t
    This is unsupported, example code.</div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: TreeMapContext.java 1780314 2017-01-26 02:28:46Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a></dd>
 </dl>
@@ -204,7 +204,7 @@ extends <a href="../../../../org/apache/velocity/context/AbstractContext.html" t
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/example/TreeMapContext.html#getEventCartridge--">getEventCartridge</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i6" class="altColor">
-<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a></code></td>
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/example/TreeMapContext.html#getMacroLibraries--">getMacroLibraries</a></span>()</code>
 <div class="block">Get the macro library list for the current template.</div>
 </td>
@@ -298,7 +298,7 @@ extends <a href="../../../../org/apache/velocity/context/AbstractContext.html" t
 </tr>
 <tr id="i21" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/example/TreeMapContext.html#setMacroLibraries-java.util.List-">setMacroLibraries</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;macroLibraries)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/velocity/example/TreeMapContext.html#setMacroLibraries-java.util.List-">setMacroLibraries</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;&nbsp;macroLibraries)</code>
 <div class="block">Set the macro library list for the current template.</div>
 </td>
 </tr>
@@ -658,7 +658,7 @@ extends <a href="../../../../org/apache/velocity/context/AbstractContext.html" t
 <ul class="blockList">
 <li class="blockList">
 <h4>setMacroLibraries</h4>
-<pre>public&nbsp;void&nbsp;setMacroLibraries(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;macroLibraries)</pre>
+<pre>public&nbsp;void&nbsp;setMacroLibraries(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;&nbsp;macroLibraries)</pre>
 <div class="block">Set the macro library list for the current template.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -674,7 +674,7 @@ extends <a href="../../../../org/apache/velocity/context/AbstractContext.html" t
 <ul class="blockList">
 <li class="blockList">
 <h4>getMacroLibraries</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;getMacroLibraries()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a>&gt;&nbsp;getMacroLibraries()</pre>
 <div class="block">Get the macro library list for the current template.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -787,6 +787,6 @@ extends <a href="../../../../org/apache/velocity/context/AbstractContext.html" t
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/example/XMLTest.html b/engine/devel/apidocs/org/apache/velocity/example/XMLTest.html
index 2b383f9..5d2bbf0 100644
--- a/engine/devel/apidocs/org/apache/velocity/example/XMLTest.html
+++ b/engine/devel/apidocs/org/apache/velocity/example/XMLTest.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>XMLTest (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>XMLTest (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="XMLTest (Apache Velocity 2.2 API)";
+            parent.document.title="XMLTest (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -115,7 +115,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <div class="block">Example to show basic XML handling in a template.</div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: XMLTest.java 1780314 2017-01-26 02:28:46Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a></dd>
 </dl>
@@ -275,6 +275,6 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/example/class-use/DBContext.html b/engine/devel/apidocs/org/apache/velocity/example/class-use/DBContext.html
index 9014acd..ef3e66c 100644
--- a/engine/devel/apidocs/org/apache/velocity/example/class-use/DBContext.html
+++ b/engine/devel/apidocs/org/apache/velocity/example/class-use/DBContext.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.example.DBContext (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.example.DBContext (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.example.DBContext (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.example.DBContext (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,6 +121,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/example/class-use/DBContextTest.html b/engine/devel/apidocs/org/apache/velocity/example/class-use/DBContextTest.html
index a2667da..c18b02f 100644
--- a/engine/devel/apidocs/org/apache/velocity/example/class-use/DBContextTest.html
+++ b/engine/devel/apidocs/org/apache/velocity/example/class-use/DBContextTest.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.example.DBContextTest (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.example.DBContextTest (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.example.DBContextTest (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.example.DBContextTest (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,6 +121,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/example/class-use/EventExample.html b/engine/devel/apidocs/org/apache/velocity/example/class-use/EventExample.html
index 2d3a3b7..b0dc14a 100644
--- a/engine/devel/apidocs/org/apache/velocity/example/class-use/EventExample.html
+++ b/engine/devel/apidocs/org/apache/velocity/example/class-use/EventExample.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.example.EventExample (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.example.EventExample (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.example.EventExample (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.example.EventExample (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,6 +121,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/example/class-use/Example.html b/engine/devel/apidocs/org/apache/velocity/example/class-use/Example.html
index b996daf..5f118ab 100644
--- a/engine/devel/apidocs/org/apache/velocity/example/class-use/Example.html
+++ b/engine/devel/apidocs/org/apache/velocity/example/class-use/Example.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.example.Example (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.example.Example (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.example.Example (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.example.Example (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,6 +121,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/example/class-use/Example2.html b/engine/devel/apidocs/org/apache/velocity/example/class-use/Example2.html
index 8b0f210..2688671 100644
--- a/engine/devel/apidocs/org/apache/velocity/example/class-use/Example2.html
+++ b/engine/devel/apidocs/org/apache/velocity/example/class-use/Example2.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.example.Example2 (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.example.Example2 (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.example.Example2 (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.example.Example2 (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,6 +121,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/example/class-use/TreeMapContext.html b/engine/devel/apidocs/org/apache/velocity/example/class-use/TreeMapContext.html
index c5964ab..44d7264 100644
--- a/engine/devel/apidocs/org/apache/velocity/example/class-use/TreeMapContext.html
+++ b/engine/devel/apidocs/org/apache/velocity/example/class-use/TreeMapContext.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.example.TreeMapContext (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.example.TreeMapContext (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.example.TreeMapContext (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.example.TreeMapContext (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,6 +121,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/example/class-use/XMLTest.html b/engine/devel/apidocs/org/apache/velocity/example/class-use/XMLTest.html
index 4c165c0..e5cc717 100644
--- a/engine/devel/apidocs/org/apache/velocity/example/class-use/XMLTest.html
+++ b/engine/devel/apidocs/org/apache/velocity/example/class-use/XMLTest.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.example.XMLTest (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.example.XMLTest (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.example.XMLTest (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.example.XMLTest (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,6 +121,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/example/package-frame.html b/engine/devel/apidocs/org/apache/velocity/example/package-frame.html
index ebcbd39..690d785 100644
--- a/engine/devel/apidocs/org/apache/velocity/example/package-frame.html
+++ b/engine/devel/apidocs/org/apache/velocity/example/package-frame.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.velocity.example (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>org.apache.velocity.example (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
diff --git a/engine/devel/apidocs/org/apache/velocity/example/package-summary.html b/engine/devel/apidocs/org/apache/velocity/example/package-summary.html
index 1244f56..924aa74 100644
--- a/engine/devel/apidocs/org/apache/velocity/example/package-summary.html
+++ b/engine/devel/apidocs/org/apache/velocity/example/package-summary.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.velocity.example (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>org.apache.velocity.example (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.velocity.example (Apache Velocity 2.2 API)";
+            parent.document.title="org.apache.velocity.example (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -193,6 +193,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/example/package-tree.html b/engine/devel/apidocs/org/apache/velocity/example/package-tree.html
index dd71f9f..fa330b5 100644
--- a/engine/devel/apidocs/org/apache/velocity/example/package-tree.html
+++ b/engine/devel/apidocs/org/apache/velocity/example/package-tree.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.velocity.example Class Hierarchy (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>org.apache.velocity.example Class Hierarchy (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.velocity.example Class Hierarchy (Apache Velocity 2.2 API)";
+            parent.document.title="org.apache.velocity.example Class Hierarchy (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -148,6 +148,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/example/package-use.html b/engine/devel/apidocs/org/apache/velocity/example/package-use.html
index b119f1c..0690e7f 100644
--- a/engine/devel/apidocs/org/apache/velocity/example/package-use.html
+++ b/engine/devel/apidocs/org/apache/velocity/example/package-use.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Package org.apache.velocity.example (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Package org.apache.velocity.example (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package org.apache.velocity.example (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Package org.apache.velocity.example (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,6 +121,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/exception/ExtendedParseException.html b/engine/devel/apidocs/org/apache/velocity/exception/ExtendedParseException.html
index a530162..16776cc 100644
--- a/engine/devel/apidocs/org/apache/velocity/exception/ExtendedParseException.html
+++ b/engine/devel/apidocs/org/apache/velocity/exception/ExtendedParseException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ExtendedParseException (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>ExtendedParseException (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ExtendedParseException (Apache Velocity 2.2 API)";
+            parent.document.title="ExtendedParseException (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -115,7 +115,7 @@ var activeTableTab = "activeTableTab";
 <dt><span class="simpleTagLabel">Since:</span></dt>
 <dd>1.5</dd>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: ExtendedParseException.java 1780307 2017-01-26 01:57:00Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="hps@intermeta.de">Henning P. Schmiedehausen</a></dd>
 </dl>
@@ -281,6 +281,6 @@ var activeTableTab = "activeTableTab";
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/exception/MacroOverflowException.html b/engine/devel/apidocs/org/apache/velocity/exception/MacroOverflowException.html
index 68f5e30..91392d4 100644
--- a/engine/devel/apidocs/org/apache/velocity/exception/MacroOverflowException.html
+++ b/engine/devel/apidocs/org/apache/velocity/exception/MacroOverflowException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>MacroOverflowException (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>MacroOverflowException (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="MacroOverflowException (Apache Velocity 2.2 API)";
+            parent.document.title="MacroOverflowException (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -365,6 +365,6 @@ extends <a href="../../../../org/apache/velocity/exception/VelocityException.htm
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/exception/MathException.html b/engine/devel/apidocs/org/apache/velocity/exception/MathException.html
index da559fd..6f5b5cc 100644
--- a/engine/devel/apidocs/org/apache/velocity/exception/MathException.html
+++ b/engine/devel/apidocs/org/apache/velocity/exception/MathException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>MathException (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>MathException (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="MathException (Apache Velocity 2.2 API)";
+            parent.document.title="MathException (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -308,6 +308,6 @@ extends <a href="../../../../org/apache/velocity/exception/VelocityException.htm
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/exception/MethodInvocationException.html b/engine/devel/apidocs/org/apache/velocity/exception/MethodInvocationException.html
index b2309be..af4e95a 100644
--- a/engine/devel/apidocs/org/apache/velocity/exception/MethodInvocationException.html
+++ b/engine/devel/apidocs/org/apache/velocity/exception/MethodInvocationException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>MethodInvocationException (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>MethodInvocationException (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="MethodInvocationException (Apache Velocity 2.2 API)";
+            parent.document.title="MethodInvocationException (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -145,7 +145,7 @@ implements <a href="../../../../org/apache/velocity/exception/ExtendedParseExcep
   information, consult the runtime log.</div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: MethodInvocationException.java 1866609 2019-09-08 10:42:47Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a></dd>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -537,6 +537,6 @@ implements <a href="../../../../org/apache/velocity/exception/ExtendedParseExcep
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/exception/ParseErrorException.html b/engine/devel/apidocs/org/apache/velocity/exception/ParseErrorException.html
index b41d96b..30d97a6 100644
--- a/engine/devel/apidocs/org/apache/velocity/exception/ParseErrorException.html
+++ b/engine/devel/apidocs/org/apache/velocity/exception/ParseErrorException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ParseErrorException (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>ParseErrorException (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ParseErrorException (Apache Velocity 2.2 API)";
+            parent.document.title="ParseErrorException (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -144,7 +144,7 @@ extends <a href="../../../../org/apache/velocity/exception/VelocityException.htm
   information, consult the runtime log.</div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: ParseErrorException.java 1866609 2019-09-08 10:42:47Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>, <a href="hps@intermeta.de">Henning P. Schmiedehausen</a></dd>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -553,6 +553,6 @@ extends <a href="../../../../org/apache/velocity/exception/VelocityException.htm
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/exception/ResourceNotFoundException.html b/engine/devel/apidocs/org/apache/velocity/exception/ResourceNotFoundException.html
index 961292b..1801bbe 100644
--- a/engine/devel/apidocs/org/apache/velocity/exception/ResourceNotFoundException.html
+++ b/engine/devel/apidocs/org/apache/velocity/exception/ResourceNotFoundException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ResourceNotFoundException (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>ResourceNotFoundException (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ResourceNotFoundException (Apache Velocity 2.2 API)";
+            parent.document.title="ResourceNotFoundException (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -138,7 +138,7 @@ extends <a href="../../../../org/apache/velocity/exception/VelocityException.htm
   information, consult the runtime log.</div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: ResourceNotFoundException.java 1866609 2019-09-08 10:42:47Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>, <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a></dd>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -384,6 +384,6 @@ extends <a href="../../../../org/apache/velocity/exception/VelocityException.htm
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/exception/TemplateInitException.html b/engine/devel/apidocs/org/apache/velocity/exception/TemplateInitException.html
index 9112406..0dae668 100644
--- a/engine/devel/apidocs/org/apache/velocity/exception/TemplateInitException.html
+++ b/engine/devel/apidocs/org/apache/velocity/exception/TemplateInitException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>TemplateInitException (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>TemplateInitException (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="TemplateInitException (Apache Velocity 2.2 API)";
+            parent.document.title="TemplateInitException (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -143,7 +143,7 @@ implements <a href="../../../../org/apache/velocity/exception/ExtendedParseExcep
 <dt><span class="simpleTagLabel">Since:</span></dt>
 <dd>1.5</dd>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: TemplateInitException.java 1866609 2019-09-08 10:42:47Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:wglass@forio.com">Will Glass-Husain</a></dd>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -446,6 +446,6 @@ implements <a href="../../../../org/apache/velocity/exception/ExtendedParseExcep
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/exception/VelocityException.html b/engine/devel/apidocs/org/apache/velocity/exception/VelocityException.html
index 8def9d4..7eade18 100644
--- a/engine/devel/apidocs/org/apache/velocity/exception/VelocityException.html
+++ b/engine/devel/apidocs/org/apache/velocity/exception/VelocityException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:50 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>VelocityException (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>VelocityException (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="VelocityException (Apache Velocity 2.2 API)";
+            parent.document.title="VelocityException (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -139,7 +139,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeExce
  application layer.</div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: VelocityException.java 1866609 2019-09-08 10:42:47Z cbrisson $</dd>
+<dd>$Id$</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:kdowney@amberarcher.com">Kyle F. Downey</a></dd>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -422,6 +422,6 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeExce
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/exception/class-use/ExtendedParseException.html b/engine/devel/apidocs/org/apache/velocity/exception/class-use/ExtendedParseException.html
index bf95c23..84e8b29 100644
--- a/engine/devel/apidocs/org/apache/velocity/exception/class-use/ExtendedParseException.html
+++ b/engine/devel/apidocs/org/apache/velocity/exception/class-use/ExtendedParseException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface org.apache.velocity.exception.ExtendedParseException (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Interface org.apache.velocity.exception.ExtendedParseException (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface org.apache.velocity.exception.ExtendedParseException (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Interface org.apache.velocity.exception.ExtendedParseException (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -222,6 +222,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/exception/class-use/MacroOverflowException.html b/engine/devel/apidocs/org/apache/velocity/exception/class-use/MacroOverflowException.html
index ccd09ac..6211f61 100644
--- a/engine/devel/apidocs/org/apache/velocity/exception/class-use/MacroOverflowException.html
+++ b/engine/devel/apidocs/org/apache/velocity/exception/class-use/MacroOverflowException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.exception.MacroOverflowException (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.exception.MacroOverflowException (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.exception.MacroOverflowException (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.exception.MacroOverflowException (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,6 +121,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/exception/class-use/MathException.html b/engine/devel/apidocs/org/apache/velocity/exception/class-use/MathException.html
index b44723b..14afbb9 100644
--- a/engine/devel/apidocs/org/apache/velocity/exception/class-use/MathException.html
+++ b/engine/devel/apidocs/org/apache/velocity/exception/class-use/MathException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.exception.MathException (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.exception.MathException (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.exception.MathException (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.exception.MathException (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -121,6 +121,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/exception/class-use/MethodInvocationException.html b/engine/devel/apidocs/org/apache/velocity/exception/class-use/MethodInvocationException.html
index e206816..2e4e896 100644
--- a/engine/devel/apidocs/org/apache/velocity/exception/class-use/MethodInvocationException.html
+++ b/engine/devel/apidocs/org/apache/velocity/exception/class-use/MethodInvocationException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.exception.MethodInvocationException (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.exception.MethodInvocationException (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.exception.MethodInvocationException (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.exception.MethodInvocationException (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -131,7 +131,7 @@
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">Template.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/Template.html#merge-org.apache.velocity.context.Context-java.io.Writer-java.util.List-">merge</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
      <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
-     <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;macroLibraries)</code>
+     <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;macroLibraries)</code>
 <div class="block">The AST node structure is merged with the
  context to produce the final output.</div>
 </td>
@@ -151,8 +151,8 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.io.Reader-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.io.Reader-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;logTag,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader)</code>
@@ -160,8 +160,8 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.io.Reader-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.io.Reader-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;logTag,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader)</code>
@@ -169,8 +169,8 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.lang.String-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.lang.String-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;logTag,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;instring)</code>
@@ -178,8 +178,8 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.lang.String-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.lang.String-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;logTag,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;instring)</code>
@@ -187,21 +187,21 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#mergeTemplate-java.lang.String-java.lang.String-org.apache.velocity.context.Context-java.io.Writer-">mergeTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;templateName,
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#mergeTemplate-java.lang.String-java.lang.String-org.apache.velocity.context.Context-java.io.Writer-">mergeTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;templateName,
              <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding,
              <a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
              <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>
-<div class="block">Merges a template and puts the rendered stream into the writer</div>
+<div class="block">merges a template and puts the rendered stream into the writer</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#mergeTemplate-java.lang.String-java.lang.String-org.apache.velocity.context.Context-java.io.Writer-">mergeTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;templateName,
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#mergeTemplate-java.lang.String-java.lang.String-org.apache.velocity.context.Context-java.io.Writer-">mergeTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;templateName,
              <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding,
              <a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
              <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>
-<div class="block">merges a template and puts the rendered stream into the writer</div>
+<div class="block">Merges a template and puts the rendered stream into the writer</div>
 </td>
 </tr>
 </tbody>
@@ -238,11 +238,11 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>abstract boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Directive.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Directive.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeMacro.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/RuntimeMacro.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
       <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>
-<div class="block">How this directive is to be rendered</div>
+<div class="block">Velocimacro implementation is not known at the init time.</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -273,11 +273,11 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeMacro.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/RuntimeMacro.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colFirst"><code>abstract boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">Directive.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Directive.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
       <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>
-<div class="block">Velocimacro implementation is not known at the init time.</div>
+<div class="block">How this directive is to be rendered</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -305,15 +305,19 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTComparisonNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTComparisonNode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">SimpleNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/SimpleNode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTNENode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTNENode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code></td>
+<td class="colLast"><span class="typeNameLabel">Node.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTNotNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTNotNode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTReference.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTReference.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
+<div class="block">Computes boolean value of this reference
+   Returns the actual value of reference return type
+   boolean, and 'true' if value is not null</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
@@ -323,40 +327,36 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">SimpleNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/SimpleNode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTNotNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTNotNode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTReference.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTReference.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
-<div class="block">Computes boolean value of this reference
-   Returns the actual value of reference return type
-   boolean, and 'true' if value is not null</div>
-</td>
+<td class="colLast"><span class="typeNameLabel">ASTNegateNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTNegateNode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Node.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTNENode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTNENode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTElseIfStatement.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTElseIfStatement.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
-<div class="block">An ASTElseStatement is true if the expression
- it contains evaluates to true.</div>
-</td>
+<td class="colLast"><span class="typeNameLabel">ASTExpression.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTExpression.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTAndNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTAndNode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
-<div class="block">logical and :</div>
+<td class="colLast"><span class="typeNameLabel">ASTElseIfStatement.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTElseIfStatement.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
+<div class="block">An ASTElseStatement is true if the expression
+ it contains evaluates to true.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTNegateNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTNegateNode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTComparisonNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTComparisonNode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTExpression.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTExpression.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTAndNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTAndNode.html#evaluate-org.apache.velocity.context.InternalContextAdapter-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
+<div class="block">logical and :</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
@@ -365,7 +365,7 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTIdentifier.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIdentifier.html#execute-java.lang.Object-org.apache.velocity.context.InternalContextAdapter-">execute</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
+<td class="colLast"><span class="typeNameLabel">Node.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html#execute-java.lang.Object-org.apache.velocity.context.InternalContextAdapter-">execute</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
        <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
@@ -377,30 +377,20 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">Node.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html#execute-java.lang.Object-org.apache.velocity.context.InternalContextAdapter-">execute</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
-       <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
 <td class="colLast"><span class="typeNameLabel">ASTMethod.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTMethod.html#execute-java.lang.Object-org.apache.velocity.context.InternalContextAdapter-">execute</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
        <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
 <div class="block">invokes the method.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
 <td class="colLast"><span class="typeNameLabel">ASTIndex.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIndex.html#execute-java.lang.Object-org.apache.velocity.context.InternalContextAdapter-">execute</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
        <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTIfStatement.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIfStatement.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
-      <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
-</tr>
 <tr class="altColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTBlock.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTBlock.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
-      <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colLast"><span class="typeNameLabel">ASTIdentifier.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIdentifier.html#execute-java.lang.Object-org.apache.velocity.context.InternalContextAdapter-">execute</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
+       <a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
@@ -409,7 +399,7 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTComment.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTComment.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">Node.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
@@ -429,17 +419,27 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Node.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTIfStatement.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIfStatement.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">ASTElseIfStatement.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTElseIfStatement.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+      <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><span class="typeNameLabel">ASTDirective.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTDirective.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">ASTComment.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTComment.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+      <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTElseIfStatement.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTElseIfStatement.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTBlock.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTBlock.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
@@ -452,17 +452,15 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTMathNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTMathNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
-<div class="block">gets the two args and performs the operation on them</div>
-</td>
+<td class="colLast"><span class="typeNameLabel">SimpleNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/SimpleNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTComparisonNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTComparisonNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">Node.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTNotNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTNotNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTReference.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTReference.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
@@ -472,43 +470,45 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTMap.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTMap.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTObjectArray.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTObjectArray.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">SimpleNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/SimpleNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTNotNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTNotNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTReference.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTReference.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTNegateNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTNegateNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">Node.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTMathNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTMathNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
+<div class="block">gets the two args and performs the operation on them</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTIntegerRange.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIntegerRange.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
-<div class="block">does the real work.</div>
-</td>
+<td class="colLast"><span class="typeNameLabel">ASTMap.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTMap.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTAndNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTAndNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
-<div class="block">Returns the value of the expression.</div>
+<td class="colLast"><span class="typeNameLabel">ASTIntegerRange.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIntegerRange.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
+<div class="block">does the real work.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTNegateNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTNegateNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTExpression.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTExpression.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTExpression.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTExpression.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTComparisonNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTComparisonNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ASTObjectArray.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTObjectArray.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ASTAndNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTAndNode.html#value-org.apache.velocity.context.InternalContextAdapter-">value</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context)</code>
+<div class="block">Returns the value of the expression.</div>
+</td>
 </tr>
 </tbody>
 </table>
@@ -564,6 +564,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/exception/class-use/ParseErrorException.html b/engine/devel/apidocs/org/apache/velocity/exception/class-use/ParseErrorException.html
index 9f6d0c5..5e99cdf 100644
--- a/engine/devel/apidocs/org/apache/velocity/exception/class-use/ParseErrorException.html
+++ b/engine/devel/apidocs/org/apache/velocity/exception/class-use/ParseErrorException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.exception.ParseErrorException (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.exception.ParseErrorException (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.exception.ParseErrorException (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.exception.ParseErrorException (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -135,7 +135,7 @@
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">Template.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/Template.html#merge-org.apache.velocity.context.Context-java.io.Writer-java.util.List-">merge</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
      <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
-     <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;macroLibraries)</code>
+     <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;macroLibraries)</code>
 <div class="block">The AST node structure is merged with the
  context to produce the final output.</div>
 </td>
@@ -161,8 +161,8 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.io.Reader-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.io.Reader-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;logTag,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader)</code>
@@ -170,8 +170,8 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.io.Reader-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.io.Reader-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;logTag,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader)</code>
@@ -179,8 +179,8 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.lang.String-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.lang.String-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;logTag,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;instring)</code>
@@ -188,8 +188,8 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.lang.String-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.lang.String-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;logTag,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;instring)</code>
@@ -197,51 +197,51 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
-<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#getTemplate-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<td class="colFirst"><code><a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#getTemplate-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
 <div class="block">Returns a <code>Template</code> from the Velocity
   resource management system.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
-<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#getTemplate-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#getTemplate-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
 <div class="block">Returns a <code>Template</code> from the Velocity
   resource management system.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
-<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<td class="colFirst"><code><a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)</code>
 <div class="block">Returns a <code>Template</code> from the Velocity
   resource management system.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
-<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)</code>
 <div class="block">Returns a <code>Template</code> from the Velocity
   resource management system.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#mergeTemplate-java.lang.String-java.lang.String-org.apache.velocity.context.Context-java.io.Writer-">mergeTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;templateName,
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#mergeTemplate-java.lang.String-java.lang.String-org.apache.velocity.context.Context-java.io.Writer-">mergeTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;templateName,
              <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding,
              <a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
              <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>
-<div class="block">Merges a template and puts the rendered stream into the writer</div>
+<div class="block">merges a template and puts the rendered stream into the writer</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#mergeTemplate-java.lang.String-java.lang.String-org.apache.velocity.context.Context-java.io.Writer-">mergeTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;templateName,
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#mergeTemplate-java.lang.String-java.lang.String-org.apache.velocity.context.Context-java.io.Writer-">mergeTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;templateName,
              <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding,
              <a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
              <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>
-<div class="block">merges a template and puts the rendered stream into the writer</div>
+<div class="block">Merges a template and puts the rendered stream into the writer</div>
 </td>
 </tr>
 </tbody>
@@ -259,8 +259,8 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/velocity/runtime/resource/ContentResource.html" title="class in org.apache.velocity.runtime.resource">ContentResource</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeInstance.html#getContent-java.lang.String-">getContent</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/runtime/resource/ContentResource.html" title="class in org.apache.velocity.runtime.resource">ContentResource</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeSingleton.html#getContent-java.lang.String-">getContent</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
 <div class="block">Returns a static content resource from the
  resource manager.</div>
 </td>
@@ -273,15 +273,15 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/runtime/resource/ContentResource.html" title="class in org.apache.velocity.runtime.resource">ContentResource</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeSingleton.html#getContent-java.lang.String-">getContent</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<td class="colFirst"><code><a href="../../../../../org/apache/velocity/runtime/resource/ContentResource.html" title="class in org.apache.velocity.runtime.resource">ContentResource</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeInstance.html#getContent-java.lang.String-">getContent</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
 <div class="block">Returns a static content resource from the
  resource manager.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/velocity/runtime/resource/ContentResource.html" title="class in org.apache.velocity.runtime.resource">ContentResource</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeInstance.html#getContent-java.lang.String-java.lang.String-">getContent</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/runtime/resource/ContentResource.html" title="class in org.apache.velocity.runtime.resource">ContentResource</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeSingleton.html#getContent-java.lang.String-java.lang.String-">getContent</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
           <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)</code>
 <div class="block">Returns a static content resource from the
  resource manager.</div>
@@ -296,16 +296,16 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/runtime/resource/ContentResource.html" title="class in org.apache.velocity.runtime.resource">ContentResource</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeSingleton.html#getContent-java.lang.String-java.lang.String-">getContent</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<td class="colFirst"><code><a href="../../../../../org/apache/velocity/runtime/resource/ContentResource.html" title="class in org.apache.velocity.runtime.resource">ContentResource</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeInstance.html#getContent-java.lang.String-java.lang.String-">getContent</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
           <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)</code>
 <div class="block">Returns a static content resource from the
  resource manager.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeInstance.html#getTemplate-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeSingleton.html#getTemplate-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
 <div class="block">Returns a <code>Template</code> from the resource manager.</div>
 </td>
 </tr>
@@ -316,14 +316,14 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeSingleton.html#getTemplate-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<td class="colFirst"><code><a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeInstance.html#getTemplate-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
 <div class="block">Returns a <code>Template</code> from the resource manager.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeInstance.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeSingleton.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)</code>
 <div class="block">Returns a <code>Template</code> from the resource manager</div>
 </td>
@@ -336,8 +336,8 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeSingleton.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<td class="colFirst"><code><a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeInstance.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)</code>
 <div class="block">Returns a <code>Template</code> from the resource manager</div>
 </td>
@@ -362,11 +362,11 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>abstract boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Directive.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Directive.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeMacro.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/RuntimeMacro.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
       <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>
-<div class="block">How this directive is to be rendered</div>
+<div class="block">Velocimacro implementation is not known at the init time.</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -388,11 +388,11 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeMacro.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/RuntimeMacro.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colFirst"><code>abstract boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">Directive.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Directive.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
       <a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html" title="interface in org.apache.velocity.runtime.parser.node">Node</a>&nbsp;node)</code>
-<div class="block">Velocimacro implementation is not known at the init time.</div>
+<div class="block">How this directive is to be rendered</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -420,37 +420,37 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTIfStatement.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIfStatement.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">SimpleNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/SimpleNode.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTBlock.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTBlock.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">Node.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">SimpleNode.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/SimpleNode.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTIfStatement.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTIfStatement.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTComment.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTComment.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTElseIfStatement.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTElseIfStatement.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Node.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/Node.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTDirective.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTDirective.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTDirective.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTDirective.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTComment.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTComment.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ASTElseIfStatement.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTElseIfStatement.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colLast"><span class="typeNameLabel">ASTBlock.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/parser/node/ASTBlock.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
       <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>&nbsp;</td>
 </tr>
 </tbody>
@@ -559,6 +559,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2000&#x2013;2021 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/engine/devel/apidocs/org/apache/velocity/exception/class-use/ResourceNotFoundException.html b/engine/devel/apidocs/org/apache/velocity/exception/class-use/ResourceNotFoundException.html
index 262b666..75450d9 100644
--- a/engine/devel/apidocs/org/apache/velocity/exception/class-use/ResourceNotFoundException.html
+++ b/engine/devel/apidocs/org/apache/velocity/exception/class-use/ResourceNotFoundException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Wed Jan 29 19:07:51 CET 2020 -->
+<!-- Generated by javadoc (1.8.0_191) on Mon Mar 08 21:10:12 CET 2021 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.velocity.exception.ResourceNotFoundException (Apache Velocity 2.2 API)</title>
-<meta name="date" content="2020-01-29">
+<title>Uses of Class org.apache.velocity.exception.ResourceNotFoundException (Apache Velocity 2.4-SNAPSHOT API)</title>
+<meta name="date" content="2021-03-08">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.velocity.exception.ResourceNotFoundException (Apache Velocity 2.2 API)";
+            parent.document.title="Uses of Class org.apache.velocity.exception.ResourceNotFoundException (Apache Velocity 2.4-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -115,6 +115,10 @@
 <td class="colFirst"><a href="#org.apache.velocity.script">org.apache.velocity.script</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.apache.velocity.spring">org.apache.velocity.spring</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
 </tbody>
 </table>
 </li>
@@ -143,7 +147,7 @@
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">Template.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/Template.html#merge-org.apache.velocity.context.Context-java.io.Writer-java.util.List-">merge</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
      <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
-     <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;macroLibraries)</code>
+     <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;macroLibraries)</code>
 <div class="block">The AST node structure is merged with the
  context to produce the final output.</div>
 </td>
@@ -169,8 +173,8 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.io.Reader-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.io.Reader-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;logTag,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader)</code>
@@ -178,8 +182,8 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.io.Reader-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.io.Reader-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;logTag,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader)</code>
@@ -187,8 +191,8 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.lang.String-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.lang.String-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;logTag,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;instring)</code>
@@ -196,8 +200,8 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.lang.String-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#evaluate-org.apache.velocity.context.Context-java.io.Writer-java.lang.String-java.lang.String-">evaluate</a></span>(<a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;logTag,
         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;instring)</code>
@@ -205,51 +209,51 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
-<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#getTemplate-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<td class="colFirst"><code><a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#getTemplate-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
 <div class="block">Returns a <code>Template</code> from the Velocity
   resource management system.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
-<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#getTemplate-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#getTemplate-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
 <div class="block">Returns a <code>Template</code> from the Velocity
   resource management system.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
-<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<td class="colFirst"><code><a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)</code>
 <div class="block">Returns a <code>Template</code> from the Velocity
   resource management system.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
-<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)</code>
 <div class="block">Returns a <code>Template</code> from the Velocity
   resource management system.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#mergeTemplate-java.lang.String-java.lang.String-org.apache.velocity.context.Context-java.io.Writer-">mergeTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;templateName,
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#mergeTemplate-java.lang.String-java.lang.String-org.apache.velocity.context.Context-java.io.Writer-">mergeTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;templateName,
              <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding,
              <a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
              <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>
-<div class="block">Merges a template and puts the rendered stream into the writer</div>
+<div class="block">merges a template and puts the rendered stream into the writer</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">VelocityEngine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/VelocityEngine.html#mergeTemplate-java.lang.String-java.lang.String-org.apache.velocity.context.Context-java.io.Writer-">mergeTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;templateName,
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">Velocity.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/app/Velocity.html#mergeTemplate-java.lang.String-java.lang.String-org.apache.velocity.context.Context-java.io.Writer-">mergeTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;templateName,
              <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding,
              <a href="../../../../../org/apache/velocity/context/Context.html" title="interface in org.apache.velocity.context">Context</a>&nbsp;context,
              <a href="https://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;writer)</code>
-<div class="block">merges a template and puts the rendered stream into the writer</div>
+<div class="block">Merges a template and puts the rendered stream into the writer</div>
 </td>
 </tr>
 </tbody>
@@ -267,8 +271,8 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/velocity/runtime/resource/ContentResource.html" title="class in org.apache.velocity.runtime.resource">ContentResource</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeInstance.html#getContent-java.lang.String-">getContent</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/runtime/resource/ContentResource.html" title="class in org.apache.velocity.runtime.resource">ContentResource</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeSingleton.html#getContent-java.lang.String-">getContent</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
 <div class="block">Returns a static content resource from the
  resource manager.</div>
 </td>
@@ -281,15 +285,15 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/runtime/resource/ContentResource.html" title="class in org.apache.velocity.runtime.resource">ContentResource</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeSingleton.html#getContent-java.lang.String-">getContent</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<td class="colFirst"><code><a href="../../../../../org/apache/velocity/runtime/resource/ContentResource.html" title="class in org.apache.velocity.runtime.resource">ContentResource</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeInstance.html#getContent-java.lang.String-">getContent</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
 <div class="block">Returns a static content resource from the
  resource manager.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/velocity/runtime/resource/ContentResource.html" title="class in org.apache.velocity.runtime.resource">ContentResource</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeInstance.html#getContent-java.lang.String-java.lang.String-">getContent</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/runtime/resource/ContentResource.html" title="class in org.apache.velocity.runtime.resource">ContentResource</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeSingleton.html#getContent-java.lang.String-java.lang.String-">getContent</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
           <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)</code>
 <div class="block">Returns a static content resource from the
  resource manager.</div>
@@ -304,16 +308,16 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/runtime/resource/ContentResource.html" title="class in org.apache.velocity.runtime.resource">ContentResource</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeSingleton.html#getContent-java.lang.String-java.lang.String-">getContent</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<td class="colFirst"><code><a href="../../../../../org/apache/velocity/runtime/resource/ContentResource.html" title="class in org.apache.velocity.runtime.resource">ContentResource</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeInstance.html#getContent-java.lang.String-java.lang.String-">getContent</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
           <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)</code>
 <div class="block">Returns a static content resource from the
  resource manager.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeInstance.html#getTemplate-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeSingleton.html#getTemplate-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
 <div class="block">Returns a <code>Template</code> from the resource manager.</div>
 </td>
 </tr>
@@ -324,14 +328,14 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeSingleton.html#getTemplate-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<td class="colFirst"><code><a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeInstance.html#getTemplate-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
 <div class="block">Returns a <code>Template</code> from the resource manager.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeInstance.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeSingleton.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)</code>
 <div class="block">Returns a <code>Template</code> from the resource manager</div>
 </td>
@@ -344,8 +348,8 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>static <a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
-<td class="colLast"><span class="typeNameLabel">RuntimeSingleton.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeSingleton.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<td class="colFirst"><code><a href="../../../../../org/apache/velocity/Template.html" title="class in org.apache.velocity">Template</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RuntimeInstance.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/RuntimeInstance.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)</code>
 <div class="block">Returns a <code>Template</code> from the resource manager</div>
 </td>
@@ -370,11 +374,11 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>abstract boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">Directive.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/velocity/runtime/directive/Directive.html#render-org.apache.velocity.context.InternalContextAdapter-java.io.Writer-org.apache.velocity.runtime.parser.node.Node-">render</a></span>(<a href="../../../../../org/apache/velocity/context/InternalContextAdapter.html" title="interface in org.apache.velocity.context">InternalContextAdapter</a>&nbsp;context,
+<td class="colFirst"><code>boolean</code></td>
... 91576 lines suppressed ...