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 2020/02/02 17:41:20 UTC

svn commit: r1873513 [2/3] - in /velocity/site/production: ./ anakia/ docbook/ dvsl/ engine/ engine/1.7/ engine/2.0/ engine/2.1/ engine/2.2/ engine/devel/ rss/ texen/ tools/ tools/2.0/ tools/3.0/ tools/3.0/contributions/ tools/devel/ tools/devel/contri...

Modified: velocity/site/production/engine/2.2/index.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/2.2/index.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/2.2/index.html (original)
+++ velocity/site/production/engine/2.2/index.html Sun Feb  2 17:41:18 2020
@@ -251,7 +251,7 @@ If you are willing to risk getting dirty
 </ul></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/engine/2.2/license.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/2.2/license.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/2.2/license.html (original)
+++ velocity/site/production/engine/2.2/license.html Sun Feb  2 17:41:18 2020
@@ -430,7 +430,7 @@ limitations under the License.
 </pre></div></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/engine/2.2/overview.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/2.2/overview.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/2.2/overview.html (original)
+++ velocity/site/production/engine/2.2/overview.html Sun Feb  2 17:41:18 2020
@@ -249,7 +249,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>Velocity's design concept is borrowed from <a href="http://www.webmacro.org/">WebMacro</a>. Those involved in the Velocity project acknowledge and appreciate the development and design work that went into the WebMacro project.</p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/engine/2.2/source-repository.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/2.2/source-repository.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/2.2/source-repository.html (original)
+++ velocity/site/production/engine/2.2/source-repository.html Sun Feb  2 17:41:18 2020
@@ -262,7 +262,7 @@ h2:hover > .headerlink, h3:hover > .head
 </pre></div></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/engine/2.2/upgrading.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/2.2/upgrading.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/2.2/upgrading.html (original)
+++ velocity/site/production/engine/2.2/upgrading.html Sun Feb  2 17:41:18 2020
@@ -427,7 +427,7 @@ Please note that the maven repository pa
 + <a href="http://www.hsqldb.org">HSQLDB</a> 1.7.1 is required for running unit tests.</p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/engine/2.2/user-guide.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/2.2/user-guide.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/2.2/user-guide.html (original)
+++ velocity/site/production/engine/2.2/user-guide.html Sun Feb  2 17:41:18 2020
@@ -1432,7 +1432,7 @@ velocimacro.library.autoreload = true
 <p>If you encounter any mistakes in this manual or have other feedback related to the Velocity User Guide, please email the <a href="mailto:dev@velocity.apache.org">Velocity developers list</a>. Thanks!</p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/engine/2.2/vtl-reference.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/2.2/vtl-reference.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/2.2/vtl-reference.html (original)
+++ velocity/site/production/engine/2.2/vtl-reference.html Sun Feb  2 17:41:18 2020
@@ -558,7 +558,7 @@ h2:hover > .headerlink, h3:hover > .head
 </pre></div>
 
 
-<p>will display <code>$foo</code>. If you wish to revert to the 1.x behavior (which is to display <code>$null</code>), you can set the <code>velocimacro.preserve.arguments.literals</code> configuration property to true (since 2.1).</p>
+<p>will display <code>$foo</code>. If you wish to revert to the 1.x behavior (which is to display <code>$null</code>), you can set the <code>velocimacro.enable_bc_mode</code> configuration property to true (since 2.2).</p>
 <h2 id="comments">Comments<a class="headerlink" href="#comments" title="Permanent link">&para;</a></h2>
 <p>Comments are not rendered at runtime.</p>
 <h3 id="single-line-comments">Single Line Comments<a class="headerlink" href="#single-line-comments" title="Permanent link">&para;</a></h3>
@@ -591,7 +591,7 @@ h2:hover > .headerlink, h3:hover > .head
 </pre></div></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/engine/2.2/webapps.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/2.2/webapps.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/2.2/webapps.html (original)
+++ velocity/site/production/engine/2.2/webapps.html Sun Feb  2 17:41:18 2020
@@ -392,7 +392,7 @@ providing a consistent way to mark up te
 </ol></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/engine/devel/build.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/build.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/devel/build.html (original)
+++ velocity/site/production/engine/devel/build.html Sun Feb  2 17:41:18 2020
@@ -244,7 +244,7 @@ mvn install
 via our <a href="/contact.html">email lists</a>.</p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/engine/devel/changes.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/changes.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/devel/changes.html (original)
+++ velocity/site/production/engine/devel/changes.html Sun Feb  2 17:41:18 2020
@@ -2353,7 +2353,7 @@ h2:hover > .headerlink, h3:hover > .head
 </p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/engine/devel/configuration-property-changes-in-2.1.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/configuration-property-changes-in-2.1.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/devel/configuration-property-changes-in-2.1.html (original)
