You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by cb...@apache.org on 2021/03/08 23:43:48 UTC
[velocity-site] branch asf-site updated: [site/prod] More broken
links fixes
This is an automated email from the ASF dual-hosted git repository.
cbrisson pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/velocity-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 7d816b1 [site/prod] More broken links fixes
7d816b1 is described below
commit 7d816b10d65982edf9fa58cee84e60d77a2d8aa4
Author: Claude Brisson <cl...@renegat.net>
AuthorDate: Tue Mar 9 00:43:42 2021 +0100
[site/prod] More broken links fixes
---
anakia/index.html | 2 +-
contact.html | 2 +-
docbook/index.html | 2 +-
download.html | 2 +-
dvsl/index.html | 2 +-
engine/1.5/index.html | 2 +-
engine/1.6.1/index.html | 2 +-
engine/1.6.2/index.html | 2 +-
engine/1.6/index.html | 2 +-
engine/1.7/index.html | 2 +-
engine/2.0/build.html | 15 +++++-----
engine/2.0/changes.html | 15 +++++-----
engine/2.0/configuration.html | 15 +++++-----
engine/2.0/dependencies.html | 15 +++++-----
engine/2.0/developer-guide.html | 19 +++++-------
engine/2.0/getting-started.html | 15 +++++-----
engine/2.0/glossary.html | 15 +++++-----
engine/2.0/index.html | 17 +++++------
engine/2.0/license.html | 15 +++++-----
engine/2.0/overview.html | 15 +++++-----
engine/2.0/source-repository.html | 15 +++++-----
engine/2.0/upgrading.html | 15 +++++-----
engine/2.0/user-guide.html | 15 +++++-----
engine/2.0/vtl-reference.html | 15 +++++-----
engine/2.0/webapps.html | 17 +++++------
engine/2.1/build.html | 15 +++++-----
engine/2.1/changes.html | 15 +++++-----
.../2.1/configuration-property-changes-in-2.1.html | 15 +++++-----
engine/2.1/configuration.html | 15 +++++-----
engine/2.1/dependencies.html | 15 +++++-----
engine/2.1/developer-guide.html | 19 +++++-------
engine/2.1/getting-started.html | 15 +++++-----
engine/2.1/glossary.html | 15 +++++-----
engine/2.1/index.html | 17 +++++------
engine/2.1/license.html | 15 +++++-----
engine/2.1/overview.html | 15 +++++-----
engine/2.1/source-repository.html | 15 +++++-----
engine/2.1/upgrading.html | 15 +++++-----
engine/2.1/user-guide.html | 15 +++++-----
engine/2.1/vtl-reference.html | 15 +++++-----
engine/2.1/webapps.html | 17 +++++------
engine/2.2/build.html | 15 +++++-----
engine/2.2/changes.html | 15 +++++-----
.../2.2/configuration-property-changes-in-2.1.html | 15 +++++-----
engine/2.2/configuration.html | 15 +++++-----
engine/2.2/dependencies.html | 15 +++++-----
engine/2.2/developer-guide.html | 19 +++++-------
engine/2.2/getting-started.html | 15 +++++-----
engine/2.2/glossary.html | 15 +++++-----
engine/2.2/index.html | 17 +++++------
engine/2.2/license.html | 15 +++++-----
engine/2.2/overview.html | 15 +++++-----
engine/2.2/source-repository.html | 15 +++++-----
engine/2.2/upgrading.html | 15 +++++-----
engine/2.2/user-guide.html | 15 +++++-----
engine/2.2/vtl-reference.html | 15 +++++-----
engine/2.2/webapps.html | 19 ++++++------
engine/2.3/build.html | 15 +++++-----
engine/2.3/changes.html | 15 +++++-----
.../2.3/configuration-property-changes-in-2.1.html | 15 +++++-----
engine/2.3/configuration.html | 15 +++++-----
engine/2.3/dependencies.html | 15 +++++-----
engine/2.3/developer-guide.html | 15 +++++-----
engine/2.3/getting-started.html | 15 +++++-----
engine/2.3/glossary.html | 15 +++++-----
engine/2.3/index.html | 17 +++++------
engine/2.3/license.html | 15 +++++-----
engine/2.3/overview.html | 15 +++++-----
engine/2.3/source-repository.html | 15 +++++-----
engine/2.3/upgrading.html | 15 +++++-----
engine/2.3/user-guide.html | 15 +++++-----
engine/2.3/vtl-reference.html | 15 +++++-----
engine/2.3/webapps.html | 19 ++++++------
engine/devel/build.html | 15 +++++-----
engine/devel/changes.html | 15 +++++-----
.../configuration-property-changes-in-2.1.html | 15 +++++-----
engine/devel/configuration.html | 15 +++++-----
engine/devel/dependencies.html | 15 +++++-----
engine/devel/developer-guide.html | 19 +++++-------
engine/devel/getting-started.html | 15 +++++-----
engine/devel/glossary.html | 15 +++++-----
engine/devel/index.html | 17 +++++------
engine/devel/license.html | 15 +++++-----
engine/devel/overview.html | 15 +++++-----
engine/devel/source-repository.html | 15 +++++-----
engine/devel/upgrading.html | 15 +++++-----
engine/devel/user-guide.html | 15 +++++-----
engine/devel/vtl-reference.html | 15 +++++-----
engine/devel/webapps.html | 19 ++++++------
engine/index.html | 2 +-
get-involved.html | 2 +-
how-it-works.html | 2 +-
index.html | 4 +--
news.html | 6 ++--
news.xml | 4 +--
release-process.html | 7 +++--
rss/news.rss | 2 +-
site-building.html | 2 +-
texen/index.html | 2 +-
tools/3.0/changes.html | 8 ++---
tools/3.0/config-java.html | 8 ++---
tools/3.0/config-properties.html | 8 ++---
tools/3.0/config-xml.html | 8 ++---
tools/3.0/configuration.html | 8 ++---
tools/3.0/contributions.html | 8 ++---
tools/3.0/contributions/FeedTool.html | 34 +++++++++++-----------
tools/3.0/creating-tools.html | 8 ++---
tools/3.0/dependencies.html | 8 ++---
tools/3.0/frameworks.html | 8 ++---
tools/3.0/generic.html | 30 ++++---------------
tools/3.0/index.html | 8 ++---
tools/3.0/standalone.html | 8 ++---
tools/3.0/tools-summary.html | 8 ++---
tools/3.0/upgrading.html | 12 ++++----
tools/3.0/view-layoutservlet.html | 10 +++----
tools/3.0/view-servlet.html | 8 ++---
tools/3.0/view-tag.html | 8 ++---
tools/3.0/view.html | 21 ++++---------
tools/3.1/changes.html | 8 ++---
tools/3.1/config-java.html | 8 ++---
tools/3.1/config-properties.html | 8 ++---
tools/3.1/config-xml.html | 8 ++---
tools/3.1/configuration.html | 8 ++---
tools/3.1/contributions.html | 8 ++---
tools/3.1/contributions/FeedTool.html | 34 +++++++++++-----------
tools/3.1/creating-tools.html | 8 ++---
tools/3.1/dependencies.html | 8 ++---
tools/3.1/frameworks.html | 8 ++---
tools/3.1/generic.html | 30 ++++---------------
tools/3.1/index.html | 8 ++---
tools/3.1/standalone.html | 8 ++---
tools/3.1/tools-summary.html | 8 ++---
tools/3.1/upgrading.html | 12 ++++----
tools/3.1/view-layoutservlet.html | 10 +++----
tools/3.1/view-servlet.html | 8 ++---
tools/3.1/view-tag.html | 8 ++---
tools/3.1/view.html | 21 ++++---------
tools/devel/changes.html | 8 ++---
tools/devel/config-java.html | 8 ++---
tools/devel/config-properties.html | 8 ++---
tools/devel/config-xml.html | 8 ++---
tools/devel/configuration.html | 8 ++---
tools/devel/contributions.html | 8 ++---
tools/devel/contributions/FeedTool.html | 34 +++++++++++-----------
tools/devel/creating-tools.html | 8 ++---
tools/devel/dependencies.html | 8 ++---
tools/devel/frameworks.html | 8 ++---
tools/devel/generic.html | 30 ++++---------------
tools/devel/index.html | 8 ++---
tools/devel/standalone.html | 8 ++---
tools/devel/tools-summary.html | 8 ++---
tools/devel/upgrading.html | 12 ++++----
tools/devel/view-layoutservlet.html | 10 +++----
tools/devel/view-servlet.html | 8 ++---
tools/devel/view-tag.html | 8 ++---
tools/devel/view.html | 22 ++++----------
tools/index.html | 2 +-
who-we-are.html | 2 +-
158 files changed, 883 insertions(+), 1059 deletions(-)
diff --git a/anakia/index.html b/anakia/index.html
index 6095bde..3374d0a 100644
--- a/anakia/index.html
+++ b/anakia/index.html
@@ -175,7 +175,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="/who-we-are.html">Who we are</a></li>
<li><a href="/contact.html">Contact us</a></li>
<li><a href="/get-involved.html">Get involved</a></li>
-<li><a href="https://wiki.apache.org/velocity/velocity">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity">Wiki</a></li>
<li><a href="/how-it-works.html">How it works</a></li>
<li><a href="https://whimsy.apache.org/board/minutes/Velocity.html">Board Reports</a></li>
</ul>
diff --git a/contact.html b/contact.html
index 9fc6271..984b79e 100644
--- a/contact.html
+++ b/contact.html
@@ -175,7 +175,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="/who-we-are.html">Who we are</a></li>
<li><a href="/contact.html">Contact us</a></li>
<li><a href="/get-involved.html">Get involved</a></li>
-<li><a href="https://wiki.apache.org/velocity/velocity">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity">Wiki</a></li>
<li><a href="/how-it-works.html">How it works</a></li>
<li><a href="https://whimsy.apache.org/board/minutes/Velocity.html">Board Reports</a></li>
</ul>
diff --git a/docbook/index.html b/docbook/index.html
index 2fbc316..e0919cb 100644
--- a/docbook/index.html
+++ b/docbook/index.html
@@ -175,7 +175,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="/who-we-are.html">Who we are</a></li>
<li><a href="/contact.html">Contact us</a></li>
<li><a href="/get-involved.html">Get involved</a></li>
-<li><a href="https://wiki.apache.org/velocity/velocity">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity">Wiki</a></li>
<li><a href="/how-it-works.html">How it works</a></li>
<li><a href="https://whimsy.apache.org/board/minutes/Velocity.html">Board Reports</a></li>
</ul>
diff --git a/download.html b/download.html
index f89c603..6d634e6 100644
--- a/download.html
+++ b/download.html
@@ -175,7 +175,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="/who-we-are.html">Who we are</a></li>
<li><a href="/contact.html">Contact us</a></li>
<li><a href="/get-involved.html">Get involved</a></li>
-<li><a href="https://wiki.apache.org/velocity/velocity">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity">Wiki</a></li>
<li><a href="/how-it-works.html">How it works</a></li>
<li><a href="https://whimsy.apache.org/board/minutes/Velocity.html">Board Reports</a></li>
</ul>
diff --git a/dvsl/index.html b/dvsl/index.html
index 366f53f..1a73e21 100644
--- a/dvsl/index.html
+++ b/dvsl/index.html
@@ -175,7 +175,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="/who-we-are.html">Who we are</a></li>
<li><a href="/contact.html">Contact us</a></li>
<li><a href="/get-involved.html">Get involved</a></li>
-<li><a href="https://wiki.apache.org/velocity/velocity">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity">Wiki</a></li>
<li><a href="/how-it-works.html">How it works</a></li>
<li><a href="https://whimsy.apache.org/board/minutes/Velocity.html">Board Reports</a></li>
</ul>
diff --git a/engine/1.5/index.html b/engine/1.5/index.html
index 317ec91..a966fb5 100644
--- a/engine/1.5/index.html
+++ b/engine/1.5/index.html
@@ -397,7 +397,7 @@
<a href="https://issues.apache.org/jira/browse/VELOCITY" class="externalLink">our bug tracker</a>. </li>
<li>
- <a href="http://wiki.apache.org/velocity/velocity" class="externalLink"> Our Wiki</a>
+ <a href="http://wiki.apache.org/velocity" class="externalLink"> Our Wiki</a>
has a large collection of community written content. Add your own article or
contribute to the FAQ! </li>
<li> Read-only access to the Subversion repository is available both
diff --git a/engine/1.6.1/index.html b/engine/1.6.1/index.html
index 77cc5c1..4556d82 100644
--- a/engine/1.6.1/index.html
+++ b/engine/1.6.1/index.html
@@ -396,7 +396,7 @@ How do I contribute, give feedback, fix bugs and so on?</h2>
<li> There's a list of issues waiting to be addressed in
<a class="externalLink" href="https://issues.apache.org/jira/browse/VELOCITY">our bug tracker</a>
. </li>
-<li><a class="externalLink" href="http://wiki.apache.org/velocity/velocity"> Our Wiki</a>
+<li><a class="externalLink" href="http://wiki.apache.org/velocity"> Our Wiki</a>
has a large collection of community written content. Add your own article or
contribute to the FAQ! </li>
diff --git a/engine/1.6.2/index.html b/engine/1.6.2/index.html
index 5ca4ae7..af8d2a3 100644
--- a/engine/1.6.2/index.html
+++ b/engine/1.6.2/index.html
@@ -396,7 +396,7 @@ How do I contribute, give feedback, fix bugs and so on?</h2>
<li> There's a list of issues waiting to be addressed in
<a href="https://issues.apache.org/jira/browse/VELOCITY" class="externalLink">our bug tracker</a>
. </li>
-<li><a href="http://wiki.apache.org/velocity/velocity" class="externalLink"> Our Wiki</a>
+<li><a href="http://wiki.apache.org/velocity" class="externalLink"> Our Wiki</a>
has a large collection of community written content. Add your own article or
contribute to the FAQ! </li>
diff --git a/engine/1.6/index.html b/engine/1.6/index.html
index 8f5a3fa..a72bfa1 100644
--- a/engine/1.6/index.html
+++ b/engine/1.6/index.html
@@ -396,7 +396,7 @@ How do I contribute, give feedback, fix bugs and so on?</h2>
<li> There's a list of issues waiting to be addressed in
<a href="https://issues.apache.org/jira/browse/VELOCITY" class="externalLink">our bug tracker</a>
. </li>
-<li><a href="http://wiki.apache.org/velocity/velocity" class="externalLink"> Our Wiki</a>
+<li><a href="http://wiki.apache.org/velocity" class="externalLink"> Our Wiki</a>
has a large collection of community written content. Add your own article or
contribute to the FAQ! </li>
diff --git a/engine/1.7/index.html b/engine/1.7/index.html
index cf96d3e..554d4a7 100644
--- a/engine/1.7/index.html
+++ b/engine/1.7/index.html
@@ -245,7 +245,7 @@ If you are willing to risk getting dirty, we invite you to try the nightly snaps
<ul>
<li>Report bugs, ask questions, and help new users on the <a href="http://velocity.apache.org/contact.html">Velocity mailing lists</a>.</li>
<li>There's a list of issues waiting to be addressed in <a href="https://issues.apache.org/jira/browse/VELOCITY">our bug tracker</a>.</li>
-<li><a href="http://wiki.apache.org/velocity/velocity">Our wiki</a> has a large collection of community written content. Add your own article or contribute to the FAQ!</li>
+<li><a href="http://wiki.apache.org/velocity">Our wiki</a> has a large collection of community written content. Add your own article or contribute to the FAQ!</li>
<li>Read-only access to the Subversion repository is available both <a href="http://svn.apache.org/repos/asf/velocity/engine/trunk/">online</a> and with a <a href="http://www.apache.org/dev/version-control.html">Subversion client</a>.</li>
</ul></div></div>
<hr/>
diff --git a/engine/2.0/build.html b/engine/2.0/build.html
index d0ff234..86d7b39 100644
--- a/engine/2.0/build.html
+++ b/engine/2.0/build.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.0/changes.html b/engine/2.0/changes.html
index 130b009..b8251d2 100644
--- a/engine/2.0/changes.html
+++ b/engine/2.0/changes.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.0/configuration.html b/engine/2.0/configuration.html
index 3a8d948..a910c21 100644
--- a/engine/2.0/configuration.html
+++ b/engine/2.0/configuration.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.0/dependencies.html b/engine/2.0/dependencies.html
index d5d2ec8..eaa66de 100644
--- a/engine/2.0/dependencies.html
+++ b/engine/2.0/dependencies.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.0/developer-guide.html b/engine/2.0/developer-guide.html
index fb8264e..e2ca5f2 100644
--- a/engine/2.0/developer-guide.html
+++ b/engine/2.0/developer-guide.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
@@ -1226,10 +1225,6 @@ see the Javadoc API documentation.</p>
<p>The Linking uberspector is meant for internal use only. It provides introspection chaining when the left uberspector of two following uberspectors of the introspection chain is not a ChainableUberspector. It first tries to delegate introspection to the left uberspector, and only calls the right one in case of failure.</p>
</blockquote>
</li>
-<li><a href="apidocs/org/apache/velocity/util/introspection/UberspectLoggable.html">UberspectLoggable</a> interface<blockquote>
-<p>When an uberspector implements the UberspectLoggable interface, it is provided a logger during initialization via the <code>setLog(Logger)</code> method.</p>
-</blockquote>
-</li>
</ul>
<p>If an Uberspector implements the <a href="apidocs/org/apache/velocity/util/RuntimeServicesAware.html">RuntimeServicesAware</a> interface, it will be provided a Velocity <a href="apidocs/org/apache/velocity/runtime/RuntimeServices.html">RuntimeServices</a> instance during initialization, via the <code>setRuntimeServices(RuntimeServices)</code> method.</p>
<h3 id="uberspectors-providing-extra-features">Uberspectors providing extra features<a class="headerlink" href="#uberspectors-providing-extra-features" title="Permanent link">¶</a></h3>
diff --git a/engine/2.0/getting-started.html b/engine/2.0/getting-started.html
index 73297f3..7c47439 100644
--- a/engine/2.0/getting-started.html
+++ b/engine/2.0/getting-started.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.0/glossary.html b/engine/2.0/glossary.html
index aca5ead..1edf207 100644
--- a/engine/2.0/glossary.html
+++ b/engine/2.0/glossary.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.0/index.html b/engine/2.0/index.html
index 0f05a5a..5dd8653 100644
--- a/engine/2.0/index.html
+++ b/engine/2.0/index.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
@@ -240,7 +239,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<ul>
<li>Report bugs, ask questions, and help new users on the <a href="http://velocity.apache.org/contact.html">Velocity mailing lists</a>.</li>
<li>There's a list of issues waiting to be addressed in <a href="https://issues.apache.org/jira/browse/VELOCITY">our bug tracker</a>.</li>
-<li><a href="https://wiki.apache.org/velocity/velocity">Our wiki</a> has a large collection of community written content. Add your own article or contribute to the FAQ!</li>
+<li><a href="https://wiki.apache.org/velocity">Our wiki</a> has a large collection of community written content. Add your own article or contribute to the FAQ!</li>
<li>Read-only access to the git repository is available both <a href="https://github.com/apache/velocity-engine">online</a> and with a <a href="https://www.apache.org/dev/version-control.html">Git client</a>.</li>
</ul></div></div>
<hr/>
diff --git a/engine/2.0/license.html b/engine/2.0/license.html
index 8cb98b3..de91cfe 100644
--- a/engine/2.0/license.html
+++ b/engine/2.0/license.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.0/overview.html b/engine/2.0/overview.html
index f4879a5..a23b1d4 100644
--- a/engine/2.0/overview.html
+++ b/engine/2.0/overview.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.0/source-repository.html b/engine/2.0/source-repository.html
index 2536354..641b731 100644
--- a/engine/2.0/source-repository.html
+++ b/engine/2.0/source-repository.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.0/upgrading.html b/engine/2.0/upgrading.html
index 624095c..6560574 100644
--- a/engine/2.0/upgrading.html
+++ b/engine/2.0/upgrading.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.0/user-guide.html b/engine/2.0/user-guide.html
index faed680..7448da1 100644
--- a/engine/2.0/user-guide.html
+++ b/engine/2.0/user-guide.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.0/vtl-reference.html b/engine/2.0/vtl-reference.html
index e9d1969..f9467d6 100644
--- a/engine/2.0/vtl-reference.html
+++ b/engine/2.0/vtl-reference.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.0/webapps.html b/engine/2.0/webapps.html
index 94424b9..3c36172 100644
--- a/engine/2.0/webapps.html
+++ b/engine/2.0/webapps.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
@@ -236,7 +235,7 @@ providing a consistent way to mark up text.</li>
<h2 id="use-a-famework">Use a Famework<a class="headerlink" href="#use-a-famework" title="Permanent link">¶</a></h2>
<p>The primary purpose of the Velocity engine is simply to generate text based on a template. Consequently, Velocity does not contain any web-related functionality in and of itself. To make a web application, you will need a framework to respond to HTTP requests, handle user authentication, make business logic calls, and generate a response. There are several strong contenders.</p>
<ol>
-<li><strong>Velocity Tools / VelocityViewServlet</strong> - The easiest way to get started is to download the companion <a href="http://velocity.apache.org/tools/devel/" class="externalLink">Velocity Tools</a> subproject and use the <a href="http://velocity.apache.org/tools/devel/view/">VelocityViewServlet</a>. This servlet is easy to configure and install. You create a directory of templates on your web server, optionally edit an XML file that lists various "Tools" to place in the conte [...]
+<li><strong>Velocity Tools / VelocityViewServlet</strong> - The easiest way to get started is to download the companion <a href="http://velocity.apache.org/tools/devel/" class="externalLink">Velocity Tools</a> subproject and use the <a href="https://velocity.apache.org/tools/devel/view.html">VelocityViewServlet</a>. This servlet is easy to configure and install. You create a directory of templates on your web server, optionally edit an XML file that lists various "Tools" to place in the [...]
<li><strong>Velocity Tools / VelocityStruts</strong> - You may be familiar with the popular <a href="http://struts.apache.org/" class="externalLink">Struts</a> framework, originally designed to provide much needed application functionality to JSP. With the <a href="http://velocity.apache.org/tools/devel/struts/">VelocityStruts</a> module of Velocity Tools you can substitute Velocity for JSP as the page template language. This allows you to take advantage of the large base of Struts inf [...]
<li><strong>Third party frameworks</strong> - There are a number of third party frameworks listed on the <a href="http://wiki.apache.org/velocity/PoweredByVelocity">PoweredByVelocity</a> wiki page. Of these, <a href="http://www.springframework.org/">Spring</a> is probably the most sophisticated and well known. <a href="http://turbine.apache.org/">Turbine</a> has many features and can also be very useful. It was built with Velocity as the primary page language, which is not surprising sin [...]
<li><strong>Build your own</strong> - A final alternative is to build your own framework. Create a dispatcher servlet, retrieve templates from a file or database, integate with your business logic and send the results back to the user. Often you'll have an easier time starting with one of the existing frameworks and customizing it. In particular you can add new functionality to the VelocityViewServlet simply by creating a subclass.</li>
diff --git a/engine/2.1/build.html b/engine/2.1/build.html
index cfc845c..f8b9c50 100644
--- a/engine/2.1/build.html
+++ b/engine/2.1/build.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.1/changes.html b/engine/2.1/changes.html
index 2d52d99..d32cdbb 100644
--- a/engine/2.1/changes.html
+++ b/engine/2.1/changes.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.1/configuration-property-changes-in-2.1.html b/engine/2.1/configuration-property-changes-in-2.1.html
index 4e24b5d..1239292 100644
--- a/engine/2.1/configuration-property-changes-in-2.1.html
+++ b/engine/2.1/configuration-property-changes-in-2.1.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.1/configuration.html b/engine/2.1/configuration.html
index 1ba89c3..727e3c8 100644
--- a/engine/2.1/configuration.html
+++ b/engine/2.1/configuration.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.1/dependencies.html b/engine/2.1/dependencies.html
index f97d509..da236a6 100644
--- a/engine/2.1/dependencies.html
+++ b/engine/2.1/dependencies.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.1/developer-guide.html b/engine/2.1/developer-guide.html
index f3ed359..425526b 100644
--- a/engine/2.1/developer-guide.html
+++ b/engine/2.1/developer-guide.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
@@ -1231,10 +1230,6 @@ see the Javadoc API documentation.</p>
<p>The Linking uberspector is meant for internal use only. It provides introspection chaining when the left uberspector of two following uberspectors of the introspection chain is not a ChainableUberspector. It first tries to delegate introspection to the left uberspector, and only calls the right one in case of failure.</p>
</blockquote>
</li>
-<li><a href="apidocs/org/apache/velocity/util/introspection/UberspectLoggable.html">UberspectLoggable</a> interface<blockquote>
-<p>When an uberspector implements the UberspectLoggable interface, it is provided a logger during initialization via the <code>setLog(Logger)</code> method.</p>
-</blockquote>
-</li>
</ul>
<p>If an Uberspector implements the <a href="apidocs/org/apache/velocity/util/RuntimeServicesAware.html">RuntimeServicesAware</a> interface, it will be provided a Velocity <a href="apidocs/org/apache/velocity/runtime/RuntimeServices.html">RuntimeServices</a> instance during initialization, via the <code>setRuntimeServices(RuntimeServices)</code> method.</p>
<h3 id="uberspectors-providing-extra-features">Uberspectors providing extra features<a class="headerlink" href="#uberspectors-providing-extra-features" title="Permanent link">¶</a></h3>
diff --git a/engine/2.1/getting-started.html b/engine/2.1/getting-started.html
index e39e551..3afc765 100644
--- a/engine/2.1/getting-started.html
+++ b/engine/2.1/getting-started.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.1/glossary.html b/engine/2.1/glossary.html
index 4148809..617464d 100644
--- a/engine/2.1/glossary.html
+++ b/engine/2.1/glossary.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.1/index.html b/engine/2.1/index.html
index 99faa76..1cf45b8 100644
--- a/engine/2.1/index.html
+++ b/engine/2.1/index.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
@@ -240,7 +239,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<ul>
<li>Report bugs, ask questions, and help new users on the <a href="http://velocity.apache.org/contact.html">Velocity mailing lists</a>.</li>
<li>There's a list of issues waiting to be addressed in <a href="https://issues.apache.org/jira/browse/VELOCITY">our bug tracker</a>.</li>
-<li><a href="https://wiki.apache.org/velocity/velocity">Our wiki</a> has a large collection of community written content. Add your own article or contribute to the FAQ!</li>
+<li><a href="https://wiki.apache.org/velocity">Our wiki</a> has a large collection of community written content. Add your own article or contribute to the FAQ!</li>
<li>Read-only access to the git repository is available both <a href="https://github.com/apache/velocity-engine">online</a> and with a <a href="https://www.apache.org/dev/version-control.html">Git client</a>.</li>
</ul></div></div>
<hr/>
diff --git a/engine/2.1/license.html b/engine/2.1/license.html
index 8a452af..5c6baa8 100644
--- a/engine/2.1/license.html
+++ b/engine/2.1/license.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.1/overview.html b/engine/2.1/overview.html
index e12ab4a..def24b8 100644
--- a/engine/2.1/overview.html
+++ b/engine/2.1/overview.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.1/source-repository.html b/engine/2.1/source-repository.html
index 1008031..e056787 100644
--- a/engine/2.1/source-repository.html
+++ b/engine/2.1/source-repository.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.1/upgrading.html b/engine/2.1/upgrading.html
index 97cc1ee..94a5d30 100644
--- a/engine/2.1/upgrading.html
+++ b/engine/2.1/upgrading.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.1/user-guide.html b/engine/2.1/user-guide.html
index 826ba49..c2e70db 100644
--- a/engine/2.1/user-guide.html
+++ b/engine/2.1/user-guide.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.1/vtl-reference.html b/engine/2.1/vtl-reference.html
index 36b98fd..524c1c5 100644
--- a/engine/2.1/vtl-reference.html
+++ b/engine/2.1/vtl-reference.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.1/webapps.html b/engine/2.1/webapps.html
index 08337bb..d3f804d 100644
--- a/engine/2.1/webapps.html
+++ b/engine/2.1/webapps.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
@@ -236,7 +235,7 @@ providing a consistent way to mark up text.</li>
<h2 id="use-a-famework">Use a Famework<a class="headerlink" href="#use-a-famework" title="Permanent link">¶</a></h2>
<p>The primary purpose of the Velocity engine is simply to generate text based on a template. Consequently, Velocity does not contain any web-related functionality in and of itself. To make a web application, you will need a framework to respond to HTTP requests, handle user authentication, make business logic calls, and generate a response. There are several strong contenders.</p>
<ol>
-<li><strong>Velocity Tools / VelocityViewServlet</strong> - The easiest way to get started is to download the companion <a href="http://velocity.apache.org/tools/devel/" class="externalLink">Velocity Tools</a> subproject and use the <a href="http://velocity.apache.org/tools/devel/view/">VelocityViewServlet</a>. This servlet is easy to configure and install. You create a directory of templates on your web server, optionally edit an XML file that lists various "Tools" to place in the conte [...]
+<li><strong>Velocity Tools / VelocityViewServlet</strong> - The easiest way to get started is to download the companion <a href="http://velocity.apache.org/tools/devel/" class="externalLink">Velocity Tools</a> subproject and use the <a href="https://velocity.apache.org/tools/devel/view.html">VelocityViewServlet</a>. This servlet is easy to configure and install. You create a directory of templates on your web server, optionally edit an XML file that lists various "Tools" to place in the [...]
<li><strong>Velocity Tools / VelocityStruts</strong> - You may be familiar with the popular <a href="http://struts.apache.org/" class="externalLink">Struts</a> framework, originally designed to provide much needed application functionality to JSP. With the <a href="http://velocity.apache.org/tools/devel/struts/">VelocityStruts</a> module of Velocity Tools you can substitute Velocity for JSP as the page template language. This allows you to take advantage of the large base of Struts inf [...]
<li><strong>Third party frameworks</strong> - There are a number of third party frameworks listed on the <a href="http://wiki.apache.org/velocity/PoweredByVelocity">PoweredByVelocity</a> wiki page. Of these, <a href="http://www.springframework.org/">Spring</a> is probably the most sophisticated and well known. <a href="http://turbine.apache.org/">Turbine</a> has many features and can also be very useful. It was built with Velocity as the primary page language, which is not surprising sin [...]
<li><strong>Build your own</strong> - A final alternative is to build your own framework. Create a dispatcher servlet, retrieve templates from a file or database, integate with your business logic and send the results back to the user. Often you'll have an easier time starting with one of the existing frameworks and customizing it. In particular you can add new functionality to the VelocityViewServlet simply by creating a subclass.</li>
diff --git a/engine/2.2/build.html b/engine/2.2/build.html
index ab5796c..6ad4b19 100644
--- a/engine/2.2/build.html
+++ b/engine/2.2/build.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.2/changes.html b/engine/2.2/changes.html
index 9d5efaf..6e88217 100644
--- a/engine/2.2/changes.html
+++ b/engine/2.2/changes.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.2/configuration-property-changes-in-2.1.html b/engine/2.2/configuration-property-changes-in-2.1.html
index 3c6aae1..31e66b6 100644
--- a/engine/2.2/configuration-property-changes-in-2.1.html
+++ b/engine/2.2/configuration-property-changes-in-2.1.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.2/configuration.html b/engine/2.2/configuration.html
index 0b99be7..bcbdc81 100644
--- a/engine/2.2/configuration.html
+++ b/engine/2.2/configuration.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.2/dependencies.html b/engine/2.2/dependencies.html
index d5de58b..9ad7629 100644
--- a/engine/2.2/dependencies.html
+++ b/engine/2.2/dependencies.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.2/developer-guide.html b/engine/2.2/developer-guide.html
index c74a7c5..33fbe02 100644
--- a/engine/2.2/developer-guide.html
+++ b/engine/2.2/developer-guide.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
@@ -1241,10 +1240,6 @@ see the Javadoc API documentation.</p>
<p>The Linking uberspector is meant for internal use only. It provides introspection chaining when the left uberspector of two following uberspectors of the introspection chain is not a ChainableUberspector. It first tries to delegate introspection to the left uberspector, and only calls the right one in case of failure.</p>
</blockquote>
</li>
-<li><a href="apidocs/org/apache/velocity/util/introspection/UberspectLoggable.html">UberspectLoggable</a> interface<blockquote>
-<p>When an uberspector implements the UberspectLoggable interface, it is provided a logger during initialization via the <code>setLog(Logger)</code> method.</p>
-</blockquote>
-</li>
</ul>
<p>If an Uberspector implements the <a href="apidocs/org/apache/velocity/util/RuntimeServicesAware.html">RuntimeServicesAware</a> interface, it will be provided a Velocity <a href="apidocs/org/apache/velocity/runtime/RuntimeServices.html">RuntimeServices</a> instance during initialization, via the <code>setRuntimeServices(RuntimeServices)</code> method.</p>
<h3 id="uberspectors-providing-extra-features">Uberspectors providing extra features<a class="headerlink" href="#uberspectors-providing-extra-features" title="Permanent link">¶</a></h3>
diff --git a/engine/2.2/getting-started.html b/engine/2.2/getting-started.html
index 5253e8c..4b18825 100644
--- a/engine/2.2/getting-started.html
+++ b/engine/2.2/getting-started.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.2/glossary.html b/engine/2.2/glossary.html
index b01e64b..aec258f 100644
--- a/engine/2.2/glossary.html
+++ b/engine/2.2/glossary.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.2/index.html b/engine/2.2/index.html
index 020cd37..5af3910 100644
--- a/engine/2.2/index.html
+++ b/engine/2.2/index.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
@@ -240,7 +239,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<ul>
<li>Report bugs, ask questions, and help new users on the <a href="http://velocity.apache.org/contact.html">Velocity mailing lists</a>.</li>
<li>There's a list of issues waiting to be addressed in <a href="https://issues.apache.org/jira/browse/VELOCITY">our bug tracker</a>.</li>
-<li><a href="https://wiki.apache.org/velocity/velocity">Our wiki</a> has a large collection of community written content. Add your own article or contribute to the FAQ!</li>
+<li><a href="https://wiki.apache.org/velocity">Our wiki</a> has a large collection of community written content. Add your own article or contribute to the FAQ!</li>
<li>Read-only access to the git repository is available both <a href="https://github.com/apache/velocity-engine">online</a> and with a <a href="https://www.apache.org/dev/version-control.html">Git client</a>.</li>
</ul></div></div>
<hr/>
diff --git a/engine/2.2/license.html b/engine/2.2/license.html
index 8df7522..16ee6f0 100644
--- a/engine/2.2/license.html
+++ b/engine/2.2/license.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.2/overview.html b/engine/2.2/overview.html
index b469693..5d574d6 100644
--- a/engine/2.2/overview.html
+++ b/engine/2.2/overview.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.2/source-repository.html b/engine/2.2/source-repository.html
index fcec471..71ee48e 100644
--- a/engine/2.2/source-repository.html
+++ b/engine/2.2/source-repository.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.2/upgrading.html b/engine/2.2/upgrading.html
index 5fa0335..58af79b 100644
--- a/engine/2.2/upgrading.html
+++ b/engine/2.2/upgrading.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.2/user-guide.html b/engine/2.2/user-guide.html
index 468fd75..7f476c8 100644
--- a/engine/2.2/user-guide.html
+++ b/engine/2.2/user-guide.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.2/vtl-reference.html b/engine/2.2/vtl-reference.html
index a032615..8b2ffc1 100644
--- a/engine/2.2/vtl-reference.html
+++ b/engine/2.2/vtl-reference.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.2/webapps.html b/engine/2.2/webapps.html
index a179634..f8ff949 100644
--- a/engine/2.2/webapps.html
+++ b/engine/2.2/webapps.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
@@ -236,8 +235,8 @@ providing a consistent way to mark up text.</li>
<h2 id="use-a-famework">Use a Famework<a class="headerlink" href="#use-a-famework" title="Permanent link">¶</a></h2>
<p>The primary purpose of the Velocity engine is simply to generate text based on a template. Consequently, Velocity does not contain any web-related functionality in and of itself. To make a web application, you will need a framework to respond to HTTP requests, handle user authentication, make business logic calls, and generate a response. There are several strong contenders.</p>
<ol>
-<li><strong>Velocity Tools / VelocityViewServlet</strong> - The easiest way to get started is to download the companion <a href="http://velocity.apache.org/tools/devel/" class="externalLink">Velocity Tools</a> subproject and use the <a href="http://velocity.apache.org/tools/devel/view/">VelocityViewServlet</a>. This servlet is easy to configure and install. You create a directory of templates on your web server, optionally edit an XML file that lists various "Tools" to place in the conte [...]
-<li><strong>Velocity Tools / VelocityStruts</strong> - You may be familiar with the popular <a href="http://struts.apache.org/" class="externalLink">Struts</a> framework, originally designed to provide much needed application functionality to JSP. With the <a href="http://velocity.apache.org/tools/devel/struts/">VelocityStruts</a> module of Velocity Tools you can substitute Velocity for JSP as the page template language. This allows you to take advantage of the large base of Struts inf [...]
+<li><strong>Velocity Tools / VelocityViewServlet</strong> - The easiest way to get started is to download the companion <a href="http://velocity.apache.org/tools/devel/" class="externalLink">Velocity Tools</a> subproject and use the <a href="https://velocity.apache.org/tools/devel/view.html">VelocityViewServlet</a>. This servlet is easy to configure and install. You create a directory of templates on your web server, optionally edit an XML file that lists various "Tools" to place in the [...]
+<li><strong>Velocity Tools / VelocityStruts</strong> - You may be familiar with the popular <a href="http://struts.apache.org/" class="externalLink">Struts</a> framework, originally designed to provide much needed application functionality to JSP. With the <a href="http://velocity.apache.org/tools/2.0/struts/">VelocityStruts</a> module of Velocity Tools you can substitute Velocity for JSP as the page template language. This allows you to take advantage of the large base of Struts infra [...]
<li><strong>Third party frameworks</strong> - There are a number of third party frameworks listed on the <a href="http://wiki.apache.org/velocity/PoweredByVelocity">PoweredByVelocity</a> wiki page. Of these, <a href="http://www.springframework.org/">Spring</a> is probably the most sophisticated and well known. <a href="http://turbine.apache.org/">Turbine</a> has many features and can also be very useful. It was built with Velocity as the primary page language, which is not surprising sin [...]
<li><strong>Build your own</strong> - A final alternative is to build your own framework. Create a dispatcher servlet, retrieve templates from a file or database, integate with your business logic and send the results back to the user. Often you'll have an easier time starting with one of the existing frameworks and customizing it. In particular you can add new functionality to the VelocityViewServlet simply by creating a subclass.</li>
</ol>
diff --git a/engine/2.3/build.html b/engine/2.3/build.html
index d2a0bde..799391d 100644
--- a/engine/2.3/build.html
+++ b/engine/2.3/build.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.3/changes.html b/engine/2.3/changes.html
index 710fa5b..216503f 100644
--- a/engine/2.3/changes.html
+++ b/engine/2.3/changes.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.3/configuration-property-changes-in-2.1.html b/engine/2.3/configuration-property-changes-in-2.1.html
index b34bbda..c6d287b 100644
--- a/engine/2.3/configuration-property-changes-in-2.1.html
+++ b/engine/2.3/configuration-property-changes-in-2.1.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.3/configuration.html b/engine/2.3/configuration.html
index bed5c06..248bb05 100644
--- a/engine/2.3/configuration.html
+++ b/engine/2.3/configuration.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.3/dependencies.html b/engine/2.3/dependencies.html
index 2c4fcfc..6aa62d6 100644
--- a/engine/2.3/dependencies.html
+++ b/engine/2.3/dependencies.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.3/developer-guide.html b/engine/2.3/developer-guide.html
index 627bf9c..4b71696 100644
--- a/engine/2.3/developer-guide.html
+++ b/engine/2.3/developer-guide.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.3/getting-started.html b/engine/2.3/getting-started.html
index ae8e120..10a2812 100644
--- a/engine/2.3/getting-started.html
+++ b/engine/2.3/getting-started.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.3/glossary.html b/engine/2.3/glossary.html
index 968ba77..f95700d 100644
--- a/engine/2.3/glossary.html
+++ b/engine/2.3/glossary.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.3/index.html b/engine/2.3/index.html
index a8e0fee..5571e74 100644
--- a/engine/2.3/index.html
+++ b/engine/2.3/index.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
@@ -240,7 +239,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<ul>
<li>Report bugs, ask questions, and help new users on the <a href="http://velocity.apache.org/contact.html">Velocity mailing lists</a>.</li>
<li>There's a list of issues waiting to be addressed in <a href="https://issues.apache.org/jira/browse/VELOCITY">our bug tracker</a>.</li>
-<li><a href="https://wiki.apache.org/velocity/velocity">Our wiki</a> has a large collection of community written content. Add your own article or contribute to the FAQ!</li>
+<li><a href="https://wiki.apache.org/velocity">Our wiki</a> has a large collection of community written content. Add your own article or contribute to the FAQ!</li>
<li>Read-only access to the git repository is available both <a href="https://github.com/apache/velocity-engine">online</a> and with a <a href="https://www.apache.org/dev/version-control.html">Git client</a>.</li>
</ul></div></div>
<hr/>
diff --git a/engine/2.3/license.html b/engine/2.3/license.html
index 71a014d..03b13cc 100644
--- a/engine/2.3/license.html
+++ b/engine/2.3/license.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.3/overview.html b/engine/2.3/overview.html
index 6d6e66a..4b1e5de 100644
--- a/engine/2.3/overview.html
+++ b/engine/2.3/overview.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.3/source-repository.html b/engine/2.3/source-repository.html
index 4051037..05c8460 100644
--- a/engine/2.3/source-repository.html
+++ b/engine/2.3/source-repository.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.3/upgrading.html b/engine/2.3/upgrading.html
index af06b1c..a308b64 100644
--- a/engine/2.3/upgrading.html
+++ b/engine/2.3/upgrading.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.3/user-guide.html b/engine/2.3/user-guide.html
index 99281c0..80245ee 100644
--- a/engine/2.3/user-guide.html
+++ b/engine/2.3/user-guide.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.3/vtl-reference.html b/engine/2.3/vtl-reference.html
index 7e658d2..5990ee6 100644
--- a/engine/2.3/vtl-reference.html
+++ b/engine/2.3/vtl-reference.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/2.3/webapps.html b/engine/2.3/webapps.html
index b900414..68489c6 100644
--- a/engine/2.3/webapps.html
+++ b/engine/2.3/webapps.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
@@ -236,8 +235,8 @@ providing a consistent way to mark up text.</li>
<h2 id="use-a-famework">Use a Famework<a class="headerlink" href="#use-a-famework" title="Permanent link">¶</a></h2>
<p>The primary purpose of the Velocity engine is simply to generate text based on a template. Consequently, Velocity does not contain any web-related functionality in and of itself. To make a web application, you will need a framework to respond to HTTP requests, handle user authentication, make business logic calls, and generate a response. There are several strong contenders.</p>
<ol>
-<li><strong>Velocity Tools / VelocityViewServlet</strong> - The easiest way to get started is to download the companion <a href="http://velocity.apache.org/tools/devel/" class="externalLink">Velocity Tools</a> subproject and use the <a href="http://velocity.apache.org/tools/devel/view/">VelocityViewServlet</a>. This servlet is easy to configure and install. You create a directory of templates on your web server, optionally edit an XML file that lists various "Tools" to place in the conte [...]
-<li><strong>Velocity Tools / VelocityStruts</strong> - You may be familiar with the popular <a href="http://struts.apache.org/" class="externalLink">Struts</a> framework, originally designed to provide much needed application functionality to JSP. With the <a href="http://velocity.apache.org/tools/devel/struts/">VelocityStruts</a> module of Velocity Tools you can substitute Velocity for JSP as the page template language. This allows you to take advantage of the large base of Struts inf [...]
+<li><strong>Velocity Tools / VelocityViewServlet</strong> - The easiest way to get started is to download the companion <a href="http://velocity.apache.org/tools/devel/" class="externalLink">Velocity Tools</a> subproject and use the <a href="https://velocity.apache.org/tools/devel/view.html">VelocityViewServlet</a>. This servlet is easy to configure and install. You create a directory of templates on your web server, optionally edit an XML file that lists various "Tools" to place in the [...]
+<li><strong>Spring framework integration</strong> - See the <a href="apidocs/org/apache/velocity/spring/package-summary.html">Spring support package</a>.</li>
<li><strong>Third party frameworks</strong> - There are a number of third party frameworks listed on the <a href="http://wiki.apache.org/velocity/PoweredByVelocity">PoweredByVelocity</a> wiki page. Of these, <a href="http://www.springframework.org/">Spring</a> is probably the most sophisticated and well known. <a href="http://turbine.apache.org/">Turbine</a> has many features and can also be very useful. It was built with Velocity as the primary page language, which is not surprising sin [...]
<li><strong>Build your own</strong> - A final alternative is to build your own framework. Create a dispatcher servlet, retrieve templates from a file or database, integate with your business logic and send the results back to the user. Often you'll have an easier time starting with one of the existing frameworks and customizing it. In particular you can add new functionality to the VelocityViewServlet simply by creating a subclass.</li>
</ol>
diff --git a/engine/devel/build.html b/engine/devel/build.html
index ab81dd8..a46ea53 100644
--- a/engine/devel/build.html
+++ b/engine/devel/build.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/devel/changes.html b/engine/devel/changes.html
index 5fe7afc..3438805 100644
--- a/engine/devel/changes.html
+++ b/engine/devel/changes.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/devel/configuration-property-changes-in-2.1.html b/engine/devel/configuration-property-changes-in-2.1.html
index 2c9e43a..c072009 100644
--- a/engine/devel/configuration-property-changes-in-2.1.html
+++ b/engine/devel/configuration-property-changes-in-2.1.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/devel/configuration.html b/engine/devel/configuration.html
index dbe0021..f5876df 100644
--- a/engine/devel/configuration.html
+++ b/engine/devel/configuration.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/devel/dependencies.html b/engine/devel/dependencies.html
index 230ad72..45f847b 100644
--- a/engine/devel/dependencies.html
+++ b/engine/devel/dependencies.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/devel/developer-guide.html b/engine/devel/developer-guide.html
index 88732c2..6572746 100644
--- a/engine/devel/developer-guide.html
+++ b/engine/devel/developer-guide.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
@@ -1241,10 +1240,6 @@ see the Javadoc API documentation.</p>
<p>The Linking uberspector is meant for internal use only. It provides introspection chaining when the left uberspector of two following uberspectors of the introspection chain is not a ChainableUberspector. It first tries to delegate introspection to the left uberspector, and only calls the right one in case of failure.</p>
</blockquote>
</li>
-<li><a href="apidocs/org/apache/velocity/util/introspection/UberspectLoggable.html">UberspectLoggable</a> interface<blockquote>
-<p>When an uberspector implements the UberspectLoggable interface, it is provided a logger during initialization via the <code>setLog(Logger)</code> method.</p>
-</blockquote>
-</li>
</ul>
<p>If an Uberspector implements the <a href="apidocs/org/apache/velocity/util/RuntimeServicesAware.html">RuntimeServicesAware</a> interface, it will be provided a Velocity <a href="apidocs/org/apache/velocity/runtime/RuntimeServices.html">RuntimeServices</a> instance during initialization, via the <code>setRuntimeServices(RuntimeServices)</code> method.</p>
<h3 id="uberspectors-providing-extra-features">Uberspectors providing extra features<a class="headerlink" href="#uberspectors-providing-extra-features" title="Permanent link">¶</a></h3>
diff --git a/engine/devel/getting-started.html b/engine/devel/getting-started.html
index a988dcc..4354697 100644
--- a/engine/devel/getting-started.html
+++ b/engine/devel/getting-started.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/devel/glossary.html b/engine/devel/glossary.html
index 725e2e2..12c4cfb 100644
--- a/engine/devel/glossary.html
+++ b/engine/devel/glossary.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/devel/index.html b/engine/devel/index.html
index 53a9d2e..4572b37 100644
--- a/engine/devel/index.html
+++ b/engine/devel/index.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
@@ -240,7 +239,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<ul>
<li>Report bugs, ask questions, and help new users on the <a href="http://velocity.apache.org/contact.html">Velocity mailing lists</a>.</li>
<li>There's a list of issues waiting to be addressed in <a href="https://issues.apache.org/jira/browse/VELOCITY">our bug tracker</a>.</li>
-<li><a href="https://wiki.apache.org/velocity/velocity">Our wiki</a> has a large collection of community written content. Add your own article or contribute to the FAQ!</li>
+<li><a href="https://wiki.apache.org/velocity">Our wiki</a> has a large collection of community written content. Add your own article or contribute to the FAQ!</li>
<li>Read-only access to the git repository is available both <a href="https://github.com/apache/velocity-engine">online</a> and with a <a href="https://www.apache.org/dev/version-control.html">Git client</a>.</li>
</ul></div></div>
<hr/>
diff --git a/engine/devel/license.html b/engine/devel/license.html
index 6b28c61..2bc747a 100644
--- a/engine/devel/license.html
+++ b/engine/devel/license.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/devel/overview.html b/engine/devel/overview.html
index 4cacb8e..8ea455c 100644
--- a/engine/devel/overview.html
+++ b/engine/devel/overview.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/devel/source-repository.html b/engine/devel/source-repository.html
index a245864..494bf33 100644
--- a/engine/devel/source-repository.html
+++ b/engine/devel/source-repository.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/devel/upgrading.html b/engine/devel/upgrading.html
index a7b3680..18e959e 100644
--- a/engine/devel/upgrading.html
+++ b/engine/devel/upgrading.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/devel/user-guide.html b/engine/devel/user-guide.html
index d5f9e17..c37dbf4 100644
--- a/engine/devel/user-guide.html
+++ b/engine/devel/user-guide.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/devel/vtl-reference.html b/engine/devel/vtl-reference.html
index 7658011..65d2915 100644
--- a/engine/devel/vtl-reference.html
+++ b/engine/devel/vtl-reference.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
diff --git a/engine/devel/webapps.html b/engine/devel/webapps.html
index a8f777d..7451e65 100644
--- a/engine/devel/webapps.html
+++ b/engine/devel/webapps.html
@@ -183,22 +183,21 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="source-repository.html">Sources</a></li>
<li><a href="build.html">Building</a></li>
<li><a href="https://issues.apache.org/jira/browse/VELOCITY">Issues</a></li>
-<li><a href="http://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
-<li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
-<li><a href="http://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
+<li><a href="https://wiki.apache.org/velocity/RoadMap">Road Map</a></li>
+<li><a href="https://wiki.apache.org/velocity/CodeStandards">Coding Standards</a></li>
+<li><a href="https://wiki.apache.org/velocity/DocumentationGuidelines">Doc Guidelines</a></li>
</ul>
<h2 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
<li><a href="/news.html">News</a></li>
-<li><a href="http://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
-<li><a href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
+<li><a href="https://wiki.apache.org/velocity/PoweredByVelocity">Powered by Velocity</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityEditors">IDE/Editor Plugins</a></li>
+<li><a href="https://wiki.apache.org/velocity/PublishedArticlesAndBooks">Articles and Books</a></li>
<li><a href="/contact.html">Mailing Lists</a></li>
</ul>
<h2 id="translations-outdated">Translations (outdated)<a class="headerlink" href="#translations-outdated" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="http://www.jajakarta.org/velocity/">Site (Japanese)</a></li>
<li><a href="translations/user-guide_fi.html">User's Guide (Finnish)</a></li>
<li><a href="translations/user-guide_fr.html">User's Guide (French)</a></li>
<li><a href="translations/user-guide_es.html">User's Guide (Spanish)</a></li>
@@ -236,8 +235,8 @@ providing a consistent way to mark up text.</li>
<h2 id="use-a-famework">Use a Famework<a class="headerlink" href="#use-a-famework" title="Permanent link">¶</a></h2>
<p>The primary purpose of the Velocity engine is simply to generate text based on a template. Consequently, Velocity does not contain any web-related functionality in and of itself. To make a web application, you will need a framework to respond to HTTP requests, handle user authentication, make business logic calls, and generate a response. There are several strong contenders.</p>
<ol>
-<li><strong>Velocity Tools / VelocityViewServlet</strong> - The easiest way to get started is to download the companion <a href="http://velocity.apache.org/tools/devel/" class="externalLink">Velocity Tools</a> subproject and use the <a href="http://velocity.apache.org/tools/devel/view/">VelocityViewServlet</a>. This servlet is easy to configure and install. You create a directory of templates on your web server, optionally edit an XML file that lists various "Tools" to place in the conte [...]
-<li><strong>Velocity Tools / VelocityStruts</strong> - You may be familiar with the popular <a href="http://struts.apache.org/" class="externalLink">Struts</a> framework, originally designed to provide much needed application functionality to JSP. With the <a href="http://velocity.apache.org/tools/devel/struts/">VelocityStruts</a> module of Velocity Tools you can substitute Velocity for JSP as the page template language. This allows you to take advantage of the large base of Struts inf [...]
+<li><strong>Velocity Tools / VelocityViewServlet</strong> - The easiest way to get started is to download the companion <a href="http://velocity.apache.org/tools/devel/" class="externalLink">Velocity Tools</a> subproject and use the <a href="https://velocity.apache.org/tools/devel/view.html">VelocityViewServlet</a>. This servlet is easy to configure and install. You create a directory of templates on your web server, optionally edit an XML file that lists various "Tools" to place in the [...]
+<li><strong>Spring framework integration</strong> - See the <a href="apidocs/org/apache/velocity/spring/package-summary.html">Spring support package</a>.</li>
<li><strong>Third party frameworks</strong> - There are a number of third party frameworks listed on the <a href="http://wiki.apache.org/velocity/PoweredByVelocity">PoweredByVelocity</a> wiki page. Of these, <a href="http://www.springframework.org/">Spring</a> is probably the most sophisticated and well known. <a href="http://turbine.apache.org/">Turbine</a> has many features and can also be very useful. It was built with Velocity as the primary page language, which is not surprising sin [...]
<li><strong>Build your own</strong> - A final alternative is to build your own framework. Create a dispatcher servlet, retrieve templates from a file or database, integate with your business logic and send the results back to the user. Often you'll have an easier time starting with one of the existing frameworks and customizing it. In particular you can add new functionality to the VelocityViewServlet simply by creating a subclass.</li>
</ol>
diff --git a/engine/index.html b/engine/index.html
index aefb75e..ac54465 100644
--- a/engine/index.html
+++ b/engine/index.html
@@ -177,7 +177,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="/who-we-are.html">Who we are</a></li>
<li><a href="/contact.html">Contact us</a></li>
<li><a href="/get-involved.html">Get involved</a></li>
-<li><a href="https://wiki.apache.org/velocity/velocity">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity">Wiki</a></li>
<li><a href="/how-it-works.html">How it works</a></li>
<li><a href="https://whimsy.apache.org/board/minutes/Velocity.html">Board Reports</a></li>
</ul>
diff --git a/get-involved.html b/get-involved.html
index 6ea7e60..0fab167 100644
--- a/get-involved.html
+++ b/get-involved.html
@@ -175,7 +175,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="/who-we-are.html">Who we are</a></li>
<li><a href="/contact.html">Contact us</a></li>
<li><a href="/get-involved.html">Get involved</a></li>
-<li><a href="https://wiki.apache.org/velocity/velocity">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity">Wiki</a></li>
<li><a href="/how-it-works.html">How it works</a></li>
<li><a href="https://whimsy.apache.org/board/minutes/Velocity.html">Board Reports</a></li>
</ul>
diff --git a/how-it-works.html b/how-it-works.html
index cc20a45..24dca2b 100644
--- a/how-it-works.html
+++ b/how-it-works.html
@@ -175,7 +175,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="/who-we-are.html">Who we are</a></li>
<li><a href="/contact.html">Contact us</a></li>
<li><a href="/get-involved.html">Get involved</a></li>
-<li><a href="https://wiki.apache.org/velocity/velocity">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity">Wiki</a></li>
<li><a href="/how-it-works.html">How it works</a></li>
<li><a href="https://whimsy.apache.org/board/minutes/Velocity.html">Board Reports</a></li>
</ul>
diff --git a/index.html b/index.html
index 9d37115..2a3a9dc 100644
--- a/index.html
+++ b/index.html
@@ -175,7 +175,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="/who-we-are.html">Who we are</a></li>
<li><a href="/contact.html">Contact us</a></li>
<li><a href="/get-involved.html">Get involved</a></li>
-<li><a href="https://wiki.apache.org/velocity/velocity">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity">Wiki</a></li>
<li><a href="/how-it-works.html">How it works</a></li>
<li><a href="https://whimsy.apache.org/board/minutes/Velocity.html">Board Reports</a></li>
</ul>
@@ -275,7 +275,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
</tr>
</tbody>
</table>
-<p>The release distribution is available as a combined source/binary distribution in tar.gz and zip formats, and can be downloaded from <a href="/download/cgi">our download page</a>.</p>
+<p>The release distribution is available as a combined source/binary distribution in tar.gz and zip formats, and can be downloaded from <a href="/download.cgi">our download page</a>.</p>
<h2 id="more-information">More Information<a class="headerlink" href="#more-information" title="Permanent link">¶</a></h2>
<p>For more information about the Apache Velocity Project, see</p>
<ul>
diff --git a/news.html b/news.html
index f2491ba..98bc36e 100644
--- a/news.html
+++ b/news.html
@@ -175,7 +175,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="/who-we-are.html">Who we are</a></li>
<li><a href="/contact.html">Contact us</a></li>
<li><a href="/get-involved.html">Get involved</a></li>
-<li><a href="https://wiki.apache.org/velocity/velocity">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity">Wiki</a></li>
<li><a href="/how-it-works.html">How it works</a></li>
<li><a href="https://whimsy.apache.org/board/minutes/Velocity.html">Board Reports</a></li>
</ul>
@@ -239,8 +239,8 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<p>* Added an optional 'factory' attribute to tools with the classname of a factory for creating new tools instances.</p>
<p>* Added a new BreadcrumbTool meant to help displaying UI breadcrumb trails.</p>
<p>* Fix potential XSS vulterability in VelocityViewServlet error handling.</p>
- <p>For a full list of changes, consult <a href="Velocity Tools 3.1 Changes section">https://velocity.apache.org/tools/3.1/changes.html</a> and {{{JIRA changelog}https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310130&version=12345408}.</p>
- <p>For notes on upgrading from earlier versions, see <a href="Velocity Tools 3.1 Upgrading section">https://velocity.apache.org/tools/3.1/upgrading.html</a>.</p>
+ <p>For a full list of changes, consult <a href="https://velocity.apache.org/tools/3.1/changes.html">Velocity Tools 3.1 Changes section</a> and <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310130&version=12345408">JIRA changelog</a>.</p>
+ <p>For notes on upgrading from earlier versions, see <a href="https://velocity.apache.org/tools/3.1/upgrading.html">Velocity Tools 3.1 Upgrading section</a>.</p>
<p>Downloads of Velocity Tools 3.1 are available <a href="http://velocity.apache.org/download.cgi#tools">here</a>.</p>
<p/>
</div>
diff --git a/news.xml b/news.xml
index 00f32c0..a6b8960 100644
--- a/news.xml
+++ b/news.xml
@@ -23,9 +23,9 @@
* Fix potential XSS vulterability in VelocityViewServlet error handling.
- For a full list of changes, consult {{{Velocity Tools 3.1 Changes section}https://velocity.apache.org/tools/3.1/changes.html}} and {{{JIRA changelog}https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310130&version=12345408}.
+ For a full list of changes, consult {{{https://velocity.apache.org/tools/3.1/changes.html}Velocity Tools 3.1 Changes section}} and {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310130&version=12345408}JIRA changelog}}.
- For notes on upgrading from earlier versions, see {{{Velocity Tools 3.1 Upgrading section}https://velocity.apache.org/tools/3.1/upgrading.html}}.
+ For notes on upgrading from earlier versions, see {{{https://velocity.apache.org/tools/3.1/upgrading.html}Velocity Tools 3.1 Upgrading section}}.
Downloads of Velocity Tools 3.1 are available {{{http://velocity.apache.org/download.cgi#tools}here}}.
diff --git a/release-process.html b/release-process.html
index d0e6086..c663118 100644
--- a/release-process.html
+++ b/release-process.html
@@ -175,7 +175,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="/who-we-are.html">Who we are</a></li>
<li><a href="/contact.html">Contact us</a></li>
<li><a href="/get-involved.html">Get involved</a></li>
-<li><a href="https://wiki.apache.org/velocity/velocity">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity">Wiki</a></li>
<li><a href="/how-it-works.html">How it works</a></li>
<li><a href="https://whimsy.apache.org/board/minutes/Velocity.html">Board Reports</a></li>
</ul>
@@ -529,8 +529,9 @@ src/content/index.mdtext (status section)
<p>For the tools, update the links towards <code>tools.xml</code> configuration files in <code>generic.mdtext</code> and <code>view.mdtext</code>.</p>
<p>Change the content of the <code>changes_report</code> tag in <code><module>/<version>/changes.mdtext</code> to <code><module>/<version></code> (for instance: <code>{{changes_report(engine/2.3)}}</code>).</p>
<p>Push the changes into production. </p>
-<p>Check the resulting site for broken links</p>
-<div class="codehilite"><pre>wget --spider -r -nd -nv -H -l <span class="m">2</span> -w <span class="m">2</span> -o links.log https://velocity.apache.org/
+<p>Check the resulting site for broken links.</p>
+<div class="codehilite"><pre>sudo pip3 install git+https://github.com/linkchecker/linkchecker.git <span class="c1"># if not installed before</span>
+linkchecker https://velocity.apache.org
</pre></div>
diff --git a/rss/news.rss b/rss/news.rss
index ceadfe7..39110f1 100644
--- a/rss/news.rss
+++ b/rss/news.rss
@@ -7,7 +7,7 @@
<item>
<title>Velocity Tools 3.1 released</title>
<link>http://velocity.apache.org/news.html#tools31</link>
- <description><p>The Velocity developers are pleased to announce the release of Velocity Tools 3.1.</p><p>VelocityTools is a collection of Velocity subprojects with a common goal of providing tools and infrastructure for building both web and standalone applications using the Apache Velocity template engine.</p><p>Main changes:</p><p>* Added an optional 'factory' attribute to tools with the classname of a factory for creating new tools insta [...]
+ <description><p>The Velocity developers are pleased to announce the release of Velocity Tools 3.1.</p><p>VelocityTools is a collection of Velocity subprojects with a common goal of providing tools and infrastructure for building both web and standalone applications using the Apache Velocity template engine.</p><p>Main changes:</p><p>* Added an optional 'factory' attribute to tools with the classname of a factory for creating new tools insta [...]
<category>velocity</category>
<category>tools</category>
<pubDate>Sat, 27 Feb 2021 08:00:00 GMT</pubDate>
diff --git a/site-building.html b/site-building.html
index 615fefd..b5b7275 100644
--- a/site-building.html
+++ b/site-building.html
@@ -175,7 +175,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="/who-we-are.html">Who we are</a></li>
<li><a href="/contact.html">Contact us</a></li>
<li><a href="/get-involved.html">Get involved</a></li>
-<li><a href="https://wiki.apache.org/velocity/velocity">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity">Wiki</a></li>
<li><a href="/how-it-works.html">How it works</a></li>
<li><a href="https://whimsy.apache.org/board/minutes/Velocity.html">Board Reports</a></li>
</ul>
diff --git a/texen/index.html b/texen/index.html
index f002c16..1a6c5b8 100644
--- a/texen/index.html
+++ b/texen/index.html
@@ -175,7 +175,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="/who-we-are.html">Who we are</a></li>
<li><a href="/contact.html">Contact us</a></li>
<li><a href="/get-involved.html">Get involved</a></li>
-<li><a href="https://wiki.apache.org/velocity/velocity">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity">Wiki</a></li>
<li><a href="/how-it-works.html">How it works</a></li>
<li><a href="https://whimsy.apache.org/board/minutes/Velocity.html">Board Reports</a></li>
</ul>
diff --git a/tools/3.0/changes.html b/tools/3.0/changes.html
index 2bfde26..c9b9a83 100644
--- a/tools/3.0/changes.html
+++ b/tools/3.0/changes.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.0/config-java.html b/tools/3.0/config-java.html
index 8468848..73e5f20 100644
--- a/tools/3.0/config-java.html
+++ b/tools/3.0/config-java.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.0/config-properties.html b/tools/3.0/config-properties.html
index 71a9b3c..acd715e 100644
--- a/tools/3.0/config-properties.html
+++ b/tools/3.0/config-properties.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.0/config-xml.html b/tools/3.0/config-xml.html
index 8e3ed00..a40b50e 100644
--- a/tools/3.0/config-xml.html
+++ b/tools/3.0/config-xml.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.0/configuration.html b/tools/3.0/configuration.html
index 68456d8..856c466 100644
--- a/tools/3.0/configuration.html
+++ b/tools/3.0/configuration.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.0/contributions.html b/tools/3.0/contributions.html
index 2648da7..eace798 100644
--- a/tools/3.0/contributions.html
+++ b/tools/3.0/contributions.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.0/contributions/FeedTool.html b/tools/3.0/contributions/FeedTool.html
index 4cf1435..80b0261 100644
--- a/tools/3.0/contributions/FeedTool.html
+++ b/tools/3.0/contributions/FeedTool.html
@@ -158,35 +158,35 @@
h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
<h2 id="velocity-tools">Velocity Tools<a class="headerlink" href="#velocity-tools" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="index.html">Overview</a></li>
-<li><a href="/download.cgi#tools">Download</a></li>
+<li><a href="../index.html">Overview</a></li>
+<li><a href="..//download.cgi#tools">Download</a></li>
</ul>
<h2 id="subprojects">Subprojects<a class="headerlink" href="#subprojects" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="generic.html">GenericTools</a></li>
-<li><a href="view.html">VelocityView</a></li>
+<li><a href="../generic.html">GenericTools</a></li>
+<li><a href="../view.html">VelocityView</a></li>
</ul>
<h2 id="docs">Docs<a class="headerlink" href="#docs" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="tools-summary.html">Standard Tools</a></li>
-<li><a href="apidocs/index.html">Javadoc</a></li>
-<li><a href="upgrading.html">Upgrading</a></li>
-<li><a href="configuration.html">Configuration</a></li>
-<li><a href="standalone.html">Standalone Use</a></li>
-<li><a href="frameworks.html">Web Integration</a></li>
-<li><a href="creating-tools.html">Creating Tools</a></li>
-<li><a href="contributions.html">Contributions</a></li>
+<li><a href="../tools-summary.html">Standard Tools</a></li>
+<li><a href="../apidocs/index.html">Javadoc</a></li>
+<li><a href="../upgrading.html">Upgrading</a></li>
+<li><a href="../configuration.html">Configuration</a></li>
+<li><a href="../standalone.html">Standalone Use</a></li>
+<li><a href="../frameworks.html">Web Integration</a></li>
+<li><a href="../creating-tools.html">Creating Tools</a></li>
+<li><a href="../contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="changes.html">Changes</a></li>
-<li><a href="dependencies.html">Dependencies</a></li>
-<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="../changes.html">Changes</a></li>
+<li><a href="../dependencies.html">Dependencies</a></li>
+<li><a href="/index.html#helping-out">Participating</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.0/creating-tools.html b/tools/3.0/creating-tools.html
index 6926fa5..a864705 100644
--- a/tools/3.0/creating-tools.html
+++ b/tools/3.0/creating-tools.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.0/dependencies.html b/tools/3.0/dependencies.html
index ffbe0fb..cbdf002 100644
--- a/tools/3.0/dependencies.html
+++ b/tools/3.0/dependencies.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.0/frameworks.html b/tools/3.0/frameworks.html
index a39a533..341037e 100644
--- a/tools/3.0/frameworks.html
+++ b/tools/3.0/frameworks.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.0/generic.html b/tools/3.0/generic.html
index f4ef927..8a5c109 100644
--- a/tools/3.0/generic.html
+++ b/tools/3.0/generic.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
@@ -220,7 +220,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
</pre></div>
-<p>Otherwise, see the <a href="/download.html#tools">download page</a> for how to get the Velocity Generic Tools jar.</p>
+<p>Otherwise, see the <a href="/download.cgi#tools">download page</a> for how to get the Velocity Generic Tools jar.</p>
<h2 id="usage">Usage<a class="headerlink" href="#usage" title="Permanent link">¶</a></h2>
<ul>
<li>
@@ -282,25 +282,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<h2 id="dependencies">Dependencies<a class="headerlink" href="#dependencies" title="Permanent link">¶</a></h2>
<p>The dependencies required for GenericTools vary somewhat depending on which tools you use, whether you will rely on core tool management infrastructure, and if so, how you choose to configure your toolbox. More details can be found on the <a href="dependencies.html#GenericTools">dependencies chart</a>.</p>
<h2 id="tools">Tools<a class="headerlink" href="#tools" title="Permanent link">¶</a></h2>
-<ul>
-<li><a href="apidocs/org/apache/velocity/tools/generic/AlternatorTool.html">AlternatorTool</a> - For creating <a href="apidocs/org/apache/velocity/tools/generic/Alternator.html">Alternator</a>s to easily alternate over a set of values.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/ClassTool.html">ClassTool</a> - For simplifying reflective lookup of information about Classes and their fields, methods and constructors.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/ContextTool.html">ContextTool</a> - For convenient access to Context data and meta-data.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/ConversionTool.html">ConversionTool</a> - For converting String values to richer object types.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/DateTool.html">DateTool</a> & <a href="apidocs/org/apache/velocity/tools/generic/ComparisonDateTool.html">ComparisonDateTool</a> - For manipulating, formatting, and comparing dates.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/DisplayTool.html">DisplayTool</a> - For controlling display of references (e.g. truncating values, "pretty printing" lists, and displaying alternates when a reference is null).</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/EscapeTool.html">EscapeTool</a> - For common escaping needs in Velocity templates (e.g. escaping html, xml, javascript etc.).</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/FieldTool.html">FieldTool</a> - For (easy) access to static fields in a class, such as string constants.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/LoopTool.html">LoopTool</a> - A convenience tool to use with #foreach loops. It wraps a list with a custom iterator to provide greater control, allowing loops to end early, skip ahead and more.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/LinkTool.html">LinkTool</a> - For creating and manipulating URIs and URLs. The API for this tool is designed to closely resemble that of the VelocityView tool of the same name.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/ListTool.html">ListTool</a> - For working with arrays and lists, treats both transparently the same.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/MathTool.html">MathTool</a> - For performing math functions.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/NumberTool.html">NumberTool</a> - For formatting and converting numbers.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/RenderTool.html">RenderTool</a> - To evaluate and render arbitrary strings of VTL, including recursive rendering.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/ResourceTool.html">ResourceTool</a> - For simplified access to ResourceBundles for internationalization or other dynamic content needs.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/SortTool.html">SortTool</a> - Used to sort collections (or arrays, iterators, etc) on any arbitary set of properties exposed by the objects contained within the collection.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/XmlTool.html">XmlTool</a> - For reading/navigating XML files. This uses dom4j under the covers and provides complete XPath support.</li>
-</ul></div></div>
+<p>Please consult the <a href="tools-summary.html">Standard Tools</a> page for a list of standard generic tools.</p></div></div>
<hr/>
<div id="copyright">
Copyright © 2020 The Apache Software Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
diff --git a/tools/3.0/index.html b/tools/3.0/index.html
index 56970f8..43a0818 100644
--- a/tools/3.0/index.html
+++ b/tools/3.0/index.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.0/standalone.html b/tools/3.0/standalone.html
index 3e7be78..264e153 100644
--- a/tools/3.0/standalone.html
+++ b/tools/3.0/standalone.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.0/tools-summary.html b/tools/3.0/tools-summary.html
index f99dbed..01d2aa5 100644
--- a/tools/3.0/tools-summary.html
+++ b/tools/3.0/tools-summary.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.0/upgrading.html b/tools/3.0/upgrading.html
index d676dbb..b1b7fe0 100644
--- a/tools/3.0/upgrading.html
+++ b/tools/3.0/upgrading.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
@@ -266,7 +266,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li>VelocityLayoutServlet, it is now at <a href="apidocs/org/apache/velocity/tools/view/VelocityLayoutServlet.html">org.apache.velocity.tools.view.VelocityLayoutServlet</a></li>
<li>WebappLoader, it is now at <a href="apidocs/org/apache/velocity/tools/view/WebappResourceLoader.html">org.apache.velocity.tools.view.WebappResourceLoader</a></li>
<li>ViewContext, it is now at <a href="apidocs/org/apache/velocity/tools/view/ViewContext.html">org.apache.velocity.tools.view.ViewContext</a></li>
-<li>ServletLogger, it has been replaced by <a href="apidocs/org/apache/velocity/tools/view/ServletLogChute.html">org.apache.velocity.tools.view.ServletLogChute</a></li>
+<li>ServletLogger, it has been replaced by org.apache.velocity.tools.view.ServletLogChute</li>
<li>ServletUtils, it is now at <a href="apidocs/org/apache/velocity/tools/view/ServletUtils.html">org.apache.velocity.tools.view.ServletUtils</a></li>
<li>BrowserSniffer, it is now at <a href="apidocs/org/apache/velocity/tools/view/BrowserTool.html">org.apache.velocity.tools.view.BrowserTool</a></li>
<li>AbstractPagerTool, it is now at <a href="apidocs/org/apache/velocity/tools/view/PagerTool.html">org.apache.velocity.tools.view.PagerTool</a></li>
@@ -318,7 +318,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<h3 id="custom-tools-in-20">Custom Tools in 2.0<a class="headerlink" href="#custom-tools-in-20" title="Permanent link">¶</a></h3>
<p>Those of you who write your own custom tools may want to make a few changes to upgrade your custom tools to do things the "Tools 2 way". Here's a few quick starts for that, though this doesn't cover everything. More details can be found in the <a href="creating-tools.html">instructions for creating tools</a>.</p>
<p><strong>Naming:</strong> The recommended practice is to give a tool to be used as <code>$foo</code> the name <code>FooTool</code> . This is not required but is a convention that keeps things easy follow and learn. If you have to name a tool FooBarUtility but want it to be <code>$foo</code> in templates, the second best thing is to provide a <a href="apidocs/org/apache/velocity/tools/config/DefaultKey.html"><code>@DefaultKey("foo")</code></a> annotation on the class, though this intro [...]
-<p><strong>Scoping:</strong> If your tool is only meant to be used in a particular scope, it's recommended that you give the class a <a href="apidocs/org/apache/velocity/tools/config/ValidScope.html"><code>@ValidScope(Scope.REQUEST)</code></a> annotation as well. If you only want to ban a particular scope and allow all others, you could provide a <a href="apidocs/org/apache/velocity/tools/config/InvalidScope.html"><code>@InvalidScope(Scope.APPLICATION)</code></a> annotation on the class. [...]
+<p><strong>Scoping:</strong> If your tool is only meant to be used in a particular scope, it's recommended that you give the class a <a href="apidocs/org/apache/velocity/tools/config/ValidScope.html"><code>@ValidScope(Scope.REQUEST)</code></a> annotation as well. If you only want to ban a particular scope and allow all others, you could provide a <code>@InvalidScope(Scope.APPLICATION)</code> annotation on the class. The <a href="apidocs/org/apache/velocity/tools/Scope.html"><code>Scope</ [...]
<p><strong>Configuration:</strong> If you have a configurable tool whose configuration should not changed by the templates which use it, then consider having your tool extend the <a href="apidocs/org/apache/velocity/tools/generic/SafeConfig.html">SafeConfig</a> class (or <a href="apidocs/org/apache/velocity/tools/generic/FormatConfig.html">FormatConfig</a> or <a href="apidocs/org/apache/velocity/tools/generic/LocaleConfig.html">LocaleConfig</a>). These safely standardize configuration of [...]
<h2 id="upgrading-to-14">Upgrading to 1.4<a class="headerlink" href="#upgrading-to-14" title="Permanent link">¶</a></h2>
<p>This is unfinished. <a href="index.html#Contribution">You can help fix that!</a></p></div></div>
diff --git a/tools/3.0/view-layoutservlet.html b/tools/3.0/view-layoutservlet.html
index ecb0b53..31c85c1 100644
--- a/tools/3.0/view-layoutservlet.html
+++ b/tools/3.0/view-layoutservlet.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
@@ -212,7 +212,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<p>This is an extension to the basic VelocityViewServlet. It provides a simple layout control and customizable error screens for Velocity Tools based projects. VelocityTools is distributed with an example app demonstrating the use of this servlet.</p>
<h2 id="installation">Installation<a class="headerlink" href="#installation" title="Permanent link">¶</a></h2>
<p>Since this class is an extension of the VelocityViewServlet (VVS), to use it simply change the servlet-class value of the web.xml entry to the following class:</p>
-<p><a href="apidocs/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.html">org.apache.velocity.tools.view.servlet.VelocityLayoutServlet</a></p>
+<p><a href="apidocs/org/apache/velocity/tools/view/VelocityLayoutServlet.html">org.apache.velocity.tools.view.servlet.VelocityLayoutServlet</a></p>
<h2 id="configuration-settings">Configuration Settings<a class="headerlink" href="#configuration-settings" title="Permanent link">¶</a></h2>
<p>Three settings can be added to velocity.properties to control the VLS, or the following default values will be used:</p>
<div class="codehilite"><pre><span class="c"># Filepath for error template,</span>
diff --git a/tools/3.0/view-servlet.html b/tools/3.0/view-servlet.html
index f387c94..3fead7b 100644
--- a/tools/3.0/view-servlet.html
+++ b/tools/3.0/view-servlet.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.0/view-tag.html b/tools/3.0/view-tag.html
index f2b60d5..c0ecf4f 100644
--- a/tools/3.0/view-tag.html
+++ b/tools/3.0/view-tag.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.0/view.html b/tools/3.0/view.html
index 22b6882..809dfb3 100644
--- a/tools/3.0/view.html
+++ b/tools/3.0/view.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
@@ -228,7 +228,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
</pre></div>
-<p>Otherwise, see the <a href="/download.html#tools">download page</a> for how to get the Velocity View Tools jar.</p>
+<p>Otherwise, see the <a href="/download.cgi#tools">download page</a> for how to get the Velocity View Tools jar.</p>
<h2 id="default-configuration">Default Configuration<a class="headerlink" href="#default-configuration" title="Permanent link">¶</a></h2>
<p>The default configuration provided for VelocityView is <a href="http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/resources/org/apache/velocity/tools/generic/tools.xml?view=markup"">here</a> and <a href="http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/resources/org/apache/velocity/tools/view/tools.xml?view=markup">here</a>.</p>
<h2 id="dependencies">Dependencies<a class="headerlink" href="#dependencies" title="Permanent link">¶</a></h2>
@@ -247,16 +247,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<p>Detailed documentation is <a href="view-tag.html">here</a>.</p>
<h2 id="tools">Tools<a class="headerlink" href="#tools" title="Permanent link">¶</a></h2>
<p>These are in addition to those provided by <a href="generic.html#Tools">GenericTools</a>:</p>
-<ul>
-<li><a href="apidocs/org/apache/velocity/tools/view/AbstractSearchTool.html">AbstractSearchTool</a> - For doing "searching" and robust pagination of search results. Requires you to create a subclass.</li>
-<li><a href="apidocs/org/apache/velocity/tools/view/BrowserTool.html">BrowserTool</a> - For identifying the browser and features thereof requesting the template.</li>
-<li><a href="apidocs/org/apache/velocity/tools/view/CookieTool.html">CookieTool</a> - For convenient cookie access and creation.</li>
-<li><a href="apidocs/org/apache/velocity/tools/view/ImportTool.html">ImportTool</a> - For pulling down textual content from a URL.</li>
-<li><a href="apidocs/org/apache/velocity/tools/view/LinkTool.html">LinkTool</a> - For easy building of URLs (both relative or absolute).</li>
-<li><a href="apidocs/org/apache/velocity/tools/view/PagerTool.html">PagerTool</a> - For doing request-based pagination of items in an arbitrary list.</li>
-<li><a href="apidocs/org/apache/velocity/tools/view/ParameterTool.html">ParameterTool</a> - For easy retrieval and parsing of ServletRequest parameters.</li>
-<li><a href="apidocs/org/apache/velocity/tools/view/ViewContextTool.html">ViewContextTool</a> - For convenient access to ViewContext data and meta-data.</li>
-</ul>
+<p>Please consult the <a href="tools-summary.html">Standard Tools</a> page for a list of standard view tools.</p>
<h2 id="examples">Examples<a class="headerlink" href="#examples" title="Permanent link">¶</a></h2>
<p>In the VelocityTools sources tree, you will find three examples:</p>
<ul>
diff --git a/tools/3.1/changes.html b/tools/3.1/changes.html
index 2771691..786992a 100644
--- a/tools/3.1/changes.html
+++ b/tools/3.1/changes.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.1/config-java.html b/tools/3.1/config-java.html
index d3ad576..cf08e52 100644
--- a/tools/3.1/config-java.html
+++ b/tools/3.1/config-java.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.1/config-properties.html b/tools/3.1/config-properties.html
index d126c15..b8dc71a 100644
--- a/tools/3.1/config-properties.html
+++ b/tools/3.1/config-properties.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.1/config-xml.html b/tools/3.1/config-xml.html
index cc102b8..501ac18 100644
--- a/tools/3.1/config-xml.html
+++ b/tools/3.1/config-xml.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.1/configuration.html b/tools/3.1/configuration.html
index f756219..bdf6277 100644
--- a/tools/3.1/configuration.html
+++ b/tools/3.1/configuration.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.1/contributions.html b/tools/3.1/contributions.html
index a11253a..77c5d60 100644
--- a/tools/3.1/contributions.html
+++ b/tools/3.1/contributions.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.1/contributions/FeedTool.html b/tools/3.1/contributions/FeedTool.html
index e9a10b2..7644aad 100644
--- a/tools/3.1/contributions/FeedTool.html
+++ b/tools/3.1/contributions/FeedTool.html
@@ -158,35 +158,35 @@
h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
<h2 id="velocity-tools">Velocity Tools<a class="headerlink" href="#velocity-tools" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="index.html">Overview</a></li>
-<li><a href="/download.cgi#tools">Download</a></li>
+<li><a href="../index.html">Overview</a></li>
+<li><a href="..//download.cgi#tools">Download</a></li>
</ul>
<h2 id="subprojects">Subprojects<a class="headerlink" href="#subprojects" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="generic.html">GenericTools</a></li>
-<li><a href="view.html">VelocityView</a></li>
+<li><a href="../generic.html">GenericTools</a></li>
+<li><a href="../view.html">VelocityView</a></li>
</ul>
<h2 id="docs">Docs<a class="headerlink" href="#docs" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="tools-summary.html">Standard Tools</a></li>
-<li><a href="apidocs/index.html">Javadoc</a></li>
-<li><a href="upgrading.html">Upgrading</a></li>
-<li><a href="configuration.html">Configuration</a></li>
-<li><a href="standalone.html">Standalone Use</a></li>
-<li><a href="frameworks.html">Web Integration</a></li>
-<li><a href="creating-tools.html">Creating Tools</a></li>
-<li><a href="contributions.html">Contributions</a></li>
+<li><a href="../tools-summary.html">Standard Tools</a></li>
+<li><a href="../apidocs/index.html">Javadoc</a></li>
+<li><a href="../upgrading.html">Upgrading</a></li>
+<li><a href="../configuration.html">Configuration</a></li>
+<li><a href="../standalone.html">Standalone Use</a></li>
+<li><a href="../frameworks.html">Web Integration</a></li>
+<li><a href="../creating-tools.html">Creating Tools</a></li>
+<li><a href="../contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="changes.html">Changes</a></li>
-<li><a href="dependencies.html">Dependencies</a></li>
-<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="../changes.html">Changes</a></li>
+<li><a href="../dependencies.html">Dependencies</a></li>
+<li><a href="/index.html#helping-out">Participating</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.1/creating-tools.html b/tools/3.1/creating-tools.html
index 3ca24b9..0d134c0 100644
--- a/tools/3.1/creating-tools.html
+++ b/tools/3.1/creating-tools.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.1/dependencies.html b/tools/3.1/dependencies.html
index 9a80f27..b5498a2 100644
--- a/tools/3.1/dependencies.html
+++ b/tools/3.1/dependencies.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.1/frameworks.html b/tools/3.1/frameworks.html
index 1ccb617..048becd 100644
--- a/tools/3.1/frameworks.html
+++ b/tools/3.1/frameworks.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.1/generic.html b/tools/3.1/generic.html
index 563e3b2..090ce80 100644
--- a/tools/3.1/generic.html
+++ b/tools/3.1/generic.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
@@ -220,7 +220,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
</pre></div>
-<p>Otherwise, see the <a href="/download.html#tools">download page</a> for how to get the Velocity Generic Tools jar.</p>
+<p>Otherwise, see the <a href="/download.cgi#tools">download page</a> for how to get the Velocity Generic Tools jar.</p>
<h2 id="usage">Usage<a class="headerlink" href="#usage" title="Permanent link">¶</a></h2>
<ul>
<li>
@@ -282,25 +282,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<h2 id="dependencies">Dependencies<a class="headerlink" href="#dependencies" title="Permanent link">¶</a></h2>
<p>The dependencies required for GenericTools vary somewhat depending on which tools you use, whether you will rely on core tool management infrastructure, and if so, how you choose to configure your toolbox. More details can be found on the <a href="dependencies.html#GenericTools">dependencies chart</a>.</p>
<h2 id="tools">Tools<a class="headerlink" href="#tools" title="Permanent link">¶</a></h2>
-<ul>
-<li><a href="apidocs/org/apache/velocity/tools/generic/AlternatorTool.html">AlternatorTool</a> - For creating <a href="apidocs/org/apache/velocity/tools/generic/Alternator.html">Alternator</a>s to easily alternate over a set of values.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/ClassTool.html">ClassTool</a> - For simplifying reflective lookup of information about Classes and their fields, methods and constructors.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/ContextTool.html">ContextTool</a> - For convenient access to Context data and meta-data.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/ConversionTool.html">ConversionTool</a> - For converting String values to richer object types.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/DateTool.html">DateTool</a> & <a href="apidocs/org/apache/velocity/tools/generic/ComparisonDateTool.html">ComparisonDateTool</a> - For manipulating, formatting, and comparing dates.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/DisplayTool.html">DisplayTool</a> - For controlling display of references (e.g. truncating values, "pretty printing" lists, and displaying alternates when a reference is null).</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/EscapeTool.html">EscapeTool</a> - For common escaping needs in Velocity templates (e.g. escaping html, xml, javascript etc.).</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/FieldTool.html">FieldTool</a> - For (easy) access to static fields in a class, such as string constants.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/LoopTool.html">LoopTool</a> - A convenience tool to use with #foreach loops. It wraps a list with a custom iterator to provide greater control, allowing loops to end early, skip ahead and more.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/LinkTool.html">LinkTool</a> - For creating and manipulating URIs and URLs. The API for this tool is designed to closely resemble that of the VelocityView tool of the same name.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/ListTool.html">ListTool</a> - For working with arrays and lists, treats both transparently the same.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/MathTool.html">MathTool</a> - For performing math functions.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/NumberTool.html">NumberTool</a> - For formatting and converting numbers.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/RenderTool.html">RenderTool</a> - To evaluate and render arbitrary strings of VTL, including recursive rendering.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/ResourceTool.html">ResourceTool</a> - For simplified access to ResourceBundles for internationalization or other dynamic content needs.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/SortTool.html">SortTool</a> - Used to sort collections (or arrays, iterators, etc) on any arbitary set of properties exposed by the objects contained within the collection.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/XmlTool.html">XmlTool</a> - For reading/navigating XML files. This uses dom4j under the covers and provides complete XPath support.</li>
-</ul></div></div>
+<p>Please consult the <a href="tools-summary.html">Standard Tools</a> page for a list of standard generic tools.</p></div></div>
<hr/>
<div id="copyright">
Copyright © 2020 The Apache Software Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
diff --git a/tools/3.1/index.html b/tools/3.1/index.html
index 37a85c6..c3fcf94 100644
--- a/tools/3.1/index.html
+++ b/tools/3.1/index.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.1/standalone.html b/tools/3.1/standalone.html
index 77b21df..08bca36 100644
--- a/tools/3.1/standalone.html
+++ b/tools/3.1/standalone.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.1/tools-summary.html b/tools/3.1/tools-summary.html
index 6bf04b0..9813c3e 100644
--- a/tools/3.1/tools-summary.html
+++ b/tools/3.1/tools-summary.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.1/upgrading.html b/tools/3.1/upgrading.html
index cbc4026..b256c9a 100644
--- a/tools/3.1/upgrading.html
+++ b/tools/3.1/upgrading.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
@@ -269,7 +269,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li>VelocityLayoutServlet, it is now at <a href="apidocs/org/apache/velocity/tools/view/VelocityLayoutServlet.html">org.apache.velocity.tools.view.VelocityLayoutServlet</a></li>
<li>WebappLoader, it is now at <a href="apidocs/org/apache/velocity/tools/view/WebappResourceLoader.html">org.apache.velocity.tools.view.WebappResourceLoader</a></li>
<li>ViewContext, it is now at <a href="apidocs/org/apache/velocity/tools/view/ViewContext.html">org.apache.velocity.tools.view.ViewContext</a></li>
-<li>ServletLogger, it has been replaced by <a href="apidocs/org/apache/velocity/tools/view/ServletLogChute.html">org.apache.velocity.tools.view.ServletLogChute</a></li>
+<li>ServletLogger, it has been replaced by org.apache.velocity.tools.view.ServletLogChute</li>
<li>ServletUtils, it is now at <a href="apidocs/org/apache/velocity/tools/view/ServletUtils.html">org.apache.velocity.tools.view.ServletUtils</a></li>
<li>BrowserSniffer, it is now at <a href="apidocs/org/apache/velocity/tools/view/BrowserTool.html">org.apache.velocity.tools.view.BrowserTool</a></li>
<li>AbstractPagerTool, it is now at <a href="apidocs/org/apache/velocity/tools/view/PagerTool.html">org.apache.velocity.tools.view.PagerTool</a></li>
@@ -321,7 +321,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<h3 id="custom-tools-in-20">Custom Tools in 2.0<a class="headerlink" href="#custom-tools-in-20" title="Permanent link">¶</a></h3>
<p>Those of you who write your own custom tools may want to make a few changes to upgrade your custom tools to do things the "Tools 2 way". Here's a few quick starts for that, though this doesn't cover everything. More details can be found in the <a href="creating-tools.html">instructions for creating tools</a>.</p>
<p><strong>Naming:</strong> The recommended practice is to give a tool to be used as <code>$foo</code> the name <code>FooTool</code> . This is not required but is a convention that keeps things easy follow and learn. If you have to name a tool FooBarUtility but want it to be <code>$foo</code> in templates, the second best thing is to provide a <a href="apidocs/org/apache/velocity/tools/config/DefaultKey.html"><code>@DefaultKey("foo")</code></a> annotation on the class, though this intro [...]
-<p><strong>Scoping:</strong> If your tool is only meant to be used in a particular scope, it's recommended that you give the class a <a href="apidocs/org/apache/velocity/tools/config/ValidScope.html"><code>@ValidScope(Scope.REQUEST)</code></a> annotation as well. If you only want to ban a particular scope and allow all others, you could provide a <a href="apidocs/org/apache/velocity/tools/config/InvalidScope.html"><code>@InvalidScope(Scope.APPLICATION)</code></a> annotation on the class. [...]
+<p><strong>Scoping:</strong> If your tool is only meant to be used in a particular scope, it's recommended that you give the class a <a href="apidocs/org/apache/velocity/tools/config/ValidScope.html"><code>@ValidScope(Scope.REQUEST)</code></a> annotation as well. If you only want to ban a particular scope and allow all others, you could provide a <code>@InvalidScope(Scope.APPLICATION)</code> annotation on the class. The <a href="apidocs/org/apache/velocity/tools/Scope.html"><code>Scope</ [...]
<p><strong>Configuration:</strong> If you have a configurable tool whose configuration should not changed by the templates which use it, then consider having your tool extend the <a href="apidocs/org/apache/velocity/tools/generic/SafeConfig.html">SafeConfig</a> class (or <a href="apidocs/org/apache/velocity/tools/generic/FormatConfig.html">FormatConfig</a> or <a href="apidocs/org/apache/velocity/tools/generic/LocaleConfig.html">LocaleConfig</a>). These safely standardize configuration of [...]
<h2 id="upgrading-to-14">Upgrading to 1.4<a class="headerlink" href="#upgrading-to-14" title="Permanent link">¶</a></h2>
<p>This is unfinished. <a href="index.html#Contribution">You can help fix that!</a></p></div></div>
diff --git a/tools/3.1/view-layoutservlet.html b/tools/3.1/view-layoutservlet.html
index 6add5db..17adade 100644
--- a/tools/3.1/view-layoutservlet.html
+++ b/tools/3.1/view-layoutservlet.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
@@ -212,7 +212,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<p>This is an extension to the basic VelocityViewServlet. It provides a simple layout control and customizable error screens for Velocity Tools based projects. VelocityTools is distributed with an example app demonstrating the use of this servlet.</p>
<h2 id="installation">Installation<a class="headerlink" href="#installation" title="Permanent link">¶</a></h2>
<p>Since this class is an extension of the VelocityViewServlet (VVS), to use it simply change the servlet-class value of the web.xml entry to the following class:</p>
-<p><a href="apidocs/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.html">org.apache.velocity.tools.view.servlet.VelocityLayoutServlet</a></p>
+<p><a href="apidocs/org/apache/velocity/tools/view/VelocityLayoutServlet.html">org.apache.velocity.tools.view.servlet.VelocityLayoutServlet</a></p>
<h2 id="configuration-settings">Configuration Settings<a class="headerlink" href="#configuration-settings" title="Permanent link">¶</a></h2>
<p>Three settings can be added to velocity.properties to control the VLS, or the following default values will be used:</p>
<div class="codehilite"><pre><span class="c"># Filepath for error template,</span>
diff --git a/tools/3.1/view-servlet.html b/tools/3.1/view-servlet.html
index c4393c2..918238a 100644
--- a/tools/3.1/view-servlet.html
+++ b/tools/3.1/view-servlet.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.1/view-tag.html b/tools/3.1/view-tag.html
index 7e70133..facf29d 100644
--- a/tools/3.1/view-tag.html
+++ b/tools/3.1/view-tag.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/3.1/view.html b/tools/3.1/view.html
index 6085394..050ca3a 100644
--- a/tools/3.1/view.html
+++ b/tools/3.1/view.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
@@ -228,7 +228,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
</pre></div>
-<p>Otherwise, see the <a href="/download.html#tools">download page</a> for how to get the Velocity View Tools jar.</p>
+<p>Otherwise, see the <a href="/download.cgi#tools">download page</a> for how to get the Velocity View Tools jar.</p>
<h2 id="default-configuration">Default Configuration<a class="headerlink" href="#default-configuration" title="Permanent link">¶</a></h2>
<p>The default configuration provided for VelocityView is <a href="https://github.com/apache/velocity-tools/blob/8e7f20a4/velocity-tools-view/src/main/resources/org/apache/velocity/tools/view/tools.xml">here</a>.</p>
<h2 id="dependencies">Dependencies<a class="headerlink" href="#dependencies" title="Permanent link">¶</a></h2>
@@ -247,16 +247,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<p>Detailed documentation is <a href="view-tag.html">here</a>.</p>
<h2 id="tools">Tools<a class="headerlink" href="#tools" title="Permanent link">¶</a></h2>
<p>These are in addition to those provided by <a href="generic.html#Tools">GenericTools</a>:</p>
-<ul>
-<li><a href="apidocs/org/apache/velocity/tools/view/AbstractSearchTool.html">AbstractSearchTool</a> - For doing "searching" and robust pagination of search results. Requires you to create a subclass.</li>
-<li><a href="apidocs/org/apache/velocity/tools/view/BrowserTool.html">BrowserTool</a> - For identifying the browser and features thereof requesting the template.</li>
-<li><a href="apidocs/org/apache/velocity/tools/view/CookieTool.html">CookieTool</a> - For convenient cookie access and creation.</li>
-<li><a href="apidocs/org/apache/velocity/tools/view/ImportTool.html">ImportTool</a> - For pulling down textual content from a URL.</li>
-<li><a href="apidocs/org/apache/velocity/tools/view/LinkTool.html">LinkTool</a> - For easy building of URLs (both relative or absolute).</li>
-<li><a href="apidocs/org/apache/velocity/tools/view/PagerTool.html">PagerTool</a> - For doing request-based pagination of items in an arbitrary list.</li>
-<li><a href="apidocs/org/apache/velocity/tools/view/ParameterTool.html">ParameterTool</a> - For easy retrieval and parsing of ServletRequest parameters.</li>
-<li><a href="apidocs/org/apache/velocity/tools/view/ViewContextTool.html">ViewContextTool</a> - For convenient access to ViewContext data and meta-data.</li>
-</ul>
+<p>Please consult the <a href="tools-summary.html">Standard Tools</a> page for a list of standard view tools.</p>
<h2 id="examples">Examples<a class="headerlink" href="#examples" title="Permanent link">¶</a></h2>
<p>In the VelocityTools sources tree, you will find three examples:</p>
<ul>
diff --git a/tools/devel/changes.html b/tools/devel/changes.html
index ca7b52d..4395849 100644
--- a/tools/devel/changes.html
+++ b/tools/devel/changes.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/devel/config-java.html b/tools/devel/config-java.html
index d76b31b..46f01e3 100644
--- a/tools/devel/config-java.html
+++ b/tools/devel/config-java.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/devel/config-properties.html b/tools/devel/config-properties.html
index 1e58df9..b797961 100644
--- a/tools/devel/config-properties.html
+++ b/tools/devel/config-properties.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/devel/config-xml.html b/tools/devel/config-xml.html
index 92713ad..3299bbb 100644
--- a/tools/devel/config-xml.html
+++ b/tools/devel/config-xml.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/devel/configuration.html b/tools/devel/configuration.html
index 517bd90..7ce91f6 100644
--- a/tools/devel/configuration.html
+++ b/tools/devel/configuration.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/devel/contributions.html b/tools/devel/contributions.html
index 44b7380..11072f3 100644
--- a/tools/devel/contributions.html
+++ b/tools/devel/contributions.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/devel/contributions/FeedTool.html b/tools/devel/contributions/FeedTool.html
index 59220f7..7b3c151 100644
--- a/tools/devel/contributions/FeedTool.html
+++ b/tools/devel/contributions/FeedTool.html
@@ -158,35 +158,35 @@
h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
<h2 id="velocity-tools">Velocity Tools<a class="headerlink" href="#velocity-tools" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="index.html">Overview</a></li>
-<li><a href="/download.cgi#tools">Download</a></li>
+<li><a href="../index.html">Overview</a></li>
+<li><a href="..//download.cgi#tools">Download</a></li>
</ul>
<h2 id="subprojects">Subprojects<a class="headerlink" href="#subprojects" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="generic.html">GenericTools</a></li>
-<li><a href="view.html">VelocityView</a></li>
+<li><a href="../generic.html">GenericTools</a></li>
+<li><a href="../view.html">VelocityView</a></li>
</ul>
<h2 id="docs">Docs<a class="headerlink" href="#docs" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="tools-summary.html">Standard Tools</a></li>
-<li><a href="apidocs/index.html">Javadoc</a></li>
-<li><a href="upgrading.html">Upgrading</a></li>
-<li><a href="configuration.html">Configuration</a></li>
-<li><a href="standalone.html">Standalone Use</a></li>
-<li><a href="frameworks.html">Web Integration</a></li>
-<li><a href="creating-tools.html">Creating Tools</a></li>
-<li><a href="contributions.html">Contributions</a></li>
+<li><a href="../tools-summary.html">Standard Tools</a></li>
+<li><a href="../apidocs/index.html">Javadoc</a></li>
+<li><a href="../upgrading.html">Upgrading</a></li>
+<li><a href="../configuration.html">Configuration</a></li>
+<li><a href="../standalone.html">Standalone Use</a></li>
+<li><a href="../frameworks.html">Web Integration</a></li>
+<li><a href="../creating-tools.html">Creating Tools</a></li>
+<li><a href="../contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
-<li><a href="changes.html">Changes</a></li>
-<li><a href="dependencies.html">Dependencies</a></li>
-<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="../changes.html">Changes</a></li>
+<li><a href="../dependencies.html">Dependencies</a></li>
+<li><a href="/index.html#helping-out">Participating</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/devel/creating-tools.html b/tools/devel/creating-tools.html
index 5b5e7a9..f996c30 100644
--- a/tools/devel/creating-tools.html
+++ b/tools/devel/creating-tools.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/devel/dependencies.html b/tools/devel/dependencies.html
index 0ed04b0..d6ccdf5 100644
--- a/tools/devel/dependencies.html
+++ b/tools/devel/dependencies.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/devel/frameworks.html b/tools/devel/frameworks.html
index d8c7a73..24c8bb4 100644
--- a/tools/devel/frameworks.html
+++ b/tools/devel/frameworks.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/devel/generic.html b/tools/devel/generic.html
index a6db972..ca48665 100644
--- a/tools/devel/generic.html
+++ b/tools/devel/generic.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
@@ -220,7 +220,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
</pre></div>
-<p>Otherwise, see the <a href="/download.html#tools">download page</a> for how to get the Velocity Generic Tools jar.</p>
+<p>Otherwise, see the <a href="/download.cgi#tools">download page</a> for how to get the Velocity Generic Tools jar.</p>
<h2 id="usage">Usage<a class="headerlink" href="#usage" title="Permanent link">¶</a></h2>
<ul>
<li>
@@ -282,25 +282,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<h2 id="dependencies">Dependencies<a class="headerlink" href="#dependencies" title="Permanent link">¶</a></h2>
<p>The dependencies required for GenericTools vary somewhat depending on which tools you use, whether you will rely on core tool management infrastructure, and if so, how you choose to configure your toolbox. More details can be found on the <a href="dependencies.html#GenericTools">dependencies chart</a>.</p>
<h2 id="tools">Tools<a class="headerlink" href="#tools" title="Permanent link">¶</a></h2>
-<ul>
-<li><a href="apidocs/org/apache/velocity/tools/generic/AlternatorTool.html">AlternatorTool</a> - For creating <a href="apidocs/org/apache/velocity/tools/generic/Alternator.html">Alternator</a>s to easily alternate over a set of values.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/ClassTool.html">ClassTool</a> - For simplifying reflective lookup of information about Classes and their fields, methods and constructors.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/ContextTool.html">ContextTool</a> - For convenient access to Context data and meta-data.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/ConversionTool.html">ConversionTool</a> - For converting String values to richer object types.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/DateTool.html">DateTool</a> & <a href="apidocs/org/apache/velocity/tools/generic/ComparisonDateTool.html">ComparisonDateTool</a> - For manipulating, formatting, and comparing dates.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/DisplayTool.html">DisplayTool</a> - For controlling display of references (e.g. truncating values, "pretty printing" lists, and displaying alternates when a reference is null).</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/EscapeTool.html">EscapeTool</a> - For common escaping needs in Velocity templates (e.g. escaping html, xml, javascript etc.).</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/FieldTool.html">FieldTool</a> - For (easy) access to static fields in a class, such as string constants.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/LoopTool.html">LoopTool</a> - A convenience tool to use with #foreach loops. It wraps a list with a custom iterator to provide greater control, allowing loops to end early, skip ahead and more.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/LinkTool.html">LinkTool</a> - For creating and manipulating URIs and URLs. The API for this tool is designed to closely resemble that of the VelocityView tool of the same name.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/ListTool.html">ListTool</a> - For working with arrays and lists, treats both transparently the same.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/MathTool.html">MathTool</a> - For performing math functions.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/NumberTool.html">NumberTool</a> - For formatting and converting numbers.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/RenderTool.html">RenderTool</a> - To evaluate and render arbitrary strings of VTL, including recursive rendering.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/ResourceTool.html">ResourceTool</a> - For simplified access to ResourceBundles for internationalization or other dynamic content needs.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/SortTool.html">SortTool</a> - Used to sort collections (or arrays, iterators, etc) on any arbitary set of properties exposed by the objects contained within the collection.</li>
-<li><a href="apidocs/org/apache/velocity/tools/generic/XmlTool.html">XmlTool</a> - For reading/navigating XML files. This uses dom4j under the covers and provides complete XPath support.</li>
-</ul></div></div>
+<p>Please consult the <a href="tools-summary.html">Standard Tools</a> page for a list of standard generic tools.</p></div></div>
<hr/>
<div id="copyright">
Copyright © 2020 The Apache Software Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
diff --git a/tools/devel/index.html b/tools/devel/index.html
index 8af9e51..38cdb60 100644
--- a/tools/devel/index.html
+++ b/tools/devel/index.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/devel/standalone.html b/tools/devel/standalone.html
index 5625a38..51a1353 100644
--- a/tools/devel/standalone.html
+++ b/tools/devel/standalone.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/devel/tools-summary.html b/tools/devel/tools-summary.html
index 5da4d0a..6912d8f 100644
--- a/tools/devel/tools-summary.html
+++ b/tools/devel/tools-summary.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/devel/upgrading.html b/tools/devel/upgrading.html
index 84591a8..b08f782 100644
--- a/tools/devel/upgrading.html
+++ b/tools/devel/upgrading.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
@@ -269,7 +269,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li>VelocityLayoutServlet, it is now at <a href="apidocs/org/apache/velocity/tools/view/VelocityLayoutServlet.html">org.apache.velocity.tools.view.VelocityLayoutServlet</a></li>
<li>WebappLoader, it is now at <a href="apidocs/org/apache/velocity/tools/view/WebappResourceLoader.html">org.apache.velocity.tools.view.WebappResourceLoader</a></li>
<li>ViewContext, it is now at <a href="apidocs/org/apache/velocity/tools/view/ViewContext.html">org.apache.velocity.tools.view.ViewContext</a></li>
-<li>ServletLogger, it has been replaced by <a href="apidocs/org/apache/velocity/tools/view/ServletLogChute.html">org.apache.velocity.tools.view.ServletLogChute</a></li>
+<li>ServletLogger, it has been replaced by org.apache.velocity.tools.view.ServletLogChute</li>
<li>ServletUtils, it is now at <a href="apidocs/org/apache/velocity/tools/view/ServletUtils.html">org.apache.velocity.tools.view.ServletUtils</a></li>
<li>BrowserSniffer, it is now at <a href="apidocs/org/apache/velocity/tools/view/BrowserTool.html">org.apache.velocity.tools.view.BrowserTool</a></li>
<li>AbstractPagerTool, it is now at <a href="apidocs/org/apache/velocity/tools/view/PagerTool.html">org.apache.velocity.tools.view.PagerTool</a></li>
@@ -321,7 +321,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<h3 id="custom-tools-in-20">Custom Tools in 2.0<a class="headerlink" href="#custom-tools-in-20" title="Permanent link">¶</a></h3>
<p>Those of you who write your own custom tools may want to make a few changes to upgrade your custom tools to do things the "Tools 2 way". Here's a few quick starts for that, though this doesn't cover everything. More details can be found in the <a href="creating-tools.html">instructions for creating tools</a>.</p>
<p><strong>Naming:</strong> The recommended practice is to give a tool to be used as <code>$foo</code> the name <code>FooTool</code> . This is not required but is a convention that keeps things easy follow and learn. If you have to name a tool FooBarUtility but want it to be <code>$foo</code> in templates, the second best thing is to provide a <a href="apidocs/org/apache/velocity/tools/config/DefaultKey.html"><code>@DefaultKey("foo")</code></a> annotation on the class, though this intro [...]
-<p><strong>Scoping:</strong> If your tool is only meant to be used in a particular scope, it's recommended that you give the class a <a href="apidocs/org/apache/velocity/tools/config/ValidScope.html"><code>@ValidScope(Scope.REQUEST)</code></a> annotation as well. If you only want to ban a particular scope and allow all others, you could provide a <a href="apidocs/org/apache/velocity/tools/config/InvalidScope.html"><code>@InvalidScope(Scope.APPLICATION)</code></a> annotation on the class. [...]
+<p><strong>Scoping:</strong> If your tool is only meant to be used in a particular scope, it's recommended that you give the class a <a href="apidocs/org/apache/velocity/tools/config/ValidScope.html"><code>@ValidScope(Scope.REQUEST)</code></a> annotation as well. If you only want to ban a particular scope and allow all others, you could provide a <code>@InvalidScope(Scope.APPLICATION)</code> annotation on the class. The <a href="apidocs/org/apache/velocity/tools/Scope.html"><code>Scope</ [...]
<p><strong>Configuration:</strong> If you have a configurable tool whose configuration should not changed by the templates which use it, then consider having your tool extend the <a href="apidocs/org/apache/velocity/tools/generic/SafeConfig.html">SafeConfig</a> class (or <a href="apidocs/org/apache/velocity/tools/generic/FormatConfig.html">FormatConfig</a> or <a href="apidocs/org/apache/velocity/tools/generic/LocaleConfig.html">LocaleConfig</a>). These safely standardize configuration of [...]
<h2 id="upgrading-to-14">Upgrading to 1.4<a class="headerlink" href="#upgrading-to-14" title="Permanent link">¶</a></h2>
<p>This is unfinished. <a href="index.html#Contribution">You can help fix that!</a></p></div></div>
diff --git a/tools/devel/view-layoutservlet.html b/tools/devel/view-layoutservlet.html
index 924ae49..d475053 100644
--- a/tools/devel/view-layoutservlet.html
+++ b/tools/devel/view-layoutservlet.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
@@ -212,7 +212,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<p>This is an extension to the basic VelocityViewServlet. It provides a simple layout control and customizable error screens for Velocity Tools based projects. VelocityTools is distributed with an example app demonstrating the use of this servlet.</p>
<h2 id="installation">Installation<a class="headerlink" href="#installation" title="Permanent link">¶</a></h2>
<p>Since this class is an extension of the VelocityViewServlet (VVS), to use it simply change the servlet-class value of the web.xml entry to the following class:</p>
-<p><a href="apidocs/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.html">org.apache.velocity.tools.view.servlet.VelocityLayoutServlet</a></p>
+<p><a href="apidocs/org/apache/velocity/tools/view/VelocityLayoutServlet.html">org.apache.velocity.tools.view.servlet.VelocityLayoutServlet</a></p>
<h2 id="configuration-settings">Configuration Settings<a class="headerlink" href="#configuration-settings" title="Permanent link">¶</a></h2>
<p>Three settings can be added to velocity.properties to control the VLS, or the following default values will be used:</p>
<div class="codehilite"><pre><span class="c"># Filepath for error template,</span>
diff --git a/tools/devel/view-servlet.html b/tools/devel/view-servlet.html
index 274076f..0b2616d 100644
--- a/tools/devel/view-servlet.html
+++ b/tools/devel/view-servlet.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/devel/view-tag.html b/tools/devel/view-tag.html
index e8d4d5a..5750c17 100644
--- a/tools/devel/view-tag.html
+++ b/tools/devel/view-tag.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
diff --git a/tools/devel/view.html b/tools/devel/view.html
index e32d7a1..f2d3536 100644
--- a/tools/devel/view.html
+++ b/tools/devel/view.html
@@ -177,16 +177,16 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="creating-tools.html">Creating Tools</a></li>
<li><a href="contributions.html">Contributions</a></li>
<li><a href="/engine/devel/glossary.html">Glossary</a></li>
-<li><a href="http://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
-<li><a href="http://wiki.apache.org/velocity/">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity/VelocityFAQ">FAQ</a></li>
+<li><a href="https://wiki.apache.org/velocity/">Wiki</a></li>
</ul>
<h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h2>
<ul>
<li><a href="changes.html">Changes</a></li>
<li><a href="dependencies.html">Dependencies</a></li>
<li><a href="index.html#helping-out">Participating</a></li>
-<li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
-<li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
+<li><a href="/download.cgi#tools">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
</ul>
<div id="bottom-nav">
@@ -228,7 +228,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
</pre></div>
-<p>Otherwise, see the <a href="/download.html#tools">download page</a> for how to get the Velocity View Tools jar.</p>
+<p>Otherwise, see the <a href="/download.cgi#tools">download page</a> for how to get the Velocity View Tools jar.</p>
<h2 id="default-configuration">Default Configuration<a class="headerlink" href="#default-configuration" title="Permanent link">¶</a></h2>
<p>The default configuration provided for VelocityView is <a href="https://github.com/apache/velocity-tools/blob/master/velocity-tools-view/src/main/resources/org/apache/velocity/tools/view/tools.xml">here</a>.</p>
<h2 id="dependencies">Dependencies<a class="headerlink" href="#dependencies" title="Permanent link">¶</a></h2>
@@ -246,17 +246,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<p>This is a JSP tag that allows you to use Velocity and VelocityTools from within your JSP tags and files. This tag can both process templates in separate files, VTL in the tag body, or combine the two.</p>
<p>Detailed documentation is <a href="view-tag.html">here</a>.</p>
<h2 id="tools">Tools<a class="headerlink" href="#tools" title="Permanent link">¶</a></h2>
-<p>These are in addition to those provided by <a href="generic.html#Tools">GenericTools</a>:</p>
-<ul>
-<li><a href="apidocs/org/apache/velocity/tools/view/AbstractSearchTool.html">AbstractSearchTool</a> - For doing "searching" and robust pagination of search results. Requires you to create a subclass.</li>
-<li><a href="apidocs/org/apache/velocity/tools/view/BrowserTool.html">BrowserTool</a> - For identifying the browser and features thereof requesting the template.</li>
-<li><a href="apidocs/org/apache/velocity/tools/view/CookieTool.html">CookieTool</a> - For convenient cookie access and creation.</li>
-<li><a href="apidocs/org/apache/velocity/tools/view/ImportTool.html">ImportTool</a> - For pulling down textual content from a URL.</li>
-<li><a href="apidocs/org/apache/velocity/tools/view/LinkTool.html">LinkTool</a> - For easy building of URLs (both relative or absolute).</li>
-<li><a href="apidocs/org/apache/velocity/tools/view/PagerTool.html">PagerTool</a> - For doing request-based pagination of items in an arbitrary list.</li>
-<li><a href="apidocs/org/apache/velocity/tools/view/ParameterTool.html">ParameterTool</a> - For easy retrieval and parsing of ServletRequest parameters.</li>
-<li><a href="apidocs/org/apache/velocity/tools/view/ViewContextTool.html">ViewContextTool</a> - For convenient access to ViewContext data and meta-data.</li>
-</ul>
+<p>Please consult the <a href="tools-summary.html">Standard Tools</a> page for a list of standard view tools.</p>
<h2 id="examples">Examples<a class="headerlink" href="#examples" title="Permanent link">¶</a></h2>
<p>In the VelocityTools sources tree, you will find three examples:</p>
<ul>
diff --git a/tools/index.html b/tools/index.html
index 7880923..be9db66 100644
--- a/tools/index.html
+++ b/tools/index.html
@@ -177,7 +177,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="/who-we-are.html">Who we are</a></li>
<li><a href="/contact.html">Contact us</a></li>
<li><a href="/get-involved.html">Get involved</a></li>
-<li><a href="https://wiki.apache.org/velocity/velocity">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity">Wiki</a></li>
<li><a href="/how-it-works.html">How it works</a></li>
<li><a href="https://whimsy.apache.org/board/minutes/Velocity.html">Board Reports</a></li>
</ul>
diff --git a/who-we-are.html b/who-we-are.html
index a848dc8..275bffb 100644
--- a/who-we-are.html
+++ b/who-we-are.html
@@ -175,7 +175,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
<li><a href="/who-we-are.html">Who we are</a></li>
<li><a href="/contact.html">Contact us</a></li>
<li><a href="/get-involved.html">Get involved</a></li>
-<li><a href="https://wiki.apache.org/velocity/velocity">Wiki</a></li>
+<li><a href="https://wiki.apache.org/velocity">Wiki</a></li>
<li><a href="/how-it-works.html">How it works</a></li>
<li><a href="https://whimsy.apache.org/board/minutes/Velocity.html">Board Reports</a></li>
</ul>