Modified: velocity/site/production/tools/3.0/generic.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/3.0/generic.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/3.0/generic.html (original)
+++ velocity/site/production/tools/3.0/generic.html Sun Feb  2 17:41:18 2020
@@ -303,7 +303,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/index.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/3.0/index.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/3.0/index.html (original)
+++ velocity/site/production/tools/3.0/index.html Sun Feb  2 17:41:18 2020
@@ -253,7 +253,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/standalone.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/3.0/standalone.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/3.0/standalone.html (original)
+++ velocity/site/production/tools/3.0/standalone.html Sun Feb  2 17:41:18 2020
@@ -222,7 +222,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/3.0/tools-summary.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/3.0/tools-summary.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/3.0/tools-summary.html (original)
+++ velocity/site/production/tools/3.0/tools-summary.html Sun Feb  2 17:41:18 
2020
@@ -1721,7 +1721,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/3.0/upgrading.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/3.0/upgrading.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/3.0/upgrading.html (original)
+++ velocity/site/production/tools/3.0/upgrading.html Sun Feb  2 17:41:18 2020
@@ -324,7 +324,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/3.0/view-layoutservlet.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/3.0/view-layoutservlet.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/3.0/view-layoutservlet.html (original)
+++ velocity/site/production/tools/3.0/view-layoutservlet.html Sun Feb  2 
17:41:18 2020
@@ -232,14 +232,14 @@ h2:hover > .headerlink, h3:hover > .head
 
 <h2 id="layouts">Layouts<a class="headerlink" href="#layouts" title="Permanent 
link">&para;</a></h2>
 <p>Now, in your layout templates, the only thing you really need is the screen 
content reference.  So an acceptable layout template could be:</p>
-<div class="codehilite"><pre><span class="p">$!</span><span 
class="nv">screen_content</span><span class="x"></span>
+<div class="codehilite"><pre><span class="p">$</span><span 
class="x">!screen_content</span>
 </pre></div>
 
 
 <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>
@@ -291,7 +291,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>
 
@@ -308,7 +308,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>
 
@@ -355,7 +355,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/view-servlet.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/3.0/view-servlet.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/3.0/view-servlet.html (original)
+++ velocity/site/production/tools/3.0/view-servlet.html Sun Feb  2 17:41:18 
2020
@@ -354,7 +354,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/3.0/view-tag.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/3.0/view-tag.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/3.0/view-tag.html (original)
+++ velocity/site/production/tools/3.0/view-tag.html Sun Feb  2 17:41:18 2020
@@ -212,7 +212,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>
 
 
@@ -265,7 +265,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/3.0/view.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/3.0/view.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/3.0/view.html (original)
+++ velocity/site/production/tools/3.0/view.html Sun Feb  2 17:41:18 2020
@@ -278,7 +278,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/devel/changes.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/devel/changes.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/devel/changes.html (original)
+++ velocity/site/production/tools/devel/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/devel/config-java.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/devel/config-java.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/devel/config-java.html (original)
+++ velocity/site/production/tools/devel/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/devel/config-properties.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/devel/config-properties.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/devel/config-properties.html (original)
+++ velocity/site/production/tools/devel/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/devel/config-xml.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/devel/config-xml.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/devel/config-xml.html (original)
+++ velocity/site/production/tools/devel/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/devel/configuration.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/devel/configuration.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/devel/configuration.html (original)
+++ velocity/site/production/tools/devel/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/devel/contributions.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/devel/contributions.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/devel/contributions.html (original)
+++ velocity/site/production/tools/devel/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/devel/contributions/FeedTool.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/devel/contributions/FeedTool.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/devel/contributions/FeedTool.html (original)
+++ velocity/site/production/tools/devel/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/devel/creating-tools.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/devel/creating-tools.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/devel/creating-tools.html (original)
+++ velocity/site/production/tools/devel/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/devel/dependencies.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/devel/dependencies.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/devel/dependencies.html (original)
+++ velocity/site/production/tools/devel/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/devel/frameworks.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/devel/frameworks.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/devel/frameworks.html (original)
+++ velocity/site/production/tools/devel/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>

Modified: velocity/site/production/tools/devel/generic.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/devel/generic.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/devel/generic.html (original)
+++ velocity/site/production/tools/devel/generic.html Sun Feb  2 17:41:18 2020
@@ -303,7 +303,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/devel/index.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/devel/index.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/devel/index.html (original)
+++ velocity/site/production/tools/devel/index.html Sun Feb  2 17:41:18 2020
@@ -261,7 +261,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/devel/standalone.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/devel/standalone.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/devel/standalone.html (original)
+++ velocity/site/production/tools/devel/standalone.html Sun Feb  2 17:41:18 
2020
@@ -222,7 +222,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/devel/tools-summary.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/devel/tools-summary.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/devel/tools-summary.html (original)
+++ velocity/site/production/tools/devel/tools-summary.html Sun Feb  2 17:41:18 
2020
@@ -1721,7 +1721,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/devel/upgrading.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/devel/upgrading.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/devel/upgrading.html (original)
+++ velocity/site/production/tools/devel/upgrading.html Sun Feb  2 17:41:18 2020
@@ -324,7 +324,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/devel/view-layoutservlet.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/devel/view-layoutservlet.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/devel/view-layoutservlet.html (original)
+++ velocity/site/production/tools/devel/view-layoutservlet.html Sun Feb  2 
17:41:18 2020
@@ -232,14 +232,14 @@ h2:hover > .headerlink, h3:hover > .head
 
 <h2 id="layouts">Layouts<a class="headerlink" href="#layouts" title="Permanent 
link">&para;</a></h2>
 <p>Now, in your layout templates, the only thing you really need is the screen 
content reference.  So an acceptable layout template could be:</p>
-<div class="codehilite"><pre><span class="p">$!</span><span 
class="nv">screen_content</span><span class="x"></span>
+<div class="codehilite"><pre><span class="p">$</span><span 
class="x">!screen_content</span>
 </pre></div>
 
 
 <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>
@@ -291,7 +291,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>
 
@@ -308,7 +308,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>
 
@@ -355,7 +355,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/devel/view-servlet.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/devel/view-servlet.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/devel/view-servlet.html (original)
+++ velocity/site/production/tools/devel/view-servlet.html Sun Feb  2 17:41:18 
2020
@@ -354,7 +354,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/devel/view-tag.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/devel/view-tag.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/devel/view-tag.html (original)
+++ velocity/site/production/tools/devel/view-tag.html Sun Feb  2 17:41:18 2020
@@ -212,7 +212,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>
 
 
@@ -265,7 +265,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/devel/view.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/devel/view.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/devel/view.html (original)
+++ velocity/site/production/tools/devel/view.html Sun Feb  2 17:41:18 2020
@@ -278,7 +278,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/index.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/index.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/tools/index.html (original)
+++ velocity/site/production/tools/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>
@@ -243,7 +243,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/who-we-are.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/who-we-are.html?rev=1873513&r1=1873512&r2=1873513&view=diff
==============================================================================
--- velocity/site/production/who-we-are.html (original)
+++ velocity/site/production/who-we-are.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>
@@ -426,7 +426,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>


Reply via email to