+++ velocity/site/production/engine/devel/configuration-property-changes-in-2.1.html Sun Feb  2 17:41:18 2020
@@ -494,7 +494,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/engine/devel/configuration.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/configuration.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/devel/configuration.html (original)
+++ velocity/site/production/engine/devel/configuration.html Sun Feb  2 17:41:18 2020
@@ -761,7 +761,7 @@ a resource loadercalled 'file', and are
 </pre></div></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/engine/devel/dependencies.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/dependencies.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/devel/dependencies.html (original)
+++ velocity/site/production/engine/devel/dependencies.html Sun Feb  2 17:41:18 2020
@@ -301,7 +301,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/engine/devel/developer-guide.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/developer-guide.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/devel/developer-guide.html (original)
+++ velocity/site/production/engine/devel/developer-guide.html Sun Feb  2 17:41:18 2020
@@ -1822,7 +1822,7 @@ see the Javadoc API documentation.</p>
 <p>Please submit all detailed, thoughtful and constructive feedback through our <a href="/contact.html">mailing lists</a>.</p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/engine/devel/getting-started.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/getting-started.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/devel/getting-started.html (original)
+++ velocity/site/production/engine/devel/getting-started.html Sun Feb  2 17:41:18 2020
@@ -248,7 +248,7 @@ h2:hover > .headerlink, h3:hover > .head
 <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>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/engine/devel/glossary.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/glossary.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/devel/glossary.html (original)
+++ velocity/site/production/engine/devel/glossary.html Sun Feb  2 17:41:18 2020
@@ -330,7 +330,7 @@ h2:hover > .headerlink, h3:hover > .head
 </dl></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/engine/devel/index.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/index.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/devel/index.html (original)
+++ velocity/site/production/engine/devel/index.html Sun Feb  2 17:41:18 2020
@@ -251,7 +251,7 @@ If you are willing to risk getting dirty
 </ul></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/engine/devel/license.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/license.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/devel/license.html (original)
+++ velocity/site/production/engine/devel/license.html Sun Feb  2 17:41:18 2020
@@ -430,7 +430,7 @@ limitations under the License.
 </pre></div></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/engine/devel/overview.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/overview.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/devel/overview.html (original)
+++ velocity/site/production/engine/devel/overview.html Sun Feb  2 17:41:18 2020
@@ -249,7 +249,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>Velocity's design concept is borrowed from <a href="http://www.webmacro.org/">WebMacro</a>. Those involved in the Velocity project acknowledge and appreciate the development and design work that went into the WebMacro project.</p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/engine/devel/source-repository.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/source-repository.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/devel/source-repository.html (original)
+++ velocity/site/production/engine/devel/source-repository.html Sun Feb  2 17:41:18 2020
@@ -262,7 +262,7 @@ h2:hover > .headerlink, h3:hover > .head
 </pre></div></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/engine/devel/upgrading.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/upgrading.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/devel/upgrading.html (original)
+++ velocity/site/production/engine/devel/upgrading.html Sun Feb  2 17:41:18 2020
@@ -427,7 +427,7 @@ Please note that the maven repository pa
 + <a href="http://www.hsqldb.org">HSQLDB</a> 1.7.1 is required for running unit tests.</p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/engine/devel/user-guide.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/user-guide.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/devel/user-guide.html (original)
+++ velocity/site/production/engine/devel/user-guide.html Sun Feb  2 17:41:18 2020
@@ -1432,7 +1432,7 @@ velocimacro.library.autoreload = true
 <p>If you encounter any mistakes in this manual or have other feedback related to the Velocity User Guide, please email the <a href="mailto:dev@velocity.apache.org">Velocity developers list</a>. Thanks!</p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/engine/devel/vtl-reference.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/vtl-reference.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/devel/vtl-reference.html (original)
+++ velocity/site/production/engine/devel/vtl-reference.html Sun Feb  2 17:41:18 2020
@@ -558,7 +558,7 @@ h2:hover > .headerlink, h3:hover > .head
 </pre></div>
 
 
-<p>will display <code>$foo</code>. If you wish to revert to the 1.x behavior (which is to display <code>$null</code>), you can set the <code>velocimacro.preserve.arguments.literals</code> configuration property to true (since 2.1).</p>
+<p>will display <code>$foo</code>. If you wish to revert to the 1.x behavior (which is to display <code>$null</code>), you can set the <code>velocimacro.enable_bc_mode</code> configuration property to true (since 2.2).</p>
 <h2 id="comments">Comments<a class="headerlink" href="#comments" title="Permanent link">&para;</a></h2>
 <p>Comments are not rendered at runtime.</p>
 <h3 id="single-line-comments">Single Line Comments<a class="headerlink" href="#single-line-comments" title="Permanent link">&para;</a></h3>
