Modified: 
velocity/site/production/engine/devel/apidocs/org/apache/velocity/runtime/ParserPool.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/engine/devel/apidocs/org/apache/velocity/runtime/ParserPool.html?rev=1854949&r1=1854948&r2=1854949&view=diff
==============================================================================
--- 
velocity/site/production/engine/devel/apidocs/org/apache/velocity/runtime/ParserPool.html
 (original)
+++ 
velocity/site/production/engine/devel/apidocs/org/apache/velocity/runtime/ParserPool.html
 Wed Mar  6 21:31:05 2019
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Sun Mar 03 14:38:54 CET 2019 -->
+<!-- Generated by javadoc (1.8.0_191) on Wed Mar 06 16:10:21 CET 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ParserPool (Apache Velocity 2.1 API)</title>
-<meta name="date" content="2019-03-03">
+<title>ParserPool (Apache Velocity 2.1-SNAPSHOT API)</title>
+<meta name="date" content="2019-03-06">
 <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="ParserPool (Apache Velocity 2.1 API)";
+            parent.document.title="ParserPool (Apache Velocity 2.1-SNAPSHOT 
API)";
         }
     }
     catch(err) {
@@ -50,7 +50,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li>Prev&nbsp;Class</li>
+<li><a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html" 
title="interface in org.apache.velocity.runtime"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/velocity/runtime/ParserPoolImpl.html" 
title="class in org.apache.velocity.runtime"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -239,7 +239,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li>Prev&nbsp;Class</li>
+<li><a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html" 
title="interface in org.apache.velocity.runtime"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/velocity/runtime/ParserPoolImpl.html" 
title="class in org.apache.velocity.runtime"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">

Modified: 
velocity/site/production/engine/devel/apidocs/org/apache/velocity/runtime/ParserPoolImpl.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/engine/devel/apidocs/org/apache/velocity/runtime/ParserPoolImpl.html?rev=1854949&r1=1854948&r2=1854949&view=diff
==============================================================================
--- 
velocity/site/production/engine/devel/apidocs/org/apache/velocity/runtime/ParserPoolImpl.html
 (original)
+++ 
velocity/site/production/engine/devel/apidocs/org/apache/velocity/runtime/ParserPoolImpl.html
 Wed Mar  6 21:31:05 2019
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Sun Mar 03 14:38:54 CET 2019 -->
+<!-- Generated by javadoc (1.8.0_191) on Wed Mar 06 16:10:21 CET 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ParserPoolImpl (Apache Velocity 2.1 API)</title>
-<meta name="date" content="2019-03-03">
+<title>ParserPoolImpl (Apache Velocity 2.1-SNAPSHOT API)</title>
+<meta name="date" content="2019-03-06">
 <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="ParserPoolImpl (Apache Velocity 2.1 API)";
+            parent.document.title="ParserPoolImpl (Apache Velocity 
2.1-SNAPSHOT API)";
         }
     }
     catch(err) {

Modified: 
velocity/site/production/engine/devel/apidocs/org/apache/velocity/runtime/Renderable.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/engine/devel/apidocs/org/apache/velocity/runtime/Renderable.html?rev=1854949&r1=1854948&r2=1854949&view=diff
==============================================================================
--- 
velocity/site/production/engine/devel/apidocs/org/apache/velocity/runtime/Renderable.html
 (original)
+++ 
velocity/site/production/engine/devel/apidocs/org/apache/velocity/runtime/Renderable.html
 Wed Mar  6 21:31:05 2019
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Sun Mar 03 14:38:54 CET 2019 -->
+<!-- Generated by javadoc (1.8.0_191) on Wed Mar 06 16:10:21 CET 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Renderable (Apache Velocity 2.1 API)</title>
-<meta name="date" content="2019-03-03">
+<title>Renderable (Apache Velocity 2.1-SNAPSHOT API)</title>
+<meta name="date" content="2019-03-06">
 <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="Renderable (Apache Velocity 2.1 API)";
+            parent.document.title="Renderable (Apache Velocity 2.1-SNAPSHOT 
API)";
         }
     }
     catch(err) {

Modified: 
velocity/site/production/engine/devel/apidocs/org/apache/velocity/runtime/RuntimeConstants.SpaceGobbling.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/engine/devel/apidocs/org/apache/velocity/runtime/RuntimeConstants.SpaceGobbling.html?rev=1854949&r1=1854948&r2=1854949&view=diff
==============================================================================
--- 
velocity/site/production/engine/devel/apidocs/org/apache/velocity/runtime/RuntimeConstants.SpaceGobbling.html
 (original)
+++ 
velocity/site/production/engine/devel/apidocs/org/apache/velocity/runtime/RuntimeConstants.SpaceGobbling.html
 Wed Mar  6 21:31:05 2019
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Sun Mar 03 14:38:54 CET 2019 -->
+<!-- Generated by javadoc (1.8.0_191) on Wed Mar 06 16:10:21 CET 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>RuntimeConstants.SpaceGobbling (Apache Velocity 2.1 API)</title>
-<meta name="date" content="2019-03-03">
+<title>RuntimeConstants.SpaceGobbling (Apache Velocity 2.1-SNAPSHOT 
API)</title>
+<meta name="date" content="2019-03-06">
 <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="RuntimeConstants.SpaceGobbling (Apache 
Velocity 2.1 API)";
+            parent.document.title="RuntimeConstants.SpaceGobbling (Apache 
Velocity 2.1-SNAPSHOT API)";
         }
     }
     catch(err) {

Modified: 
velocity/site/production/engine/devel/apidocs/org/apache/velocity/runtime/RuntimeConstants.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/engine/devel/apidocs/org/apache/velocity/runtime/RuntimeConstants.html?rev=1854949&r1=1854948&r2=1854949&view=diff
==============================================================================
--- 
velocity/site/production/engine/devel/apidocs/org/apache/velocity/runtime/RuntimeConstants.html
 (original)
+++ 
velocity/site/production/engine/devel/apidocs/org/apache/velocity/runtime/RuntimeConstants.html
 Wed Mar  6 21:31:05 2019
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Sun Mar 03 14:38:54 CET 2019 -->
+<!-- Generated by javadoc (1.8.0_191) on Wed Mar 06 16:10:21 CET 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>RuntimeConstants (Apache Velocity 2.1 API)</title>
-<meta name="date" content="2019-03-03">
+<title>RuntimeConstants (Apache Velocity 2.1-SNAPSHOT API)</title>
+<meta name="date" content="2019-03-06">
 <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="RuntimeConstants (Apache Velocity 2.1 API)";
+            parent.document.title="RuntimeConstants (Apache Velocity 
2.1-SNAPSHOT API)";
         }
     }
     catch(err) {
@@ -95,17 +95,22 @@
 <ul class="blockList">
 <li class="blockList">
 <dl>
+<dt>All Superinterfaces:</dt>
+<dd><a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html" 
title="interface in 
org.apache.velocity.runtime">DeprecatedRuntimeConstants</a></dd>
+</dl>
+<dl>
 <dt>All Known Implementing Classes:</dt>
 <dd><a href="../../../../org/apache/velocity/runtime/RuntimeInstance.html" 
title="class in org.apache.velocity.runtime">RuntimeInstance</a>, <a 
href="../../../../org/apache/velocity/runtime/RuntimeSingleton.html" 
title="class in org.apache.velocity.runtime">RuntimeSingleton</a>, <a 
href="../../../../org/apache/velocity/app/Velocity.html" title="class in 
org.apache.velocity.app">Velocity</a>, <a 
href="../../../../org/apache/velocity/app/VelocityEngine.html" title="class in 
org.apache.velocity.app">VelocityEngine</a></dd>
 </dl>
 <hr>
 <br>
-<pre>public interface <span class="typeNameLabel">RuntimeConstants</span></pre>
+<pre>public interface <span class="typeNameLabel">RuntimeConstants</span>
+extends <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html" 
title="interface in 
org.apache.velocity.runtime">DeprecatedRuntimeConstants</a></pre>
 <div class="block">This class defines the keys that are used in the 
velocity.properties file so that they can be referenced as a constant within
  Java code.</div>
 <dl>
 <dt><span class="simpleTagLabel">Version:</span></dt>
-<dd>$Id: RuntimeConstants.java 1854386 2019-02-26 14:30:46Z cbrisson $</dd>
+<dd>$Id: RuntimeConstants.java 1854737 2019-03-03 17:47:32Z cbrisson $</dd>
 <dt><span class="simpleTagLabel">Author:</span></dt>
 <dd><a href="mailto:[email protected]";>Jon S. Stevens</a>, <a 
href="mailto:[email protected]";>Geir Magnusson Jr.</a>, <a 
href="mailto:[email protected]";>Jason van Zyl</a></dd>
 </dl>
@@ -162,16 +167,31 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#CONTEXT_SCOPE_CONTROL">CONTEXT_SCOPE_CONTROL</a></span></code>
+<div class="block">Used to enable or disable a scope control (false by 
default):
+ <code>context.scope_control.&lt;scope_name&gt; = true/false</code>
+ where <i>scope_name</i> is one of: <code>template, evaluate, foreach, macro, 
define</code>
+ or the name of a body macro.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#CONVERSION_HANDLER_CLASS">CONVERSION_HANDLER_CLASS</a></span></code>
 <div class="block">key for Conversion Manager class</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#CONVERSION_HANDLER_INSTANCE">CONVERSION_HANDLER_INSTANCE</a></span></code>
 <div class="block">key for Conversion Manager instance</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#CUSTOM_DIRECTIVES">CUSTOM_DIRECTIVES</a></span></code>
+<div class="block">Vector of custom directives</div>
+</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#DEFAULT_RUNTIME_DIRECTIVES">DEFAULT_RUNTIME_DIRECTIVES</a></span></code>
@@ -251,7 +271,7 @@
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#FILE_RESOURCE_LOADER_PATH">FILE_RESOURCE_LOADER_PATH</a></span></code>
-<div class="block">The public handle for setting a path in the 
FileResourceLoader.</div>
+<div class="block">The public handle for setting paths in the 
FileResourceLoader.</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -298,8 +318,8 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#PARSER_DASH_ALLOWED">PARSER_DASH_ALLOWED</a></span></code>
-<div class="block">Allow dash in identifiers (backward compatibility 
option)</div>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#PARSER_HYPHEN_ALLOWED">PARSER_HYPHEN_ALLOWED</a></span></code>
+<div class="block">Allow hyphen in identifiers (backward compatibility 
option)</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -316,21 +336,59 @@
 <tr class="rowColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#PROVIDE_SCOPE_CONTROL">PROVIDE_SCOPE_CONTROL</a></span></code>
-<div class="block">Used to suppress various scope control objects.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">use 
<code>context.scope_control.&lt;scope_name&gt; = true/false</code></span></div>
+</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#RESOURCE_LOADER">RESOURCE_LOADER</a></span></code>
-<div class="block">Key used to retrieve the names of the resource loaders to 
be used.</div>
+<div class="block">Key prefix for a specific resource loader properties</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#RESOURCE_LOADER_CACHE">RESOURCE_LOADER_CACHE</a></span></code>
+<div class="block">Resource loader cache property suffix</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#RESOURCE_LOADER_CHECK_INTERVAL">RESOURCE_LOADER_CHECK_INTERVAL</a></span></code>
+<div class="block">Resource loader modification check interval property 
suffix</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#RESOURCE_LOADER_CLASS">RESOURCE_LOADER_CLASS</a></span></code>
+<div class="block">Resource loader class property suffix</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#RESOURCE_LOADER_IDENTIFIER">RESOURCE_LOADER_IDENTIFIER</a></span></code>
 <div class="block">token used to identify the loader internally.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#RESOURCE_LOADER_INSTANCE">RESOURCE_LOADER_INSTANCE</a></span></code>
+<div class="block">Resource loader instance property suffix</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#RESOURCE_LOADER_PATHS">RESOURCE_LOADER_PATHS</a></span></code>
+<div class="block">File resource loader paths property suffix</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#RESOURCE_LOADERS">RESOURCE_LOADERS</a></span></code>
+<div class="block">Key used to retrieve the names of the resource loaders to 
be used.</div>
+</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#RESOURCE_MANAGER_CACHE_CLASS">RESOURCE_MANAGER_CACHE_CLASS</a></span></code>
@@ -372,100 +430,100 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#RUNTIME_LOG_METHOD_CALL_LOG_INVALID">RUNTIME_LOG_METHOD_CALL_LOG_INVALID</a></span></code>
+<div class="block">Logging of invalid method calls.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#RUNTIME_LOG_NAME">RUNTIME_LOG_NAME</a></span></code>
 <div class="block">externally provided logger name.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#RUNTIME_LOG_REFERENCE_LOG_INVALID">RUNTIME_LOG_REFERENCE_LOG_INVALID</a></span></code>
 <div class="block">Logging of invalid references.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#RUNTIME_REFERENCES_STRICT">RUNTIME_REFERENCES_STRICT</a></span></code>
 <div class="block">Properties referenced in the template are required to exist 
the object</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#RUNTIME_REFERENCES_STRICT_ESCAPE">RUNTIME_REFERENCES_STRICT_ESCAPE</a></span></code>
 <div class="block">Indicates we are going to use modified escape behavior in 
strict mode</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#RUNTIME_STRING_INTERNING">RUNTIME_STRING_INTERNING</a></span></code>
 <div class="block">Whether to use string interning.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#SKIP_INVALID_ITERATOR">SKIP_INVALID_ITERATOR</a></span></code>
 <div class="block">Whether to throw an exception or just skip bad 
iterables.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#SPACE_GOBBLING">SPACE_GOBBLING</a></span></code>
 <div class="block">Space gobbling mode</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#STRICT_MATH">STRICT_MATH</a></span></code>
 <div class="block">Switch for ignoring nulls in math equations vs throwing 
exceptions.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#UBERSPECT_CLASSNAME">UBERSPECT_CLASSNAME</a></span></code>
 <div class="block">key name for uberspector.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#VM_ARGUMENTS_STRICT">VM_ARGUMENTS_STRICT</a></span></code>
 <div class="block">if true, throw an exception for wrong number of 
arguments</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#VM_BODY_REFERENCE">VM_BODY_REFERENCE</a></span></code>
 <div class="block">Defines name of the reference that can be used to get the 
AST block passed to block macro calls.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#VM_LIBRARY">VM_LIBRARY</a></span></code>
-<div class="block">Name of local Velocimacro library template.</div>
+<div class="block">Filename of local Velocimacro library template.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#VM_LIBRARY_AUTORELOAD">VM_LIBRARY_AUTORELOAD</a></span></code>
 <div class="block">switch for autoloading library-sourced VMs (for 
development).</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#VM_LIBRARY_DEFAULT">VM_LIBRARY_DEFAULT</a></span></code>
 <div class="block">Default Velocimacro library template.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#VM_MAX_DEPTH">VM_MAX_DEPTH</a></span></code>
 <div class="block">Specify the maximum depth for macro calls</div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#VM_MESSAGES_ON">VM_MESSAGES_ON</a></span></code>
-<div class="block">Switch for VM blather: default true.</div>
-</td>
-</tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="http://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"><code><span class="memberNameLink"><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#VM_PERM_ALLOW_INLINE">VM_PERM_ALLOW_INLINE</a></span></code>
@@ -492,6 +550,13 @@
 </td>
 </tr>
 </table>
+<ul class="blockList">
+<li class="blockList"><a 
name="fields.inherited.from.class.org.apache.velocity.runtime.DeprecatedRuntimeConstants">
+<!--   -->
+</a>
+<h3>Fields inherited from interface&nbsp;org.apache.velocity.runtime.<a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html" 
title="interface in 
org.apache.velocity.runtime">DeprecatedRuntimeConstants</a></h3>
+<code><a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_CHECK_EMPTY_OBJECTS">OLD_CHECK_EMPTY_OBJECTS</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_CONTEXT_AUTOREFERENCE_KEY">OLD_CONTEXT_AUTOREFERENCE_KEY</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_CONVERSION_HANDLER_CLASS">OLD_CONVERSION_HANDLER_CLASS</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_CONVERSION_HANDLER_INSTANCE">OLD_CONVERSION_HANDLER_INSTANCE</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_CUSTOM_DIRECTIVES">OLD_CUSTOM_DIRECTIVES</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_DEFINE_DIRECTIVE_MAXDEPTH">OLD_DEFINE_DIRECTIVE_MAXDEPTH</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_ERRORMSG_END">OLD_ERRORMSG_END</a>,
 <a href="../..
 
/../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_ERRORMSG_START">OLD_ERRORMSG_START</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_EVENTHANDLER_INCLUDE">OLD_EVENTHANDLER_INCLUDE</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_EVENTHANDLER_INVALIDREFERENCES">OLD_EVENTHANDLER_INVALIDREFERENCES</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_EVENTHANDLER_METHODEXCEPTION">OLD_EVENTHANDLER_METHODEXCEPTION</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_EVENTHANDLER_REFERENCEINSERTION">OLD_EVENTHANDLER_REFERENCEINSERTION</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_FILE_RESOURCE_LOADER_CACHE">OLD_FILE_RESOURCE_LOADER_CACHE</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_FILE_RESOURCE_LOADER_PATH">OLD_FILE_RESOURCE_L
 OADER_PATH</a>, <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_INTERPOLATE_STRINGLITERALS">OLD_INTERPOLATE_STRINGLITERALS</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_MAX_NUMBER_LOOPS">OLD_MAX_NUMBER_LOOPS</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_PARSE_DIRECTIVE_MAXDEPTH">OLD_PARSE_DIRECTIVE_MAXDEPTH</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_PARSER_HYPHEN_ALLOWED">OLD_PARSER_HYPHEN_ALLOWED</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_RESOURCE_LOADER_CHECK_INTERVAL">OLD_RESOURCE_LOADER_CHECK_INTERVAL</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_RESOURCE_LOADERS">OLD_RESOURCE_LOADERS</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_RESOURCE_MANAGER_DEFAULTCACHE_SIZE">OLD_RESOURCE
 _MANAGER_DEFAULTCACHE_SIZE</a>, <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_RESOURCE_MANAGER_LOGWHENFOUND">OLD_RESOURCE_MANAGER_LOGWHENFOUND</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_RUNTIME_LOG_REFERENCE_LOG_INVALID">OLD_RUNTIME_LOG_REFERENCE_LOG_INVALID</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_RUNTIME_REFERENCES_STRICT">OLD_RUNTIME_REFERENCES_STRICT</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_RUNTIME_REFERENCES_STRICT_ESCAPE">OLD_RUNTIME_REFERENCES_STRICT_ESCAPE</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_SKIP_INVALID_ITERATOR">OLD_SKIP_INVALID_ITERATOR</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_SPACE_GOBBLING">OLD_SPACE_GOBBLING</a>,
 <a href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants
 .html#OLD_STRICT_MATH">OLD_STRICT_MATH</a>, <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_UBERSPECT_CLASSNAME">OLD_UBERSPECT_CLASSNAME</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_VM_BODY_REFERENCE">OLD_VM_BODY_REFERENCE</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_VM_LIBRARY">OLD_VM_LIBRARY</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_VM_LIBRARY_DEFAULT">OLD_VM_LIBRARY_DEFAULT</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_VM_MAX_DEPTH">OLD_VM_MAX_DEPTH</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_VM_PERM_ALLOW_INLINE">OLD_VM_PERM_ALLOW_INLINE</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_VM_PERM_ALLOW_INLINE_REPLACE_GLOBAL">OLD_VM_PERM_ALLOW_INLINE_REPLACE_GLOBAL</a>,
 <a href="../
 
../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_VM_PERM_INLINE_LOCAL">OLD_VM_PERM_INLINE_LOCAL</a>,
 <a 
href="../../../../org/apache/velocity/runtime/DeprecatedRuntimeConstants.html#OLD_VM_PRESERVE_ARGUMENTS_LITERALS">OLD_VM_PRESERVE_ARGUMENTS_LITERALS</a></code></li>
+</ul>
 </li>
 </ul>
 </li>
@@ -548,6 +613,20 @@
 </dl>
 </li>
 </ul>
+<a name="RUNTIME_LOG_METHOD_CALL_LOG_INVALID">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RUNTIME_LOG_METHOD_CALL_LOG_INVALID</h4>
+<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> 
RUNTIME_LOG_METHOD_CALL_LOG_INVALID</pre>
+<div class="block">Logging of invalid method calls.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.RUNTIME_LOG_METHOD_CALL_LOG_INVALID">Constant
 Field Values</a></dd>
+</dl>
+</li>
+</ul>
 <a name="RUNTIME_STRING_INTERNING">
 <!--   -->
 </a>
@@ -672,13 +751,49 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>PROVIDE_SCOPE_CONTROL</h4>
-<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> PROVIDE_SCOPE_CONTROL</pre>
-<div class="block">Used to suppress various scope control objects.</div>
+<pre><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true";
 title="class or interface in java.lang">@Deprecated</a>
+static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> PROVIDE_SCOPE_CONTROL</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span 
class="deprecationComment">use <code>context.scope_control.&lt;scope_name&gt; = 
true/false</code></span></div>
+<div class="block">Used to suppress various scope control objects (property 
suffix).</div>
 <dl>
 <dt><span class="simpleTagLabel">Since:</span></dt>
 <dd>1.7</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.PROVIDE_SCOPE_CONTROL">Constant
 Field Values</a></dd>
+<dd><a 
href="../../../../org/apache/velocity/runtime/RuntimeConstants.html#CONTEXT_SCOPE_CONTROL"><code>CONTEXT_SCOPE_CONTROL</code></a>,
 
+<a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.PROVIDE_SCOPE_CONTROL">Constant
 Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="CONTEXT_SCOPE_CONTROL">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CONTEXT_SCOPE_CONTROL</h4>
+<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> CONTEXT_SCOPE_CONTROL</pre>
+<div class="block">Used to enable or disable a scope control (false by 
default):
+ <code>context.scope_control.&lt;scope_name&gt; = true/false</code>
+ where <i>scope_name</i> is one of: <code>template, evaluate, foreach, macro, 
define</code>
+ or the name of a body macro.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.1</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.CONTEXT_SCOPE_CONTROL">Constant
 Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="CUSTOM_DIRECTIVES">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CUSTOM_DIRECTIVES</h4>
+<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> CUSTOM_DIRECTIVES</pre>
+<div class="block">Vector of custom directives</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.CUSTOM_DIRECTIVES">Constant
 Field Values</a></dd>
 </dl>
 </li>
 </ul>
@@ -755,6 +870,22 @@
 </dl>
 </li>
 </ul>
+<a name="RESOURCE_LOADERS">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RESOURCE_LOADERS</h4>
+<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> RESOURCE_LOADERS</pre>
+<div class="block">Key used to retrieve the names of the resource loaders to 
be used. In a properties file they may appear as the following:
+
+ <p>resource.loader = file,classpath</p></div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.RESOURCE_LOADERS">Constant
 Field Values</a></dd>
+</dl>
+</li>
+</ul>
 <a name="RESOURCE_LOADER">
 <!--   -->
 </a>
@@ -762,9 +893,9 @@
 <li class="blockList">
 <h4>RESOURCE_LOADER</h4>
 <pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> RESOURCE_LOADER</pre>
-<div class="block">Key used to retrieve the names of the resource loaders to 
be used. In a properties file they may appear as the following:
+<div class="block">Key prefix for a specific resource loader properties
 
- <p>resource.loader = file,classpath</p></div>
+ <p>resource.loader.file.path = ...</p></div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.RESOURCE_LOADER">Constant
 Field Values</a></dd>
@@ -778,7 +909,8 @@
 <li class="blockList">
 <h4>FILE_RESOURCE_LOADER_PATH</h4>
 <pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> 
FILE_RESOURCE_LOADER_PATH</pre>
-<div class="block">The public handle for setting a path in the 
FileResourceLoader.</div>
+<div class="block">The public handle for setting paths in the 
FileResourceLoader.
+ (this constant is used by test cases only)</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.FILE_RESOURCE_LOADER_PATH">Constant
 Field Values</a></dd>
@@ -799,6 +931,76 @@
 </dl>
 </li>
 </ul>
+<a name="RESOURCE_LOADER_CLASS">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RESOURCE_LOADER_CLASS</h4>
+<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> RESOURCE_LOADER_CLASS</pre>
+<div class="block">Resource loader class property suffix</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.RESOURCE_LOADER_CLASS">Constant
 Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="RESOURCE_LOADER_INSTANCE">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RESOURCE_LOADER_INSTANCE</h4>
+<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> 
RESOURCE_LOADER_INSTANCE</pre>
+<div class="block">Resource loader instance property suffix</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.RESOURCE_LOADER_INSTANCE">Constant
 Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="RESOURCE_LOADER_CACHE">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RESOURCE_LOADER_CACHE</h4>
+<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> RESOURCE_LOADER_CACHE</pre>
+<div class="block">Resource loader cache property suffix</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.RESOURCE_LOADER_CACHE">Constant
 Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="RESOURCE_LOADER_PATHS">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RESOURCE_LOADER_PATHS</h4>
+<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> RESOURCE_LOADER_PATHS</pre>
+<div class="block">File resource loader paths property suffix</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.RESOURCE_LOADER_PATHS">Constant
 Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="RESOURCE_LOADER_CHECK_INTERVAL">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RESOURCE_LOADER_CHECK_INTERVAL</h4>
+<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> 
RESOURCE_LOADER_CHECK_INTERVAL</pre>
+<div class="block">Resource loader modification check interval property 
suffix</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.RESOURCE_LOADER_CHECK_INTERVAL">Constant
 Field Values</a></dd>
+</dl>
+</li>
+</ul>
 <a name="EVENTHANDLER_REFERENCEINSERTION">
 <!--   -->
 </a>
@@ -866,7 +1068,7 @@
 <li class="blockList">
 <h4>VM_LIBRARY</h4>
 <pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> VM_LIBRARY</pre>
-<div class="block">Name of local Velocimacro library template.</div>
+<div class="block">Filename of local Velocimacro library template.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.VM_LIBRARY">Constant
 Field Values</a></dd>
@@ -943,31 +1145,34 @@
 </dl>
 </li>
 </ul>
-<a name="VM_MESSAGES_ON">
+<a name="VM_ARGUMENTS_STRICT">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>VM_MESSAGES_ON</h4>
-<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> VM_MESSAGES_ON</pre>
-<div class="block">Switch for VM blather: default true.</div>
+<h4>VM_ARGUMENTS_STRICT</h4>
+<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> VM_ARGUMENTS_STRICT</pre>
+<div class="block">if true, throw an exception for wrong number of 
arguments</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.VM_MESSAGES_ON">Constant
 Field Values</a></dd>
+<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.VM_ARGUMENTS_STRICT">Constant
 Field Values</a></dd>
 </dl>
 </li>
 </ul>
-<a name="VM_ARGUMENTS_STRICT">
+<a name="VM_PRESERVE_ARGUMENTS_LITERALS">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>VM_ARGUMENTS_STRICT</h4>
-<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> VM_ARGUMENTS_STRICT</pre>
-<div class="block">if true, throw an exception for wrong number of 
arguments</div>
+<h4>VM_PRESERVE_ARGUMENTS_LITERALS</h4>
+<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> 
VM_PRESERVE_ARGUMENTS_LITERALS</pre>
+<div class="block">When displaying null or invalid non-quiet references, use 
the argument literal reference
+ instead of the one in the macro block. Defaults to false.</div>
 <dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.1</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.VM_ARGUMENTS_STRICT">Constant
 Field Values</a></dd>
+<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.VM_PRESERVE_ARGUMENTS_LITERALS">Constant
 Field Values</a></dd>
 </dl>
 </li>
 </ul>
@@ -1003,23 +1208,6 @@
 </dl>
 </li>
 </ul>
-<a name="VM_PRESERVE_ARGUMENTS_LITERALS">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>VM_PRESERVE_ARGUMENTS_LITERALS</h4>
-<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> 
VM_PRESERVE_ARGUMENTS_LITERALS</pre>
-<div class="block">When displaying null or invalid non-quiet references, use 
the argument literal reference
- instead of the one in the macro block. Defaults to false.</div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.1</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.VM_PRESERVE_ARGUMENTS_LITERALS">Constant
 Field Values</a></dd>
-</dl>
-</li>
-</ul>
 <a name="RUNTIME_REFERENCES_STRICT">
 <!--   -->
 </a>
@@ -1062,59 +1250,59 @@
 </dl>
 </li>
 </ul>
-<a name="CONVERSION_HANDLER_INSTANCE">
+<a name="INTROSPECTOR_RESTRICT_PACKAGES">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>CONVERSION_HANDLER_INSTANCE</h4>
-<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> 
CONVERSION_HANDLER_INSTANCE</pre>
-<div class="block">key for Conversion Manager instance</div>
+<h4>INTROSPECTOR_RESTRICT_PACKAGES</h4>
+<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> 
INTROSPECTOR_RESTRICT_PACKAGES</pre>
+<div class="block">A comma separated list of packages to restrict access to in 
the SecureIntrospector.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.CONVERSION_HANDLER_INSTANCE">Constant
 Field Values</a></dd>
+<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.INTROSPECTOR_RESTRICT_PACKAGES">Constant
 Field Values</a></dd>
 </dl>
 </li>
 </ul>
-<a name="CONVERSION_HANDLER_CLASS">
+<a name="INTROSPECTOR_RESTRICT_CLASSES">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>CONVERSION_HANDLER_CLASS</h4>
-<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> 
CONVERSION_HANDLER_CLASS</pre>
-<div class="block">key for Conversion Manager class</div>
+<h4>INTROSPECTOR_RESTRICT_CLASSES</h4>
+<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> 
INTROSPECTOR_RESTRICT_CLASSES</pre>
+<div class="block">A comma separated list of classes to restrict access to in 
the SecureIntrospector.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.CONVERSION_HANDLER_CLASS">Constant
 Field Values</a></dd>
+<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.INTROSPECTOR_RESTRICT_CLASSES">Constant
 Field Values</a></dd>
 </dl>
 </li>
 </ul>
-<a name="INTROSPECTOR_RESTRICT_PACKAGES">
+<a name="CONVERSION_HANDLER_CLASS">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>INTROSPECTOR_RESTRICT_PACKAGES</h4>
-<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> 
INTROSPECTOR_RESTRICT_PACKAGES</pre>
-<div class="block">A comma separated list of packages to restrict access to in 
the SecureIntrospector.</div>
+<h4>CONVERSION_HANDLER_CLASS</h4>
+<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> 
CONVERSION_HANDLER_CLASS</pre>
+<div class="block">key for Conversion Manager class</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.INTROSPECTOR_RESTRICT_PACKAGES">Constant
 Field Values</a></dd>
+<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.CONVERSION_HANDLER_CLASS">Constant
 Field Values</a></dd>
 </dl>
 </li>
 </ul>
-<a name="INTROSPECTOR_RESTRICT_CLASSES">
+<a name="CONVERSION_HANDLER_INSTANCE">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>INTROSPECTOR_RESTRICT_CLASSES</h4>
-<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> 
INTROSPECTOR_RESTRICT_CLASSES</pre>
-<div class="block">A comma separated list of classes to restrict access to in 
the SecureIntrospector.</div>
+<h4>CONVERSION_HANDLER_INSTANCE</h4>
+<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> 
CONVERSION_HANDLER_INSTANCE</pre>
+<div class="block">key for Conversion Manager instance</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.INTROSPECTOR_RESTRICT_CLASSES">Constant
 Field Values</a></dd>
+<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.CONVERSION_HANDLER_INSTANCE">Constant
 Field Values</a></dd>
 </dl>
 </li>
 </ul>
@@ -1217,19 +1405,19 @@
 </dl>
 </li>
 </ul>
-<a name="PARSER_DASH_ALLOWED">
+<a name="PARSER_HYPHEN_ALLOWED">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>PARSER_DASH_ALLOWED</h4>
-<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> PARSER_DASH_ALLOWED</pre>
-<div class="block">Allow dash in identifiers (backward compatibility 
option)</div>
+<h4>PARSER_HYPHEN_ALLOWED</h4>
+<pre>static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> PARSER_HYPHEN_ALLOWED</pre>
+<div class="block">Allow hyphen in identifiers (backward compatibility 
option)</div>
 <dl>
 <dt><span class="simpleTagLabel">Since:</span></dt>
 <dd>2.1</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.PARSER_DASH_ALLOWED">Constant
 Field Values</a></dd>
+<dd><a 
href="../../../../constant-values.html#org.apache.velocity.runtime.RuntimeConstants.PARSER_HYPHEN_ALLOWED">Constant
 Field Values</a></dd>
 </dl>
 </li>
 </ul>


Reply via email to