@@ -591,7 +591,7 @@ h2:hover > .headerlink, h3:hover > .head
 </pre></div></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/engine/devel/webapps.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/webapps.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/devel/webapps.html (original)
+++ velocity/site/production/engine/devel/webapps.html Sun Feb  2 17:41:18 2020
@@ -392,7 +392,7 @@ providing a consistent way to mark up te
 </ol></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/engine/index.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/index.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/engine/index.html (original)
+++ velocity/site/production/engine/index.html Sun Feb  2 17:41:18 2020
@@ -164,7 +164,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul>
 <h2 id="releases">Releases<a class="headerlink" href="#releases" title="Permanent link">&para;</a></h2>
 <ul>
-<li><a href="/engine/2.1">Engine 2.1</a></li>
+<li><a href="/engine/2.2">Engine 2.2</a></li>
 <li><a href="/tools/3.0">Tools 3.0</a></li>
 </ul>
 <h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h2>
@@ -232,11 +232,12 @@ h2:hover > .headerlink, h3:hover > .head
 <h2 id="getting-started">Getting Started<a class="headerlink" href="#getting-started" title="Permanent link">&para;</a></h2>
 <p>The Velocity engine subproject contains the documentation to get started using the Velocity templating language and embedding Velocity into your own applications. Please select <a href="1.7">the last released version</a> to get started. Once you are more familiar with Velocity or if you need a feature not yet released, you can check out the <a href="devel">Development Site</a>.</p>
 <ul>
-<li><a href="2.1">Engine 2.1</a> pages.</li>
+<li><a href="2.2">Engine 2.2</a> pages.</li>
 <li><a href="devel/">Engine Development Version</a> pages.</li>
 </ul>
 <h2 id="older-releases">Older Releases<a class="headerlink" href="#older-releases" title="Permanent link">&para;</a></h2>
 <ul>
+<li><a href="2.1">Engine 2.1 Release</a></li>
 <li><a href="2.0">Engine 2.0 Release</a></li>
 <li><a href="1.7">Engine 1.7 Release</a></li>
 <li><a href="1.6.2">Engine 1.6.2 Release</a></li>
@@ -247,7 +248,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/get-involved.html
URL: http://svn.apache.org/viewvc/velocity/site/production/get-involved.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/get-involved.html (original)
+++ velocity/site/production/get-involved.html Sun Feb  2 17:41:18 2020
@@ -162,7 +162,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul>
 <h2 id="releases">Releases<a class="headerlink" href="#releases" title="Permanent link">&para;</a></h2>
 <ul>
-<li><a href="/engine/2.1">Engine 2.1</a></li>
+<li><a href="/engine/2.2">Engine 2.2</a></li>
 <li><a href="/tools/3.0">Tools 3.0</a></li>
 </ul>
 <h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h2>
@@ -252,7 +252,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/how-it-works.html
URL: http://svn.apache.org/viewvc/velocity/site/production/how-it-works.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/how-it-works.html (original)
+++ velocity/site/production/how-it-works.html Sun Feb  2 17:41:18 2020
@@ -162,7 +162,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul>
 <h2 id="releases">Releases<a class="headerlink" href="#releases" title="Permanent link">&para;</a></h2>
 <ul>
-<li><a href="/engine/2.1">Engine 2.1</a></li>
+<li><a href="/engine/2.2">Engine 2.2</a></li>
 <li><a href="/tools/3.0">Tools 3.0</a></li>
 </ul>
 <h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h2>
@@ -246,7 +246,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>Like its ancestor at <a href="http://jakarta.apache.org/site/guidelines.html">The Jakarta Site</a>, this is a living document. Changes can be made by the Project Management Committee. Suggestions for changes should be discussed on the <a href="/contact.html">Velocity general</a> mailing list.</p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/index.html
URL: http://svn.apache.org/viewvc/velocity/site/production/index.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/index.html (original)
+++ velocity/site/production/index.html Sun Feb  2 17:41:18 2020
@@ -162,7 +162,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul>
 <h2 id="releases">Releases<a class="headerlink" href="#releases" title="Permanent link">&para;</a></h2>
 <ul>
-<li><a href="/engine/2.1">Engine 2.1</a></li>
+<li><a href="/engine/2.2">Engine 2.2</a></li>
 <li><a href="/tools/3.0">Tools 3.0</a></li>
 </ul>
 <h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h2>
@@ -233,13 +233,13 @@ h2:hover > .headerlink, h3:hover > .head
 <h2 id="recent-news">Recent News<a class="headerlink" href="#recent-news" title="Permanent link">&para;</a></h2>
 <p><ul>
   <li>
-    <a href="/news.html#engine21">2019-03-31 - Velocity Engine 2.1 released</a>
+    <a href="/news.html#engine22">2020-02-02 - Velocity Engine 2.2 released</a>
   </li>
   <li>
-    <a href="/news.html#tools30">2018-10-09 - Velocity Tools 3.0 released</a>
+    <a href="/news.html#engine21">2019-03-31 - Velocity Engine 2.1 released</a>
   </li>
   <li>
-    <a href="/news.html#engine20">2017-08-06 - Velocity Engine 2.0 released</a>
+    <a href="/news.html#tools30">2018-10-09 - Velocity Tools 3.0 released</a>
   </li>
 </ul>
 </p>
@@ -265,7 +265,7 @@ h2:hover > .headerlink, h3:hover > .head
 <tbody>
 <tr>
 <td>Velocity Engine</td>
-<td>2.1</td>
+<td>2.2</td>
 <td>(currently none available)</td>
 </tr>
 <tr>
@@ -291,7 +291,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/left.nav
URL: http://svn.apache.org/viewvc/velocity/site/production/left.nav?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/left.nav (original)
+++ velocity/site/production/left.nav Sun Feb  2 17:41:18 2020
@@ -3,7 +3,7 @@
 * [News](/news.html)
 * [Downloads](/download.cgi)
 ## Releases
-* [Engine 2.1](/engine/2.1)
+* [Engine 2.2](/engine/2.2)
 * [Tools 3.0](/tools/3.0)
 ## Development
 * [Engine](/engine/devel)

Modified: velocity/site/production/news.html
URL: http://svn.apache.org/viewvc/velocity/site/production/news.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/news.html (original)
+++ velocity/site/production/news.html Sun Feb  2 17:41:18 2020
@@ -162,7 +162,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul>
 <h2 id="releases">Releases<a class="headerlink" href="#releases" title="Permanent link">&para;</a></h2>
 <ul>
-<li><a href="/engine/2.1">Engine 2.1</a></li>
+<li><a href="/engine/2.2">Engine 2.2</a></li>
 <li><a href="/tools/3.0">Tools 3.0</a></li>
 </ul>
 <h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h2>
@@ -227,6 +227,23 @@ h2:hover > .headerlink, h3:hover > .head
 <h2 id="project-news">Project News<a class="headerlink" href="#project-news" title="Permanent link">&para;</a></h2>
 <p><div class="newsitem">
   <h3>
+    <a name="engine22">Velocity Engine 2.2 released</a>
+  </h3>
+  <div>
+    <p>
+      <b>Sunday,  2 February 2020</b>
+    </p>
+    <p>The Velocity developers are pleased to announce the release of Velocity Engine 2.2.</p>
+    <p>Main changes in this release:</p>
+    <p>+ New runtime.log.track_locations debugging configuration flag which displays the VTL stack trace in the logs in cases of errors, and populates slf4j MDC tags about position in VTL templates.</p>
+    <p>+ New example of how to build a customized VTL parser where the '#', '$', '*' and '@' characters can be replaced by alternate characters.</p>
+    <p>+ New backward compatibility flags to mimic 1.7.x event handlers and velicomacros behaviors.</p>
+    <p>For a full list of changes, consult <a href="http://velocity.apache.org/engine/2.2/changes.html">Velocity Engine 2.2 Changes section</a> and <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310104&amp;version=12345391">JIRA changelog</a>.</p>
+    <p>For notes on upgrading, see <a href="http://velocity.apache.org/engine/2.2/upgrading.html">Velocity Engine 2.2 Upgrading section</a>.</p>
+    <p>Downloads of 2.2 are available <a href="http://velocity.apache.org/download.cgi#engine">here</a>.</p>
+  </div>
+</div><div class="newsitem">
+  <h3>
     <a name="engine21">Velocity Engine 2.1 released</a>
   </h3>
   <div>
@@ -635,7 +652,7 @@ h2:hover > .headerlink, h3:hover > .head
 </p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/news.xml
URL: http://svn.apache.org/viewvc/velocity/site/production/news.xml?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/news.xml (original)
+++ velocity/site/production/news.xml Sun Feb  2 17:41:18 2020
@@ -2,6 +2,31 @@
 
 <news xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://velocity.apache.org/NEWS/1.0.0" xsi:schemaLocation="http://velocity.apache.org/NEWS/1.0.0 http://velocity.apache.org/site/tools/velocity-site-news/xsd/news-1.0.0.xsd">
   <items>
+    <item id="engine22">
+        <date>2020-02-02</date>
+        <headline>Velocity Engine 2.2 released</headline>
+      <categories>
+        <category>velocity</category>
+        <category>engine</category>
+      </categories>
+      <text><![CDATA[
+        The Velocity developers are pleased to announce the release of Velocity Engine 2.2.
+
+        Main changes in this release:
+
+        + New runtime.log.track_locations debugging configuration flag which displays the VTL stack trace in the logs in cases of errors, and populates slf4j MDC tags about position in VTL templates.
+
+        + New example of how to build a customized VTL parser where the '#', '$', '*' and '@' characters can be replaced by alternate characters.
+
+        + New backward compatibility flags to mimic 1.7.x event handlers and velicomacros behaviors.
+
+        For a full list of changes, consult {{{http://velocity.apache.org/engine/2.2/changes.html}Velocity Engine 2.2 Changes section}} and {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310104&version=12345391}JIRA changelog}}.
+
+        For notes on upgrading, see {{{http://velocity.apache.org/engine/2.2/upgrading.html}Velocity Engine 2.2 Upgrading section}}.
+
+        Downloads of 2.2 are available {{{http://velocity.apache.org/download.cgi#engine}here}}.
+      ]]></text>
+    </item>
     <item id="engine21">
         <date>2019-03-31</date>
         <headline>Velocity Engine 2.1 released</headline>

Modified: velocity/site/production/release-process.html
URL: http://svn.apache.org/viewvc/velocity/site/production/release-process.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/release-process.html (original)
+++ velocity/site/production/release-process.html Sun Feb  2 17:41:18 2020
@@ -162,7 +162,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul>
 <h2 id="releases">Releases<a class="headerlink" href="#releases" title="Permanent link">&para;</a></h2>
 <ul>
-<li><a href="/engine/2.1">Engine 2.1</a></li>
+<li><a href="/engine/2.2">Engine 2.2</a></li>
 <li><a href="/tools/3.0">Tools 3.0</a></li>
 </ul>
 <h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h2>
@@ -563,7 +563,7 @@ Regards,
 <p><strong>You have finished!</strong></p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/rss/news.rss
URL: http://svn.apache.org/viewvc/velocity/site/production/rss/news.rss?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
Binary files - no diff available.

Modified: velocity/site/production/site-building.html
URL: http://svn.apache.org/viewvc/velocity/site/production/site-building.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/site-building.html (original)
+++ velocity/site/production/site-building.html Sun Feb  2 17:41:18 2020
@@ -162,7 +162,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul>
 <h2 id="releases">Releases<a class="headerlink" href="#releases" title="Permanent link">&para;</a></h2>
 <ul>
-<li><a href="/engine/2.1">Engine 2.1</a></li>
+<li><a href="/engine/2.2">Engine 2.2</a></li>
 <li><a href="/tools/3.0">Tools 3.0</a></li>
 </ul>
 <h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h2>
@@ -363,7 +363,7 @@ svn status <span class="nv">$VELOCITY</s
 <p>Integration of several Maven reports: dependency-convergence - subversion changelog - dev-activity - file-activity...</p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/texen/index.html
URL: http://svn.apache.org/viewvc/velocity/site/production/texen/index.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/texen/index.html (original)
+++ velocity/site/production/texen/index.html Sun Feb  2 17:41:18 2020
@@ -162,7 +162,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul>
 <h2 id="releases">Releases<a class="headerlink" href="#releases" title="Permanent link">&para;</a></h2>
 <ul>
-<li><a href="/engine/2.1">Engine 2.1</a></li>
+<li><a href="/engine/2.2">Engine 2.2</a></li>
 <li><a href="/tools/3.0">Tools 3.0</a></li>
 </ul>
 <h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h2>
@@ -229,7 +229,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p><a href="1.0">Texen 1.0 Documentation</a></p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/2.0/changes.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/2.0/changes.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/2.0/changes.html (original)
+++ velocity/site/production/tools/2.0/changes.html Sun Feb  2 17:41:18 2020
@@ -1377,7 +1377,7 @@ h2:hover > .headerlink, h3:hover > .head
 </p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/2.0/config-java.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/2.0/config-java.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/2.0/config-java.html (original)
+++ velocity/site/production/tools/2.0/config-java.html Sun Feb  2 17:41:18 2020
@@ -239,7 +239,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>This example uses the <a href="apidocs/org/apache/velocity/tools/config/EasyFactoryConfiguration.html">EasyFactoryConfiguration</a> API for brevity, but you can also directly use the <a href="apidocs/org/apache/velocity/tools/config/FactoryConfiguration.html">FactoryConfiguration</a>/ <a href="apidocs/org/apache/velocity/tools/config/ToolboxConfiguration.html">ToolboxConfiguration</a>/ <a href="apidocs/org/apache/velocity/tools/config/ToolConfiguration.html">ToolConfiguration</a>/ <a href="apidocs/org/apache/velocity/tools/config/Data.html">Data</a> API, as you would probably do if you were to construct your configuration via a dependency injection framework (such as Spring).</p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/2.0/config-properties.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/2.0/config-properties.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/2.0/config-properties.html (original)
+++ velocity/site/production/tools/2.0/config-properties.html Sun Feb  2 17:41:18 2020
@@ -246,7 +246,7 @@ h2:hover > .headerlink, h3:hover > .head
 </pre></div></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/2.0/config-xml.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/2.0/config-xml.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/2.0/config-xml.html (original)
+++ velocity/site/production/tools/2.0/config-xml.html Sun Feb  2 17:41:18 2020
@@ -248,7 +248,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>For those upgrading from VelocityTools 1.x, you will notice that the format has changed rather drastically.  Not to worry, the old format is still supported, though it has been deprecated and does not offer as many features as the new one.  We strongly recommend you upgrade to the new format.</p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/2.0/configuration.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/2.0/configuration.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/2.0/configuration.html (original)
+++ velocity/site/production/tools/2.0/configuration.html Sun Feb  2 17:41:18 2020
@@ -230,7 +230,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/2.0/creating-tools.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/2.0/creating-tools.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/2.0/creating-tools.html (original)
+++ velocity/site/production/tools/2.0/creating-tools.html Sun Feb  2 17:41:18 2020
@@ -353,7 +353,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/2.0/dependencies.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/2.0/dependencies.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/2.0/dependencies.html (original)
+++ velocity/site/production/tools/2.0/dependencies.html Sun Feb  2 17:41:18 2020
@@ -486,7 +486,7 @@ h2:hover > .headerlink, h3:hover > .head
 </table></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/2.0/frameworks.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/2.0/frameworks.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/2.0/frameworks.html (original)
+++ velocity/site/production/tools/2.0/frameworks.html Sun Feb  2 17:41:18 2020
@@ -284,7 +284,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>If you want a little more help with things, consider using a <a href="standalone.html#ToolManager">ToolManager</a>.</p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/2.0/generic.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/2.0/generic.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/2.0/generic.html (original)
+++ velocity/site/production/tools/2.0/generic.html Sun Feb  2 17:41:18 2020
@@ -242,7 +242,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/2.0/index.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/2.0/index.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/2.0/index.html (original)
+++ velocity/site/production/tools/2.0/index.html Sun Feb  2 17:41:18 2020
@@ -260,7 +260,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/2.0/standalone.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/2.0/standalone.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/2.0/standalone.html (original)
+++ velocity/site/production/tools/2.0/standalone.html Sun Feb  2 17:41:18 2020
@@ -228,7 +228,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>Of course, if you are going to be working in a servlet environment and don't want to create and configure tools yourself, then you should being using <a href="view.html">VelocityView</a> either <a href="frameworks.html#Integration-Via-VelocityView">directly</a> or through the <a href="view-servlet.html">servlets</a> or <a href="view-tag.html">JSP tag</a> provided for you.</p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/2.0/struts-user-guide.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/2.0/struts-user-guide.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/2.0/struts-user-guide.html (original)
+++ velocity/site/production/tools/2.0/struts-user-guide.html Sun Feb  2 17:41:18 2020
@@ -529,7 +529,7 @@ whatever
 <p>Please see the <a href="apidocs/org/apache/velocity/tools/struts/package-summary.html">Tool Reference Documentation</a> for more details about the view tools. Furthermore, the Velocity/Struts <a href="index.html#Download">example application</a> comes with several working examples that show how these tools are used.</p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/2.0/struts.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/2.0/struts.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/2.0/struts.html (original)
+++ velocity/site/production/tools/2.0/struts.html Sun Feb  2 17:41:18 2020
@@ -274,7 +274,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>This software is licensed under the <a href="/engine/devel/license.html">Apache Software License 2.0</a>.</p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/2.0/tools-summary.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/2.0/tools-summary.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/2.0/tools-summary.html (original)
+++ velocity/site/production/tools/2.0/tools-summary.html Sun Feb  2 17:41:18 2020
@@ -1706,7 +1706,7 @@ h2:hover > .headerlink, h3:hover > .head
 </p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/2.0/upgrading.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/2.0/upgrading.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/2.0/upgrading.html (original)
+++ velocity/site/production/tools/2.0/upgrading.html Sun Feb  2 17:41:18 2020
@@ -307,7 +307,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>This is unfinished. <a href="index.html#Contribution">You can help fix that!</a></p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/2.0/view-layoutservlet.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/2.0/view-layoutservlet.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/2.0/view-layoutservlet.html (original)
+++ velocity/site/production/tools/2.0/view-layoutservlet.html Sun Feb  2 17:41:18 2020
@@ -245,7 +245,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>...but that would make this whole thing an idiotic waste of time. At the least, you'll probably want to do something along these lines:</p>
 <div class="codehilite"><pre><span class="p">&lt;</span><span class="nt">html</span><span class="p">&gt;</span>
 <span class="p">&lt;</span><span class="nt">head</span><span class="p">&gt;</span>
-  <span class="p">&lt;</span><span class="nt">title</span><span class="p">&gt;$!</span><span class="nv">page_title</span><span class="p">&lt;/</span><span class="nt">title</span><span class="p">&gt;</span>
+  <span class="p">&lt;</span><span class="nt">title</span><span class="p">&gt;$</span>!page_title<span class="p">&lt;/</span><span class="nt">title</span><span class="p">&gt;</span>
 <span class="p">&lt;/</span><span class="nt">head</span><span class="p">&gt;</span>
 <span class="p">&lt;</span><span class="nt">body</span><span class="p">&gt;</span>
   <span class="p">$</span><span class="nv">screen_content</span>
@@ -285,7 +285,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>For creativity's sake, we'll pretend this code is in a file named "Footer.vm" that is located in the root of my webapp like my other non-layout templates.</p>
 <div class="codehilite"><pre><span class="p">&lt;</span><span class="nt">html</span><span class="p">&gt;</span>
 <span class="p">&lt;</span><span class="nt">head</span><span class="p">&gt;</span>
-  <span class="p">&lt;</span><span class="nt">title</span><span class="p">&gt;$!</span><span class="nv">page_title</span><span class="p">&lt;/</span><span class="nt">title</span><span class="p">&gt;</span>
+  <span class="p">&lt;</span><span class="nt">title</span><span class="p">&gt;$</span>!page_title<span class="p">&lt;/</span><span class="nt">title</span><span class="p">&gt;</span>
 <span class="p">&lt;/</span><span class="nt">head</span><span class="p">&gt;</span>
 <span class="p">&lt;</span><span class="nt">body</span><span class="p">&gt;</span>
 
@@ -302,7 +302,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>Now, what if you have a lot of different "footer" files and you want your screen to decide which one will be used?  No problem!  Do something like this:</p>
 <div class="codehilite"><pre><span class="p">&lt;</span><span class="nt">html</span><span class="p">&gt;</span>
 <span class="p">&lt;</span><span class="nt">head</span><span class="p">&gt;</span>
-  <span class="p">&lt;</span><span class="nt">title</span><span class="p">&gt;$!</span><span class="nv">page_title</span><span class="p">&lt;/</span><span class="nt">title</span><span class="p">&gt;</span>
+  <span class="p">&lt;</span><span class="nt">title</span><span class="p">&gt;$</span>!page_title<span class="p">&lt;/</span><span class="nt">title</span><span class="p">&gt;</span>
 <span class="p">&lt;/</span><span class="nt">head</span><span class="p">&gt;</span>
 <span class="p">&lt;</span><span class="nt">body</span><span class="p">&gt;</span>
 
@@ -349,7 +349,7 @@ h2:hover > .headerlink, h3:hover > .head
 </pre></div></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/2.0/view-servlet.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/2.0/view-servlet.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/2.0/view-servlet.html (original)
+++ velocity/site/production/tools/2.0/view-servlet.html Sun Feb  2 17:41:18 2020
@@ -346,7 +346,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>As with your tools, your data will be exposed to your templates under the specified key (e.g. $version, $startdate, $isSimple, $foo, $bar, $dataKeys and $switches). Unlike tools, data does not go in a toolbox and is not scoped (as it is necessarily static).</p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/2.0/view-tag.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/2.0/view-tag.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/2.0/view-tag.html (original)
+++ velocity/site/production/tools/2.0/view-tag.html Sun Feb  2 17:41:18 2020
@@ -218,7 +218,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p class="note">This page is still unfinished. For details on configuring the VelocityViewTag, you can follow most of the instructions for the <a href="view-servlet.html">VelocityViewServlet</a> and of course on the <a href="configuration.html">configuration pages</a>. <a href="index.html#Contribution">Help finishing this is welcome!</a>
 </p>
 <p>This is a JSP tag that allows you to use Velocity and VelocityTools from within a JSP page or tag.  There are many ways to use this tag. This simplest is to have it process an external template using the current page context.  Assuming you have a template called "foo.vm" that can be found by your resource loader(s) that looks like this:</p>
-<div class="codehilite"><pre><span class="x">Hello </span><span class="p">$!</span><span class="nv">bodyContent</span><span class="x"> World!</span>
+<div class="codehilite"><pre><span class="x">Hello </span><span class="p">$</span><span class="x">!bodyContent World!</span>
 </pre></div>
 
 
@@ -271,7 +271,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>For more details, see the <a href="apidocs/org/apache/velocity/tools/view/jsp/VelocityViewTag.html">Javadoc</a> or the <a href="http://svn.apache.org/repos/asf/velocity/tools/trunk/src/main/resources/META-INF/velocity-view.tld">TLD</a>.</p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/2.0/view.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/2.0/view.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/2.0/view.html (original)
+++ velocity/site/production/tools/2.0/view.html Sun Feb  2 17:41:18 2020
@@ -265,7 +265,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>You may, of course, experience the same thing if you are running your web application on Tomcat 5.5 and decide to use LogChuteCommonsLog for commons-logging and stick with the ServletLogChute (the default) for Velocity(Tools) logging. You will have to change one of these two settings or else upgrade your servlet engine.</p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/3.0/changes.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/3.0/changes.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/3.0/changes.html (original)
+++ velocity/site/production/tools/3.0/changes.html Sun Feb  2 17:41:18 2020
@@ -1713,7 +1713,7 @@ h2:hover > .headerlink, h3:hover > .head
 </p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/3.0/config-java.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/3.0/config-java.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/3.0/config-java.html (original)
+++ velocity/site/production/tools/3.0/config-java.html Sun Feb  2 17:41:18 2020
@@ -233,7 +233,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>This example uses the <a href="apidocs/org/apache/velocity/tools/config/EasyFactoryConfiguration.html">EasyFactoryConfiguration</a> API for brevity, but you can also directly use the <a href="apidocs/org/apache/velocity/tools/config/FactoryConfiguration.html">FactoryConfiguration</a>/ <a href="apidocs/org/apache/velocity/tools/config/ToolboxConfiguration.html">ToolboxConfiguration</a>/ <a href="apidocs/org/apache/velocity/tools/config/ToolConfiguration.html">ToolConfiguration</a>/ <a href="apidocs/org/apache/velocity/tools/config/Data.html">Data</a> API, as you would probably do if you were to construct your configuration via a dependency injection framework (such as Spring).</p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/3.0/config-properties.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/3.0/config-properties.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/3.0/config-properties.html (original)
+++ velocity/site/production/tools/3.0/config-properties.html Sun Feb  2 17:41:18 2020
@@ -240,7 +240,7 @@ h2:hover > .headerlink, h3:hover > .head
 </pre></div></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/3.0/config-xml.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/3.0/config-xml.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/3.0/config-xml.html (original)
+++ velocity/site/production/tools/3.0/config-xml.html Sun Feb  2 17:41:18 2020
@@ -242,7 +242,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>For those upgrading from VelocityTools 1.x, you will notice that the format has changed rather drastically.  Not to worry, the old format is still supported, though it has been deprecated and does not offer as many features as the new one.  We strongly recommend you upgrade to the new format.</p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/3.0/configuration.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/3.0/configuration.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/3.0/configuration.html (original)
+++ velocity/site/production/tools/3.0/configuration.html Sun Feb  2 17:41:18 2020
@@ -224,7 +224,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/3.0/contributions.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/3.0/contributions.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/3.0/contributions.html (original)
+++ velocity/site/production/tools/3.0/contributions.html Sun Feb  2 17:41:18 2020
@@ -229,7 +229,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>In either case, you will have to open an issue on <a href="https://issues.apache.org/jira/projects/VELTOOLS">Velocity Tools' JIRA</a>, describe your contribution, attach your code, and also the apropriate <a href="https://www.apache.org/licenses/#grants">Contributor License Agreement or Software Grant</a>.</p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/3.0/contributions/FeedTool.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/3.0/contributions/FeedTool.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/3.0/contributions/FeedTool.html (original)
+++ velocity/site/production/tools/3.0/contributions/FeedTool.html Sun Feb  2 17:41:18 2020
@@ -542,7 +542,7 @@ h2:hover > .headerlink, h3:hover > .head
 </pre></div></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/3.0/creating-tools.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/3.0/creating-tools.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/3.0/creating-tools.html (original)
+++ velocity/site/production/tools/3.0/creating-tools.html Sun Feb  2 17:41:18 2020
@@ -347,7 +347,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/3.0/dependencies.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/3.0/dependencies.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/3.0/dependencies.html (original)
+++ velocity/site/production/tools/3.0/dependencies.html Sun Feb  2 17:41:18 2020
@@ -328,7 +328,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>

Modified: velocity/site/production/tools/3.0/frameworks.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/3.0/frameworks.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/3.0/frameworks.html (original)
+++ velocity/site/production/tools/3.0/frameworks.html Sun Feb  2 17:41:18 2020
@@ -286,7 +286,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>If you want a little more help with things, consider using a <a href="standalone.html#ToolManager">ToolManager</a>.</p></div></div>
         <hr/>
         <div id="copyright">
-          Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://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.
+          Copyright &#169; 2020 The Apache Software Foundation, Licensed under the <a href="http://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.
         </div>
       </div>
     </div>