[velocity-site] branch main updated: [site] More broken links fixes

cbrisson Mon, 08 Mar 2021 15:43:02 -0800

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

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



The following commit(s) were added to refs/heads/main by this push:
     new 1ad9035  [site] More broken links fixes
1ad9035 is described below

commit 1ad90353ad38161e45d04bb60926da735c9a85a7
Author: Claude Brisson <[email protected]>
AuthorDate: Tue Mar 9 00:42:50 2021 +0100

    [site] More broken links fixes
---
 src/content/engine/1.5/index.html                 |  2 +-
 src/content/engine/1.6.1/index.html               |  2 +-
 src/content/engine/1.6.2/index.html               |  2 +-
 src/content/engine/1.6/index.html                 |  2 +-
 src/content/engine/1.7/index.mdtext               |  2 +-
 src/content/engine/2.0/developer-guide.mdtext     |  2 --
 src/content/engine/2.0/index.mdtext               |  2 +-
 src/content/engine/2.0/left.nav                   | 15 +++++++-------
 src/content/engine/2.0/webapps.mdtext             |  2 +-
 src/content/engine/2.1/developer-guide.mdtext     |  2 --
 src/content/engine/2.1/index.mdtext               |  2 +-
 src/content/engine/2.1/left.nav                   | 15 +++++++-------
 src/content/engine/2.1/webapps.mdtext             |  2 +-
 src/content/engine/2.2/developer-guide.mdtext     |  2 --
 src/content/engine/2.2/index.mdtext               |  2 +-
 src/content/engine/2.2/left.nav                   | 15 +++++++-------
 src/content/engine/2.2/webapps.mdtext             |  4 ++--
 src/content/engine/2.3/index.mdtext               |  2 +-
 src/content/engine/2.3/left.nav                   | 15 +++++++-------
 src/content/engine/2.3/webapps.mdtext             |  4 ++--
 src/content/engine/devel/developer-guide.mdtext   |  2 --
 src/content/engine/devel/index.mdtext             |  2 +-
 src/content/engine/devel/left.nav                 | 15 +++++++-------
 src/content/engine/devel/webapps.mdtext           |  4 ++--
 src/content/index.mdtext                          |  2 +-
 src/content/left.nav                              |  2 +-
 src/content/news.xml                              |  4 ++--
 src/content/release-process.mdtext                |  5 +++--
 src/content/tools/3.0/contributions/left.nav      | 24 +++++++++++++++++++++++
 src/content/tools/3.0/generic.mdtext              | 20 ++-----------------
 src/content/tools/3.0/left.nav                    |  8 ++++----
 src/content/tools/3.0/upgrading.mdtext            |  4 ++--
 src/content/tools/3.0/view-layoutservlet.mdtext   |  2 +-
 src/content/tools/3.0/view.mdtext                 | 11 ++---------
 src/content/tools/3.1/contributions/left.nav      | 24 +++++++++++++++++++++++
 src/content/tools/3.1/generic.mdtext              | 20 ++-----------------
 src/content/tools/3.1/left.nav                    |  8 ++++----
 src/content/tools/3.1/upgrading.mdtext            |  4 ++--
 src/content/tools/3.1/view-layoutservlet.mdtext   |  2 +-
 src/content/tools/3.1/view.mdtext                 | 11 ++---------
 src/content/tools/devel/contributions/left.nav    | 24 +++++++++++++++++++++++
 src/content/tools/devel/generic.mdtext            | 20 ++-----------------
 src/content/tools/devel/left.nav                  |  8 ++++----
 src/content/tools/devel/upgrading.mdtext          |  4 ++--
 src/content/tools/devel/view-layoutservlet.mdtext |  2 +-
 src/content/tools/devel/view.mdtext               | 13 ++----------
 46 files changed, 165 insertions(+), 176 deletions(-)

diff --git a/src/content/engine/1.5/index.html 
b/src/content/engine/1.5/index.html
index 317ec91..a966fb5 100644
--- a/src/content/engine/1.5/index.html
+++ b/src/content/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/src/content/engine/1.6.1/index.html 
b/src/content/engine/1.6.1/index.html
index 77cc5c1..4556d82 100644
--- a/src/content/engine/1.6.1/index.html
+++ b/src/content/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/src/content/engine/1.6.2/index.html 
b/src/content/engine/1.6.2/index.html
index 5ca4ae7..af8d2a3 100644
--- a/src/content/engine/1.6.2/index.html
+++ b/src/content/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/src/content/engine/1.6/index.html 
b/src/content/engine/1.6/index.html
index 8f5a3fa..a72bfa1 100644
--- a/src/content/engine/1.6/index.html
+++ b/src/content/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/src/content/engine/1.7/index.mdtext 
b/src/content/engine/1.7/index.mdtext
index f8d5538..369a532 100644
--- a/src/content/engine/1.7/index.mdtext
+++ b/src/content/engine/1.7/index.mdtext
@@ -36,5 +36,5 @@ The Velocity project appreciates any contributions, including 
documentation help
 
 + Report bugs, ask questions, and help new users on the [Velocity mailing 
lists](http://velocity.apache.org/contact.html).
 + There's a list of issues waiting to be addressed in [our bug 
tracker](https://issues.apache.org/jira/browse/VELOCITY).
-+ [Our wiki](http://wiki.apache.org/velocity/velocity) has a large collection 
of community written content. Add your own article or contribute to the FAQ!
++ [Our wiki](http://wiki.apache.org/velocity) has a large collection of 
community written content. Add your own article or contribute to the FAQ!
 + Read-only access to the Subversion repository is available both 
[online](http://svn.apache.org/repos/asf/velocity/engine/trunk/) and with a 
[Subversion client](http://www.apache.org/dev/version-control.html).
diff --git a/src/content/engine/2.0/developer-guide.mdtext 
b/src/content/engine/2.0/developer-guide.mdtext
index a0de02c..6e43436 100644
--- a/src/content/engine/2.0/developer-guide.mdtext
+++ b/src/content/engine/2.0/developer-guide.mdtext
@@ -1031,8 +1031,6 @@ Here is the list of provided uberspectors (which are 
found in the (org.apache.ve
 > A Chainable uberspector is an uberspector that wraps the previous 
 > uberspector in the introspection chain.
 - 
[LinkingUberspector](apidocs/org/apache/velocity/util/introspection/LinkingUberspector.html)
 > 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.
-- 
[UberspectLoggable](apidocs/org/apache/velocity/util/introspection/UberspectLoggable.html)
 interface
-> When an uberspector implements the UberspectLoggable interface, it is 
provided a logger during initialization via the `setLog(Logger)` method.
 
 If an Uberspector implements the 
[RuntimeServicesAware](apidocs/org/apache/velocity/util/RuntimeServicesAware.html)
 interface, it will be provided a Velocity 
[RuntimeServices](apidocs/org/apache/velocity/runtime/RuntimeServices.html) 
instance during initialization, via the `setRuntimeServices(RuntimeServices)` 
method.
 
diff --git a/src/content/engine/2.0/index.mdtext 
b/src/content/engine/2.0/index.mdtext
index 85b298b..65219d0 100644
--- a/src/content/engine/2.0/index.mdtext
+++ b/src/content/engine/2.0/index.mdtext
@@ -30,5 +30,5 @@ The Velocity project appreciates any contributions, including 
documentation help
 
 + Report bugs, ask questions, and help new users on the [Velocity mailing 
lists](http://velocity.apache.org/contact.html).
 + There's a list of issues waiting to be addressed in [our bug 
tracker](https://issues.apache.org/jira/browse/VELOCITY).
-+ [Our wiki](https://wiki.apache.org/velocity/velocity) has a large collection 
of community written content. Add your own article or contribute to the FAQ!
++ [Our wiki](https://wiki.apache.org/velocity) has a large collection of 
community written content. Add your own article or contribute to the FAQ!
 + Read-only access to the git repository is available both 
[online](https://github.com/apache/velocity-engine) and with a [Git 
client](https://www.apache.org/dev/version-control.html).
diff --git a/src/content/engine/2.0/left.nav b/src/content/engine/2.0/left.nav
index 21339f8..41f9996 100644
--- a/src/content/engine/2.0/left.nav
+++ b/src/content/engine/2.0/left.nav
@@ -20,18 +20,17 @@
 * [Sources](source-repository.html)
 * [Building](build.html)
 * [Issues](https://issues.apache.org/jira/browse/VELOCITY)
-* [Road Map](http://wiki.apache.org/velocity/RoadMap)
-* [Coding Standards](http://wiki.apache.org/velocity/CodeStandards)
-* [Doc Guidelines](http://wiki.apache.org/velocity/DocumentationGuidelines)
+* [Road Map](https://wiki.apache.org/velocity/RoadMap)
+* [Coding Standards](https://wiki.apache.org/velocity/CodeStandards)
+* [Doc Guidelines](https://wiki.apache.org/velocity/DocumentationGuidelines)
 ## Community
-* [Wiki](http://wiki.apache.org/velocity/)
+* [Wiki](https://wiki.apache.org/velocity/)
 * [News](/news.html)
-* [Powered by Velocity](http://wiki.apache.org/velocity/PoweredByVelocity)
-* [IDE/Editor Plugins](http://wiki.apache.org/velocity/VelocityEditors)
-* [Articles and 
Books](http://wiki.apache.org/velocity/PublishedArticlesAndBooks)
+* [Powered by Velocity](https://wiki.apache.org/velocity/PoweredByVelocity)
+* [IDE/Editor Plugins](https://wiki.apache.org/velocity/VelocityEditors)
+* [Articles and 
Books](https://wiki.apache.org/velocity/PublishedArticlesAndBooks)
 * [Mailing Lists](/contact.html)
 ## Translations (outdated)
-* [Site (Japanese)](http://www.jajakarta.org/velocity/)
 * [User's Guide (Finnish)](translations/user-guide_fi.html)
 * [User's Guide (French)](translations/user-guide_fr.html)
 * [User's Guide (Spanish)](translations/user-guide_es.html)
diff --git a/src/content/engine/2.0/webapps.mdtext 
b/src/content/engine/2.0/webapps.mdtext
index cb90f4a..bf6ca36 100644
--- a/src/content/engine/2.0/webapps.mdtext
+++ b/src/content/engine/2.0/webapps.mdtext
@@ -16,7 +16,7 @@ This document provides some basic info on getting started 
with Velocity in a web
 
 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.
 
-1. **Velocity Tools / VelocityViewServlet** - 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 
[VelocityViewServlet](http://velocity.apache.org/tools/devel/view/). 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 context and you are off. More  [...]
+1. **Velocity Tools / VelocityViewServlet** - 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 
[VelocityViewServlet](https://velocity.apache.org/tools/devel/view.html). 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 context and you are off.  [...]
 2. **Velocity Tools / VelocityStruts** - 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 [VelocityStruts](http://velocity.apache.org/tools/devel/struts/) 
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 infrastructure while designi [...]
 3. **Third party frameworks** - There are a number of third party frameworks 
listed on the 
[PoweredByVelocity](http://wiki.apache.org/velocity/PoweredByVelocity) wiki 
page. Of these, [Spring](http://www.springframework.org/) is probably the most 
sophisticated and well known. [Turbine](http://turbine.apache.org/) has many 
features and can also be very useful. It was built with Velocity as the primary 
page language, which is not surprising since many of the original Velocity 
developers wer [...]
 4. **Build your own** - 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.
diff --git a/src/content/engine/2.1/developer-guide.mdtext 
b/src/content/engine/2.1/developer-guide.mdtext
index 0880959..97d0cbe 100644
--- a/src/content/engine/2.1/developer-guide.mdtext
+++ b/src/content/engine/2.1/developer-guide.mdtext
@@ -1037,8 +1037,6 @@ Here is the list of provided uberspectors (which are 
found in the (org.apache.ve
 > A Chainable uberspector is an uberspector that wraps the previous 
 > uberspector in the introspection chain.
 - 
[LinkingUberspector](apidocs/org/apache/velocity/util/introspection/LinkingUberspector.html)
 > 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.
-- 
[UberspectLoggable](apidocs/org/apache/velocity/util/introspection/UberspectLoggable.html)
 interface
-> When an uberspector implements the UberspectLoggable interface, it is 
provided a logger during initialization via the `setLog(Logger)` method.
 
 If an Uberspector implements the 
[RuntimeServicesAware](apidocs/org/apache/velocity/util/RuntimeServicesAware.html)
 interface, it will be provided a Velocity 
[RuntimeServices](apidocs/org/apache/velocity/runtime/RuntimeServices.html) 
instance during initialization, via the `setRuntimeServices(RuntimeServices)` 
method.
 
diff --git a/src/content/engine/2.1/index.mdtext 
b/src/content/engine/2.1/index.mdtext
index c35da4c..d1be10c 100644
--- a/src/content/engine/2.1/index.mdtext
+++ b/src/content/engine/2.1/index.mdtext
@@ -30,5 +30,5 @@ The Velocity project appreciates any contributions, including 
documentation help
 
 + Report bugs, ask questions, and help new users on the [Velocity mailing 
lists](http://velocity.apache.org/contact.html).
 + There's a list of issues waiting to be addressed in [our bug 
tracker](https://issues.apache.org/jira/browse/VELOCITY).
-+ [Our wiki](https://wiki.apache.org/velocity/velocity) has a large collection 
of community written content. Add your own article or contribute to the FAQ!
++ [Our wiki](https://wiki.apache.org/velocity) has a large collection of 
community written content. Add your own article or contribute to the FAQ!
 + Read-only access to the git repository is available both 
[online](https://github.com/apache/velocity-engine) and with a [Git 
client](https://www.apache.org/dev/version-control.html).
diff --git a/src/content/engine/2.1/left.nav b/src/content/engine/2.1/left.nav
index 21339f8..41f9996 100644
--- a/src/content/engine/2.1/left.nav
+++ b/src/content/engine/2.1/left.nav
@@ -20,18 +20,17 @@
 * [Sources](source-repository.html)
 * [Building](build.html)
 * [Issues](https://issues.apache.org/jira/browse/VELOCITY)
-* [Road Map](http://wiki.apache.org/velocity/RoadMap)
-* [Coding Standards](http://wiki.apache.org/velocity/CodeStandards)
-* [Doc Guidelines](http://wiki.apache.org/velocity/DocumentationGuidelines)
+* [Road Map](https://wiki.apache.org/velocity/RoadMap)
+* [Coding Standards](https://wiki.apache.org/velocity/CodeStandards)
+* [Doc Guidelines](https://wiki.apache.org/velocity/DocumentationGuidelines)
 ## Community
-* [Wiki](http://wiki.apache.org/velocity/)
+* [Wiki](https://wiki.apache.org/velocity/)
 * [News](/news.html)
-* [Powered by Velocity](http://wiki.apache.org/velocity/PoweredByVelocity)
-* [IDE/Editor Plugins](http://wiki.apache.org/velocity/VelocityEditors)
-* [Articles and 
Books](http://wiki.apache.org/velocity/PublishedArticlesAndBooks)
+* [Powered by Velocity](https://wiki.apache.org/velocity/PoweredByVelocity)
+* [IDE/Editor Plugins](https://wiki.apache.org/velocity/VelocityEditors)
+* [Articles and 
Books](https://wiki.apache.org/velocity/PublishedArticlesAndBooks)
 * [Mailing Lists](/contact.html)
 ## Translations (outdated)
-* [Site (Japanese)](http://www.jajakarta.org/velocity/)
 * [User's Guide (Finnish)](translations/user-guide_fi.html)
 * [User's Guide (French)](translations/user-guide_fr.html)
 * [User's Guide (Spanish)](translations/user-guide_es.html)
diff --git a/src/content/engine/2.1/webapps.mdtext 
b/src/content/engine/2.1/webapps.mdtext
index 86360f8..7b1c4f8 100644
--- a/src/content/engine/2.1/webapps.mdtext
+++ b/src/content/engine/2.1/webapps.mdtext
@@ -16,7 +16,7 @@ This document provides some basic info on getting started 
with Velocity in a web
 
 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.
 
-1. **Velocity Tools / VelocityViewServlet** - 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 
[VelocityViewServlet](http://velocity.apache.org/tools/devel/view/). 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 context and you are off. More  [...]
+1. **Velocity Tools / VelocityViewServlet** - 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 
[VelocityViewServlet](https://velocity.apache.org/tools/devel/view.html). 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 context and you are off.  [...]
 2. **Velocity Tools / VelocityStruts** - 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 [VelocityStruts](http://velocity.apache.org/tools/devel/struts/) 
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 infrastructure while designi [...]
 3. **Third party frameworks** - There are a number of third party frameworks 
listed on the 
[PoweredByVelocity](http://wiki.apache.org/velocity/PoweredByVelocity) wiki 
page. Of these, [Spring](http://www.springframework.org/) is probably the most 
sophisticated and well known. [Turbine](http://turbine.apache.org/) has many 
features and can also be very useful. It was built with Velocity as the primary 
page language, which is not surprising since many of the original Velocity 
developers wer [...]
 4. **Build your own** - 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.
diff --git a/src/content/engine/2.2/developer-guide.mdtext 
b/src/content/engine/2.2/developer-guide.mdtext
index 22e7ac8..d639499 100644
--- a/src/content/engine/2.2/developer-guide.mdtext
+++ b/src/content/engine/2.2/developer-guide.mdtext
@@ -1044,8 +1044,6 @@ Here is the list of provided uberspectors (which are 
found in the [`org.apache.v
 > A Chainable uberspector is an uberspector that wraps the previous 
 > uberspector in the introspection chain.
 - 
[LinkingUberspector](apidocs/org/apache/velocity/util/introspection/LinkingUberspector.html)
 > 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.
-- 
[UberspectLoggable](apidocs/org/apache/velocity/util/introspection/UberspectLoggable.html)
 interface
-> When an uberspector implements the UberspectLoggable interface, it is 
provided a logger during initialization via the `setLog(Logger)` method.
 
 If an Uberspector implements the 
[RuntimeServicesAware](apidocs/org/apache/velocity/util/RuntimeServicesAware.html)
 interface, it will be provided a Velocity 
[RuntimeServices](apidocs/org/apache/velocity/runtime/RuntimeServices.html) 
instance during initialization, via the `setRuntimeServices(RuntimeServices)` 
method.
 
diff --git a/src/content/engine/2.2/index.mdtext 
b/src/content/engine/2.2/index.mdtext
index c35da4c..d1be10c 100644
--- a/src/content/engine/2.2/index.mdtext
+++ b/src/content/engine/2.2/index.mdtext
@@ -30,5 +30,5 @@ The Velocity project appreciates any contributions, including 
documentation help
 
 + Report bugs, ask questions, and help new users on the [Velocity mailing 
lists](http://velocity.apache.org/contact.html).
 + There's a list of issues waiting to be addressed in [our bug 
tracker](https://issues.apache.org/jira/browse/VELOCITY).
-+ [Our wiki](https://wiki.apache.org/velocity/velocity) has a large collection 
of community written content. Add your own article or contribute to the FAQ!
++ [Our wiki](https://wiki.apache.org/velocity) has a large collection of 
community written content. Add your own article or contribute to the FAQ!
 + Read-only access to the git repository is available both 
[online](https://github.com/apache/velocity-engine) and with a [Git 
client](https://www.apache.org/dev/version-control.html).
diff --git a/src/content/engine/2.2/left.nav b/src/content/engine/2.2/left.nav
index 21339f8..41f9996 100644
--- a/src/content/engine/2.2/left.nav
+++ b/src/content/engine/2.2/left.nav
@@ -20,18 +20,17 @@
 * [Sources](source-repository.html)
 * [Building](build.html)
 * [Issues](https://issues.apache.org/jira/browse/VELOCITY)
-* [Road Map](http://wiki.apache.org/velocity/RoadMap)
-* [Coding Standards](http://wiki.apache.org/velocity/CodeStandards)
-* [Doc Guidelines](http://wiki.apache.org/velocity/DocumentationGuidelines)
+* [Road Map](https://wiki.apache.org/velocity/RoadMap)
+* [Coding Standards](https://wiki.apache.org/velocity/CodeStandards)
+* [Doc Guidelines](https://wiki.apache.org/velocity/DocumentationGuidelines)
 ## Community
-* [Wiki](http://wiki.apache.org/velocity/)
+* [Wiki](https://wiki.apache.org/velocity/)
 * [News](/news.html)
-* [Powered by Velocity](http://wiki.apache.org/velocity/PoweredByVelocity)
-* [IDE/Editor Plugins](http://wiki.apache.org/velocity/VelocityEditors)
-* [Articles and 
Books](http://wiki.apache.org/velocity/PublishedArticlesAndBooks)
+* [Powered by Velocity](https://wiki.apache.org/velocity/PoweredByVelocity)
+* [IDE/Editor Plugins](https://wiki.apache.org/velocity/VelocityEditors)
+* [Articles and 
Books](https://wiki.apache.org/velocity/PublishedArticlesAndBooks)
 * [Mailing Lists](/contact.html)
 ## Translations (outdated)
-* [Site (Japanese)](http://www.jajakarta.org/velocity/)
 * [User's Guide (Finnish)](translations/user-guide_fi.html)
 * [User's Guide (French)](translations/user-guide_fr.html)
 * [User's Guide (Spanish)](translations/user-guide_es.html)
diff --git a/src/content/engine/2.2/webapps.mdtext 
b/src/content/engine/2.2/webapps.mdtext
index 86360f8..24ee5ce 100644
--- a/src/content/engine/2.2/webapps.mdtext
+++ b/src/content/engine/2.2/webapps.mdtext
@@ -16,8 +16,8 @@ This document provides some basic info on getting started 
with Velocity in a web
 
 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.
 
-1. **Velocity Tools / VelocityViewServlet** - 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 
[VelocityViewServlet](http://velocity.apache.org/tools/devel/view/). 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 context and you are off. More  [...]
-2. **Velocity Tools / VelocityStruts** - 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 [VelocityStruts](http://velocity.apache.org/tools/devel/struts/) 
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 infrastructure while designi [...]
+1. **Velocity Tools / VelocityViewServlet** - 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 
[VelocityViewServlet](https://velocity.apache.org/tools/devel/view.html). 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 context and you are off.  [...]
+2. **Velocity Tools / VelocityStruts** - 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 [VelocityStruts](http://velocity.apache.org/tools/2.0/struts/) 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 
infrastructure while designing [...]
 3. **Third party frameworks** - There are a number of third party frameworks 
listed on the 
[PoweredByVelocity](http://wiki.apache.org/velocity/PoweredByVelocity) wiki 
page. Of these, [Spring](http://www.springframework.org/) is probably the most 
sophisticated and well known. [Turbine](http://turbine.apache.org/) has many 
features and can also be very useful. It was built with Velocity as the primary 
page language, which is not surprising since many of the original Velocity 
developers wer [...]
 4. **Build your own** - 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.
 
diff --git a/src/content/engine/2.3/index.mdtext 
b/src/content/engine/2.3/index.mdtext
index c35da4c..d1be10c 100644
--- a/src/content/engine/2.3/index.mdtext
+++ b/src/content/engine/2.3/index.mdtext
@@ -30,5 +30,5 @@ The Velocity project appreciates any contributions, including 
documentation help
 
 + Report bugs, ask questions, and help new users on the [Velocity mailing 
lists](http://velocity.apache.org/contact.html).
 + There's a list of issues waiting to be addressed in [our bug 
tracker](https://issues.apache.org/jira/browse/VELOCITY).
-+ [Our wiki](https://wiki.apache.org/velocity/velocity) has a large collection 
of community written content. Add your own article or contribute to the FAQ!
++ [Our wiki](https://wiki.apache.org/velocity) has a large collection of 
community written content. Add your own article or contribute to the FAQ!
 + Read-only access to the git repository is available both 
[online](https://github.com/apache/velocity-engine) and with a [Git 
client](https://www.apache.org/dev/version-control.html).
diff --git a/src/content/engine/2.3/left.nav b/src/content/engine/2.3/left.nav
index 21339f8..41f9996 100644
--- a/src/content/engine/2.3/left.nav
+++ b/src/content/engine/2.3/left.nav
@@ -20,18 +20,17 @@
 * [Sources](source-repository.html)
 * [Building](build.html)
 * [Issues](https://issues.apache.org/jira/browse/VELOCITY)
-* [Road Map](http://wiki.apache.org/velocity/RoadMap)
-* [Coding Standards](http://wiki.apache.org/velocity/CodeStandards)
-* [Doc Guidelines](http://wiki.apache.org/velocity/DocumentationGuidelines)
+* [Road Map](https://wiki.apache.org/velocity/RoadMap)
+* [Coding Standards](https://wiki.apache.org/velocity/CodeStandards)
+* [Doc Guidelines](https://wiki.apache.org/velocity/DocumentationGuidelines)
 ## Community
-* [Wiki](http://wiki.apache.org/velocity/)
+* [Wiki](https://wiki.apache.org/velocity/)
 * [News](/news.html)
-* [Powered by Velocity](http://wiki.apache.org/velocity/PoweredByVelocity)
-* [IDE/Editor Plugins](http://wiki.apache.org/velocity/VelocityEditors)
-* [Articles and 
Books](http://wiki.apache.org/velocity/PublishedArticlesAndBooks)
+* [Powered by Velocity](https://wiki.apache.org/velocity/PoweredByVelocity)
+* [IDE/Editor Plugins](https://wiki.apache.org/velocity/VelocityEditors)
+* [Articles and 
Books](https://wiki.apache.org/velocity/PublishedArticlesAndBooks)
 * [Mailing Lists](/contact.html)
 ## Translations (outdated)
-* [Site (Japanese)](http://www.jajakarta.org/velocity/)
 * [User's Guide (Finnish)](translations/user-guide_fi.html)
 * [User's Guide (French)](translations/user-guide_fr.html)
 * [User's Guide (Spanish)](translations/user-guide_es.html)
diff --git a/src/content/engine/2.3/webapps.mdtext 
b/src/content/engine/2.3/webapps.mdtext
index 86360f8..b60d666 100644
--- a/src/content/engine/2.3/webapps.mdtext
+++ b/src/content/engine/2.3/webapps.mdtext
@@ -16,8 +16,8 @@ This document provides some basic info on getting started 
with Velocity in a web
 
 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.
 
-1. **Velocity Tools / VelocityViewServlet** - 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 
[VelocityViewServlet](http://velocity.apache.org/tools/devel/view/). 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 context and you are off. More  [...]
-2. **Velocity Tools / VelocityStruts** - 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 [VelocityStruts](http://velocity.apache.org/tools/devel/struts/) 
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 infrastructure while designi [...]
+1. **Velocity Tools / VelocityViewServlet** - 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 
[VelocityViewServlet](https://velocity.apache.org/tools/devel/view.html). 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 context and you are off.  [...]
+2. **Spring framework integration** - See the [Spring support 
package](apidocs/org/apache/velocity/spring/package-summary.html).
 3. **Third party frameworks** - There are a number of third party frameworks 
listed on the 
[PoweredByVelocity](http://wiki.apache.org/velocity/PoweredByVelocity) wiki 
page. Of these, [Spring](http://www.springframework.org/) is probably the most 
sophisticated and well known. [Turbine](http://turbine.apache.org/) has many 
features and can also be very useful. It was built with Velocity as the primary 
page language, which is not surprising since many of the original Velocity 
developers wer [...]
 4. **Build your own** - 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.
 
diff --git a/src/content/engine/devel/developer-guide.mdtext 
b/src/content/engine/devel/developer-guide.mdtext
index ac2f0f3..bfa7a56 100644
--- a/src/content/engine/devel/developer-guide.mdtext
+++ b/src/content/engine/devel/developer-guide.mdtext
@@ -1044,8 +1044,6 @@ Here is the list of provided uberspectors (which are 
found in the [`org.apache.v
 > A Chainable uberspector is an uberspector that wraps the previous 
 > uberspector in the introspection chain.
 - 
[LinkingUberspector](apidocs/org/apache/velocity/util/introspection/LinkingUberspector.html)
 > 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.
-- 
[UberspectLoggable](apidocs/org/apache/velocity/util/introspection/UberspectLoggable.html)
 interface
-> When an uberspector implements the UberspectLoggable interface, it is 
provided a logger during initialization via the `setLog(Logger)` method.
 
 If an Uberspector implements the 
[RuntimeServicesAware](apidocs/org/apache/velocity/util/RuntimeServicesAware.html)
 interface, it will be provided a Velocity 
[RuntimeServices](apidocs/org/apache/velocity/runtime/RuntimeServices.html) 
instance during initialization, via the `setRuntimeServices(RuntimeServices)` 
method.
 
diff --git a/src/content/engine/devel/index.mdtext 
b/src/content/engine/devel/index.mdtext
index c35da4c..d1be10c 100644
--- a/src/content/engine/devel/index.mdtext
+++ b/src/content/engine/devel/index.mdtext
@@ -30,5 +30,5 @@ The Velocity project appreciates any contributions, including 
documentation help
 
 + Report bugs, ask questions, and help new users on the [Velocity mailing 
lists](http://velocity.apache.org/contact.html).
 + There's a list of issues waiting to be addressed in [our bug 
tracker](https://issues.apache.org/jira/browse/VELOCITY).
-+ [Our wiki](https://wiki.apache.org/velocity/velocity) has a large collection 
of community written content. Add your own article or contribute to the FAQ!
++ [Our wiki](https://wiki.apache.org/velocity) has a large collection of 
community written content. Add your own article or contribute to the FAQ!
 + Read-only access to the git repository is available both 
[online](https://github.com/apache/velocity-engine) and with a [Git 
client](https://www.apache.org/dev/version-control.html).
diff --git a/src/content/engine/devel/left.nav 
b/src/content/engine/devel/left.nav
index 21339f8..41f9996 100644
--- a/src/content/engine/devel/left.nav
+++ b/src/content/engine/devel/left.nav
@@ -20,18 +20,17 @@
 * [Sources](source-repository.html)
 * [Building](build.html)
 * [Issues](https://issues.apache.org/jira/browse/VELOCITY)
-* [Road Map](http://wiki.apache.org/velocity/RoadMap)
-* [Coding Standards](http://wiki.apache.org/velocity/CodeStandards)
-* [Doc Guidelines](http://wiki.apache.org/velocity/DocumentationGuidelines)
+* [Road Map](https://wiki.apache.org/velocity/RoadMap)
+* [Coding Standards](https://wiki.apache.org/velocity/CodeStandards)
+* [Doc Guidelines](https://wiki.apache.org/velocity/DocumentationGuidelines)
 ## Community
-* [Wiki](http://wiki.apache.org/velocity/)
+* [Wiki](https://wiki.apache.org/velocity/)
 * [News](/news.html)
-* [Powered by Velocity](http://wiki.apache.org/velocity/PoweredByVelocity)
-* [IDE/Editor Plugins](http://wiki.apache.org/velocity/VelocityEditors)
-* [Articles and 
Books](http://wiki.apache.org/velocity/PublishedArticlesAndBooks)
+* [Powered by Velocity](https://wiki.apache.org/velocity/PoweredByVelocity)
+* [IDE/Editor Plugins](https://wiki.apache.org/velocity/VelocityEditors)
+* [Articles and 
Books](https://wiki.apache.org/velocity/PublishedArticlesAndBooks)
 * [Mailing Lists](/contact.html)
 ## Translations (outdated)
-* [Site (Japanese)](http://www.jajakarta.org/velocity/)
 * [User's Guide (Finnish)](translations/user-guide_fi.html)
 * [User's Guide (French)](translations/user-guide_fr.html)
 * [User's Guide (Spanish)](translations/user-guide_es.html)
diff --git a/src/content/engine/devel/webapps.mdtext 
b/src/content/engine/devel/webapps.mdtext
index 86360f8..b60d666 100644
--- a/src/content/engine/devel/webapps.mdtext
+++ b/src/content/engine/devel/webapps.mdtext
@@ -16,8 +16,8 @@ This document provides some basic info on getting started 
with Velocity in a web
 
 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.
 
-1. **Velocity Tools / VelocityViewServlet** - 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 
[VelocityViewServlet](http://velocity.apache.org/tools/devel/view/). 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 context and you are off. More  [...]
-2. **Velocity Tools / VelocityStruts** - 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 [VelocityStruts](http://velocity.apache.org/tools/devel/struts/) 
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 infrastructure while designi [...]
+1. **Velocity Tools / VelocityViewServlet** - 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 
[VelocityViewServlet](https://velocity.apache.org/tools/devel/view.html). 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 context and you are off.  [...]
+2. **Spring framework integration** - See the [Spring support 
package](apidocs/org/apache/velocity/spring/package-summary.html).
 3. **Third party frameworks** - There are a number of third party frameworks 
listed on the 
[PoweredByVelocity](http://wiki.apache.org/velocity/PoweredByVelocity) wiki 
page. Of these, [Spring](http://www.springframework.org/) is probably the most 
sophisticated and well known. [Turbine](http://turbine.apache.org/) has many 
features and can also be very useful. It was built with Velocity as the primary 
page language, which is not surprising since many of the original Velocity 
developers wer [...]
 4. **Build your own** - 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.
 
diff --git a/src/content/index.mdtext b/src/content/index.mdtext
index eb39ec6..17aeac6 100644
--- a/src/content/index.mdtext
+++ b/src/content/index.mdtext
@@ -40,7 +40,7 @@ Project | Release Version | Alpha/Beta/RC Release Version
 Velocity Engine | [2.3](engine/2.3) | (currently none available)
 Velocity Tools | [3.1](tools/3.1) | (currently none available)
 
-The release distribution is available as a combined source/binary distribution 
in tar.gz and zip formats, and can be downloaded from [our download 
page](/download/cgi).
+The release distribution is available as a combined source/binary distribution 
in tar.gz and zip formats, and can be downloaded from [our download 
page](/download.cgi).
 
 ## More Information
 
diff --git a/src/content/left.nav b/src/content/left.nav
index 645bfba..603f2e0 100644
--- a/src/content/left.nav
+++ b/src/content/left.nav
@@ -12,7 +12,7 @@
 * [Who we are](/who-we-are.html)
 * [Contact us](/contact.html)
 * [Get involved](/get-involved.html)
-* [Wiki](https://wiki.apache.org/velocity/velocity)
+* [Wiki](https://wiki.apache.org/velocity)
 * [How it works](/how-it-works.html)
 * [Board Reports](https://whimsy.apache.org/board/minutes/Velocity.html)
 ## Developer Resources
diff --git a/src/content/news.xml b/src/content/news.xml
index 00f32c0..a6b8960 100644
--- a/src/content/news.xml
+++ b/src/content/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/src/content/release-process.mdtext 
b/src/content/release-process.mdtext
index 4bcaf09..9b23081 100644
--- a/src/content/release-process.mdtext
+++ b/src/content/release-process.mdtext
@@ -318,10 +318,11 @@ After a vote is finished, and it has been decided that is 
**at least of alpha qu
     
     Push the changes into production.   
     
-    Check the resulting site for broken links
+    Check the resulting site for broken links.
     
         :::shell
-        wget --spider -r -nd -nv -H -l 2 -w 2 -o links.log 
https://velocity.apache.org/
+        sudo pip3 install git+https://github.com/linkchecker/linkchecker.git # 
if not installed before
+        linkchecker https://velocity.apache.org
 
 * Update the DOAP RDF project metadata located in the `site` direcotry of the 
`velocity-site` module sources. Note that DOAP URLs are defined in the 
[https://svn.apache.org/repos/asf/comdev/projects.apache.org/trunk/data/projects.xml](https://svn.apache.org/repos/asf/comdev/projects.apache.org/trunk/data/projects.xml)
 file, which can be edited by every commiter (by checking out the project using 
`svn checkout https://svn.apache.org/repos/asf/comdev`).
 
diff --git a/src/content/tools/3.0/contributions/left.nav 
b/src/content/tools/3.0/contributions/left.nav
new file mode 100644
index 0000000..dcf2453
--- /dev/null
+++ b/src/content/tools/3.0/contributions/left.nav
@@ -0,0 +1,24 @@
+## Velocity Tools
+* [Overview](../index.html)
+* [Download](..//download.cgi#tools)
+## Subprojects
+* [GenericTools](../generic.html)
+* [VelocityView](../view.html)
+## Docs
+* [Standard Tools](../tools-summary.html)
+* [Javadoc](../apidocs/index.html)
+* [Upgrading](../upgrading.html)
+* [Configuration](../configuration.html)
+* [Standalone Use](../standalone.html)
+* [Web Integration](../frameworks.html)
+* [Creating Tools](../creating-tools.html)
+* [Contributions](../contributions.html)
+* [Glossary](/engine/devel/glossary.html)
+* [FAQ](http://wiki.apache.org/velocity/VelocityFAQ)
+* [Wiki](http://wiki.apache.org/velocity/)
+## Development
+* [Changes](../changes.html)
+* [Dependencies](../dependencies.html)
+* [Participating](/index.html#helping-out)
+* [Source Code](/download.cgi#tools)
+* [Report Issue](https://issues.apache.org/jira/browse/VELTOOLS)
diff --git a/src/content/tools/3.0/generic.mdtext 
b/src/content/tools/3.0/generic.mdtext
index af907bf..291bcaf 100644
--- a/src/content/tools/3.0/generic.mdtext
+++ b/src/content/tools/3.0/generic.mdtext
@@ -15,7 +15,7 @@ For inclusion in a Maven project, use the following 
dependency block:
         <version>3.0</version>
     </dependency>
 
-Otherwise, see the [download page](/download.html#tools) for how to get the 
Velocity Generic Tools jar.
+Otherwise, see the [download page](/download.cgi#tools) for how to get the 
Velocity Generic Tools jar.
 
 ## Usage
 
@@ -78,20 +78,4 @@ The dependencies required for GenericTools vary somewhat 
depending on which tool
 
 ## Tools
 
-+ 
[AlternatorTool](apidocs/org/apache/velocity/tools/generic/AlternatorTool.html) 
- For creating 
[Alternator](apidocs/org/apache/velocity/tools/generic/Alternator.html)s to 
easily alternate over a set of values.
-+ [ClassTool](apidocs/org/apache/velocity/tools/generic/ClassTool.html) - For 
simplifying reflective lookup of information about Classes and their fields, 
methods and constructors.
-+ [ContextTool](apidocs/org/apache/velocity/tools/generic/ContextTool.html) - 
For convenient access to Context data and meta-data.
-+ 
[ConversionTool](apidocs/org/apache/velocity/tools/generic/ConversionTool.html) 
- For converting String values to richer object types.
-+ [DateTool](apidocs/org/apache/velocity/tools/generic/DateTool.html) & 
[ComparisonDateTool](apidocs/org/apache/velocity/tools/generic/ComparisonDateTool.html)
 - For manipulating, formatting, and comparing dates.
-+ [DisplayTool](apidocs/org/apache/velocity/tools/generic/DisplayTool.html) - 
For controlling display of references (e.g. truncating values, "pretty 
printing" lists, and displaying alternates when a reference is null).
-+ [EscapeTool](apidocs/org/apache/velocity/tools/generic/EscapeTool.html) - 
For common escaping needs in Velocity templates (e.g. escaping html, xml, 
javascript etc.).
-+ [FieldTool](apidocs/org/apache/velocity/tools/generic/FieldTool.html) - For 
(easy) access to static fields in a class, such as string constants.
-+ [LoopTool](apidocs/org/apache/velocity/tools/generic/LoopTool.html) - 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.
-+ [LinkTool](apidocs/org/apache/velocity/tools/generic/LinkTool.html) - 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.
-+ [ListTool](apidocs/org/apache/velocity/tools/generic/ListTool.html) - For 
working with arrays and lists, treats both transparently the same.
-+ [MathTool](apidocs/org/apache/velocity/tools/generic/MathTool.html) - For 
performing math functions.
-+ [NumberTool](apidocs/org/apache/velocity/tools/generic/NumberTool.html) - 
For formatting and converting numbers.
-+ [RenderTool](apidocs/org/apache/velocity/tools/generic/RenderTool.html) - To 
evaluate and render arbitrary strings of VTL, including recursive rendering.
-+ [ResourceTool](apidocs/org/apache/velocity/tools/generic/ResourceTool.html) 
- For simplified access to ResourceBundles for internationalization or other 
dynamic content needs.
-+ [SortTool](apidocs/org/apache/velocity/tools/generic/SortTool.html) - Used 
to sort collections (or arrays, iterators, etc) on any arbitary set of 
properties exposed by the objects contained within the collection.
-+ [XmlTool](apidocs/org/apache/velocity/tools/generic/XmlTool.html) - For 
reading/navigating XML files.  This uses dom4j under the covers and provides 
complete XPath support.
+Please consult the [Standard Tools](tools-summary.html) page for a list of 
standard generic tools.
diff --git a/src/content/tools/3.0/left.nav b/src/content/tools/3.0/left.nav
index f576aba..d6f4460 100644
--- a/src/content/tools/3.0/left.nav
+++ b/src/content/tools/3.0/left.nav
@@ -14,11 +14,11 @@
 * [Creating Tools](creating-tools.html)
 * [Contributions](contributions.html)
 * [Glossary](/engine/devel/glossary.html)
-* [FAQ](http://wiki.apache.org/velocity/VelocityFAQ)
-* [Wiki](http://wiki.apache.org/velocity/)
+* [FAQ](https://wiki.apache.org/velocity/VelocityFAQ)
+* [Wiki](https://wiki.apache.org/velocity/)
 ## Development
 * [Changes](changes.html)
 * [Dependencies](dependencies.html)
 * [Participating](index.html#helping-out)
-* [Source 
Code](http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository)
-* [Report Issue](http://issues.apache.org/jira/browse/VELTOOLS)
+* [Source Code](/download.cgi#tools)
+* [Report Issue](https://issues.apache.org/jira/browse/VELTOOLS)
diff --git a/src/content/tools/3.0/upgrading.mdtext 
b/src/content/tools/3.0/upgrading.mdtext
index 3da340b..38037b2 100644
--- a/src/content/tools/3.0/upgrading.mdtext
+++ b/src/content/tools/3.0/upgrading.mdtext
@@ -60,7 +60,7 @@ Some specific ones to watch out for are as follows. If you 
directly referenced:
 + VelocityLayoutServlet, it is now at 
[org.apache.velocity.tools.view.VelocityLayoutServlet](apidocs/org/apache/velocity/tools/view/VelocityLayoutServlet.html)
 + WebappLoader, it is now at 
[org.apache.velocity.tools.view.WebappResourceLoader](apidocs/org/apache/velocity/tools/view/WebappResourceLoader.html)
 + ViewContext, it is now at 
[org.apache.velocity.tools.view.ViewContext](apidocs/org/apache/velocity/tools/view/ViewContext.html)
-+ ServletLogger, it has been replaced by 
[org.apache.velocity.tools.view.ServletLogChute](apidocs/org/apache/velocity/tools/view/ServletLogChute.html)
++ ServletLogger, it has been replaced by 
org.apache.velocity.tools.view.ServletLogChute
 + ServletUtils, it is now at 
[org.apache.velocity.tools.view.ServletUtils](apidocs/org/apache/velocity/tools/view/ServletUtils.html)
 + BrowserSniffer, it is now at 
[org.apache.velocity.tools.view.BrowserTool](apidocs/org/apache/velocity/tools/view/BrowserTool.html)
 + AbstractPagerTool, it is now at 
[org.apache.velocity.tools.view.PagerTool](apidocs/org/apache/velocity/tools/view/PagerTool.html)
@@ -126,7 +126,7 @@ Those of you who write your own custom tools may want to 
make a few changes to u
 
 **Naming:** The recommended practice is to give a tool to be used as `$foo` 
the name `FooTool` . 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 `$foo` in templates, the second best thing is to provide a 
[`@DefaultKey("foo")`](apidocs/org/apache/velocity/tools/config/DefaultKey.html)
 annotation on the class, though this introduces a dependency on VelocityTools. 
As a last resort, if you are provi [...]
 
-**Scoping:** If your tool is only meant to be used in a particular scope, it's 
recommended that you give the class a 
[`@ValidScope(Scope.REQUEST)`](apidocs/org/apache/velocity/tools/config/ValidScope.html)
 annotation as well. If you only want to ban a particular scope and allow all 
others, you could provide a 
[`@InvalidScope(Scope.APPLICATION)`](apidocs/org/apache/velocity/tools/config/InvalidScope.html)
 annotation on the class. The 
[`Scope`](apidocs/org/apache/velocity/tools/Scope.html) [...]
+**Scoping:** If your tool is only meant to be used in a particular scope, it's 
recommended that you give the class a 
[`@ValidScope(Scope.REQUEST)`](apidocs/org/apache/velocity/tools/config/ValidScope.html)
 annotation as well. If you only want to ban a particular scope and allow all 
others, you could provide a `@InvalidScope(Scope.APPLICATION)` annotation on 
the class. The [`Scope`](apidocs/org/apache/velocity/tools/Scope.html) class 
provides constants for REQUEST, SESSION, and APPLICATIO [...]
 
 **Configuration:** If you have a configurable tool whose configuration should 
not changed by the templates which use it, then consider having your tool 
extend the 
[SafeConfig](apidocs/org/apache/velocity/tools/generic/SafeConfig.html) class 
(or [FormatConfig](apidocs/org/apache/velocity/tools/generic/FormatConfig.html) 
or 
[LocaleConfig](apidocs/org/apache/velocity/tools/generic/LocaleConfig.html)). 
These safely standardize configuration of these common configuration 
properties. Also take [...]
 
diff --git a/src/content/tools/3.0/view-layoutservlet.mdtext 
b/src/content/tools/3.0/view-layoutservlet.mdtext
index ac184af..a8a85c1 100644
--- a/src/content/tools/3.0/view-layoutservlet.mdtext
+++ b/src/content/tools/3.0/view-layoutservlet.mdtext
@@ -8,7 +8,7 @@ This is an extension to the basic VelocityViewServlet. It 
provides a simple layo
 
 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:
 
-[org.apache.velocity.tools.view.servlet.VelocityLayoutServlet](apidocs/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.html)
+[org.apache.velocity.tools.view.servlet.VelocityLayoutServlet](apidocs/org/apache/velocity/tools/view/VelocityLayoutServlet.html)
 
 ## Configuration Settings
 
diff --git a/src/content/tools/3.0/view.mdtext 
b/src/content/tools/3.0/view.mdtext
index 186fd85..00a82d5 100644
--- a/src/content/tools/3.0/view.mdtext
+++ b/src/content/tools/3.0/view.mdtext
@@ -23,7 +23,7 @@ For inclusion in a Maven project, use the following 
dependency block:
         <version>3.0</version>
     </dependency>
 
-Otherwise, see the [download page](/download.html#tools) for how to get the 
Velocity View Tools jar.
+Otherwise, see the [download page](/download.cgi#tools) for how to get the 
Velocity View Tools jar.
 
 ## Default Configuration
 
@@ -61,14 +61,7 @@ Detailed documentation is [here](view-tag.html).
 
 These are in addition to those provided by [GenericTools](generic.html#Tools):
 
-+ 
[AbstractSearchTool](apidocs/org/apache/velocity/tools/view/AbstractSearchTool.html)
 - For doing "searching" and robust pagination of search results. Requires you 
to create a subclass.
-+ [BrowserTool](apidocs/org/apache/velocity/tools/view/BrowserTool.html) - For 
identifying the browser and features thereof requesting the template.
-+ [CookieTool](apidocs/org/apache/velocity/tools/view/CookieTool.html) - For 
convenient cookie access and creation.
-+ [ImportTool](apidocs/org/apache/velocity/tools/view/ImportTool.html) - For 
pulling down textual content from a URL.
-+ [LinkTool](apidocs/org/apache/velocity/tools/view/LinkTool.html) - For easy 
building of URLs (both relative or absolute).
-+ [PagerTool](apidocs/org/apache/velocity/tools/view/PagerTool.html) - For 
doing request-based pagination of items in an arbitrary list.
-+ [ParameterTool](apidocs/org/apache/velocity/tools/view/ParameterTool.html) - 
For easy retrieval and parsing of ServletRequest parameters.
-+ 
[ViewContextTool](apidocs/org/apache/velocity/tools/view/ViewContextTool.html) 
- For convenient access to ViewContext data and meta-data.
+Please consult the [Standard Tools](tools-summary.html) page for a list of 
standard view tools.
 
 ## Examples
 
diff --git a/src/content/tools/3.1/contributions/left.nav 
b/src/content/tools/3.1/contributions/left.nav
new file mode 100644
index 0000000..dcf2453
--- /dev/null
+++ b/src/content/tools/3.1/contributions/left.nav
@@ -0,0 +1,24 @@
+## Velocity Tools
+* [Overview](../index.html)
+* [Download](..//download.cgi#tools)
+## Subprojects
+* [GenericTools](../generic.html)
+* [VelocityView](../view.html)
+## Docs
+* [Standard Tools](../tools-summary.html)
+* [Javadoc](../apidocs/index.html)
+* [Upgrading](../upgrading.html)
+* [Configuration](../configuration.html)
+* [Standalone Use](../standalone.html)
+* [Web Integration](../frameworks.html)
+* [Creating Tools](../creating-tools.html)
+* [Contributions](../contributions.html)
+* [Glossary](/engine/devel/glossary.html)
+* [FAQ](http://wiki.apache.org/velocity/VelocityFAQ)
+* [Wiki](http://wiki.apache.org/velocity/)
+## Development
+* [Changes](../changes.html)
+* [Dependencies](../dependencies.html)
+* [Participating](/index.html#helping-out)
+* [Source Code](/download.cgi#tools)
+* [Report Issue](https://issues.apache.org/jira/browse/VELTOOLS)
diff --git a/src/content/tools/3.1/generic.mdtext 
b/src/content/tools/3.1/generic.mdtext
index 096a315..ebd1fbe 100644
--- a/src/content/tools/3.1/generic.mdtext
+++ b/src/content/tools/3.1/generic.mdtext
@@ -15,7 +15,7 @@ For inclusion in a Maven project, use the following 
dependency block:
         <version>3.0</version>
     </dependency>
 
-Otherwise, see the [download page](/download.html#tools) for how to get the 
Velocity Generic Tools jar.
+Otherwise, see the [download page](/download.cgi#tools) for how to get the 
Velocity Generic Tools jar.
 
 ## Usage
 
@@ -78,20 +78,4 @@ The dependencies required for GenericTools vary somewhat 
depending on which tool
 
 ## Tools
 
-+ 
[AlternatorTool](apidocs/org/apache/velocity/tools/generic/AlternatorTool.html) 
- For creating 
[Alternator](apidocs/org/apache/velocity/tools/generic/Alternator.html)s to 
easily alternate over a set of values.
-+ [ClassTool](apidocs/org/apache/velocity/tools/generic/ClassTool.html) - For 
simplifying reflective lookup of information about Classes and their fields, 
methods and constructors.
-+ [ContextTool](apidocs/org/apache/velocity/tools/generic/ContextTool.html) - 
For convenient access to Context data and meta-data.
-+ 
[ConversionTool](apidocs/org/apache/velocity/tools/generic/ConversionTool.html) 
- For converting String values to richer object types.
-+ [DateTool](apidocs/org/apache/velocity/tools/generic/DateTool.html) & 
[ComparisonDateTool](apidocs/org/apache/velocity/tools/generic/ComparisonDateTool.html)
 - For manipulating, formatting, and comparing dates.
-+ [DisplayTool](apidocs/org/apache/velocity/tools/generic/DisplayTool.html) - 
For controlling display of references (e.g. truncating values, "pretty 
printing" lists, and displaying alternates when a reference is null).
-+ [EscapeTool](apidocs/org/apache/velocity/tools/generic/EscapeTool.html) - 
For common escaping needs in Velocity templates (e.g. escaping html, xml, 
javascript etc.).
-+ [FieldTool](apidocs/org/apache/velocity/tools/generic/FieldTool.html) - For 
(easy) access to static fields in a class, such as string constants.
-+ [LoopTool](apidocs/org/apache/velocity/tools/generic/LoopTool.html) - 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.
-+ [LinkTool](apidocs/org/apache/velocity/tools/generic/LinkTool.html) - 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.
-+ [ListTool](apidocs/org/apache/velocity/tools/generic/ListTool.html) - For 
working with arrays and lists, treats both transparently the same.
-+ [MathTool](apidocs/org/apache/velocity/tools/generic/MathTool.html) - For 
performing math functions.
-+ [NumberTool](apidocs/org/apache/velocity/tools/generic/NumberTool.html) - 
For formatting and converting numbers.
-+ [RenderTool](apidocs/org/apache/velocity/tools/generic/RenderTool.html) - To 
evaluate and render arbitrary strings of VTL, including recursive rendering.
-+ [ResourceTool](apidocs/org/apache/velocity/tools/generic/ResourceTool.html) 
- For simplified access to ResourceBundles for internationalization or other 
dynamic content needs.
-+ [SortTool](apidocs/org/apache/velocity/tools/generic/SortTool.html) - Used 
to sort collections (or arrays, iterators, etc) on any arbitary set of 
properties exposed by the objects contained within the collection.
-+ [XmlTool](apidocs/org/apache/velocity/tools/generic/XmlTool.html) - For 
reading/navigating XML files.  This uses dom4j under the covers and provides 
complete XPath support.
+Please consult the [Standard Tools](tools-summary.html) page for a list of 
standard generic tools.
diff --git a/src/content/tools/3.1/left.nav b/src/content/tools/3.1/left.nav
index f576aba..d6f4460 100644
--- a/src/content/tools/3.1/left.nav
+++ b/src/content/tools/3.1/left.nav
@@ -14,11 +14,11 @@
 * [Creating Tools](creating-tools.html)
 * [Contributions](contributions.html)
 * [Glossary](/engine/devel/glossary.html)
-* [FAQ](http://wiki.apache.org/velocity/VelocityFAQ)
-* [Wiki](http://wiki.apache.org/velocity/)
+* [FAQ](https://wiki.apache.org/velocity/VelocityFAQ)
+* [Wiki](https://wiki.apache.org/velocity/)
 ## Development
 * [Changes](changes.html)
 * [Dependencies](dependencies.html)
 * [Participating](index.html#helping-out)
-* [Source 
Code](http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository)
-* [Report Issue](http://issues.apache.org/jira/browse/VELTOOLS)
+* [Source Code](/download.cgi#tools)
+* [Report Issue](https://issues.apache.org/jira/browse/VELTOOLS)
diff --git a/src/content/tools/3.1/upgrading.mdtext 
b/src/content/tools/3.1/upgrading.mdtext
index 424ed7b..9e07e0f 100644
--- a/src/content/tools/3.1/upgrading.mdtext
+++ b/src/content/tools/3.1/upgrading.mdtext
@@ -64,7 +64,7 @@ Some specific ones to watch out for are as follows. If you 
directly referenced:
 + VelocityLayoutServlet, it is now at 
[org.apache.velocity.tools.view.VelocityLayoutServlet](apidocs/org/apache/velocity/tools/view/VelocityLayoutServlet.html)
 + WebappLoader, it is now at 
[org.apache.velocity.tools.view.WebappResourceLoader](apidocs/org/apache/velocity/tools/view/WebappResourceLoader.html)
 + ViewContext, it is now at 
[org.apache.velocity.tools.view.ViewContext](apidocs/org/apache/velocity/tools/view/ViewContext.html)
-+ ServletLogger, it has been replaced by 
[org.apache.velocity.tools.view.ServletLogChute](apidocs/org/apache/velocity/tools/view/ServletLogChute.html)
++ ServletLogger, it has been replaced by 
org.apache.velocity.tools.view.ServletLogChute
 + ServletUtils, it is now at 
[org.apache.velocity.tools.view.ServletUtils](apidocs/org/apache/velocity/tools/view/ServletUtils.html)
 + BrowserSniffer, it is now at 
[org.apache.velocity.tools.view.BrowserTool](apidocs/org/apache/velocity/tools/view/BrowserTool.html)
 + AbstractPagerTool, it is now at 
[org.apache.velocity.tools.view.PagerTool](apidocs/org/apache/velocity/tools/view/PagerTool.html)
@@ -130,7 +130,7 @@ Those of you who write your own custom tools may want to 
make a few changes to u
 
 **Naming:** The recommended practice is to give a tool to be used as `$foo` 
the name `FooTool` . 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 `$foo` in templates, the second best thing is to provide a 
[`@DefaultKey("foo")`](apidocs/org/apache/velocity/tools/config/DefaultKey.html)
 annotation on the class, though this introduces a dependency on VelocityTools. 
As a last resort, if you are provi [...]
 
-**Scoping:** If your tool is only meant to be used in a particular scope, it's 
recommended that you give the class a 
[`@ValidScope(Scope.REQUEST)`](apidocs/org/apache/velocity/tools/config/ValidScope.html)
 annotation as well. If you only want to ban a particular scope and allow all 
others, you could provide a 
[`@InvalidScope(Scope.APPLICATION)`](apidocs/org/apache/velocity/tools/config/InvalidScope.html)
 annotation on the class. The 
[`Scope`](apidocs/org/apache/velocity/tools/Scope.html) [...]
+**Scoping:** If your tool is only meant to be used in a particular scope, it's 
recommended that you give the class a 
[`@ValidScope(Scope.REQUEST)`](apidocs/org/apache/velocity/tools/config/ValidScope.html)
 annotation as well. If you only want to ban a particular scope and allow all 
others, you could provide a `@InvalidScope(Scope.APPLICATION)` annotation on 
the class. The [`Scope`](apidocs/org/apache/velocity/tools/Scope.html) class 
provides constants for REQUEST, SESSION, and APPLICATIO [...]
 
 **Configuration:** If you have a configurable tool whose configuration should 
not changed by the templates which use it, then consider having your tool 
extend the 
[SafeConfig](apidocs/org/apache/velocity/tools/generic/SafeConfig.html) class 
(or [FormatConfig](apidocs/org/apache/velocity/tools/generic/FormatConfig.html) 
or 
[LocaleConfig](apidocs/org/apache/velocity/tools/generic/LocaleConfig.html)). 
These safely standardize configuration of these common configuration 
properties. Also take [...]
 
diff --git a/src/content/tools/3.1/view-layoutservlet.mdtext 
b/src/content/tools/3.1/view-layoutservlet.mdtext
index ac184af..a8a85c1 100644
--- a/src/content/tools/3.1/view-layoutservlet.mdtext
+++ b/src/content/tools/3.1/view-layoutservlet.mdtext
@@ -8,7 +8,7 @@ This is an extension to the basic VelocityViewServlet. It 
provides a simple layo
 
 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:
 
-[org.apache.velocity.tools.view.servlet.VelocityLayoutServlet](apidocs/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.html)
+[org.apache.velocity.tools.view.servlet.VelocityLayoutServlet](apidocs/org/apache/velocity/tools/view/VelocityLayoutServlet.html)
 
 ## Configuration Settings
 
diff --git a/src/content/tools/3.1/view.mdtext 
b/src/content/tools/3.1/view.mdtext
index 50eb257..fa4d8d3 100644
--- a/src/content/tools/3.1/view.mdtext
+++ b/src/content/tools/3.1/view.mdtext
@@ -23,7 +23,7 @@ For inclusion in a Maven project, use the following 
dependency block:
         <version>3.0</version>
     </dependency>
 
-Otherwise, see the [download page](/download.html#tools) for how to get the 
Velocity View Tools jar.
+Otherwise, see the [download page](/download.cgi#tools) for how to get the 
Velocity View Tools jar.
 
 ## Default Configuration
 
@@ -61,14 +61,7 @@ Detailed documentation is [here](view-tag.html).
 
 These are in addition to those provided by [GenericTools](generic.html#Tools):
 
-+ 
[AbstractSearchTool](apidocs/org/apache/velocity/tools/view/AbstractSearchTool.html)
 - For doing "searching" and robust pagination of search results. Requires you 
to create a subclass.
-+ [BrowserTool](apidocs/org/apache/velocity/tools/view/BrowserTool.html) - For 
identifying the browser and features thereof requesting the template.
-+ [CookieTool](apidocs/org/apache/velocity/tools/view/CookieTool.html) - For 
convenient cookie access and creation.
-+ [ImportTool](apidocs/org/apache/velocity/tools/view/ImportTool.html) - For 
pulling down textual content from a URL.
-+ [LinkTool](apidocs/org/apache/velocity/tools/view/LinkTool.html) - For easy 
building of URLs (both relative or absolute).
-+ [PagerTool](apidocs/org/apache/velocity/tools/view/PagerTool.html) - For 
doing request-based pagination of items in an arbitrary list.
-+ [ParameterTool](apidocs/org/apache/velocity/tools/view/ParameterTool.html) - 
For easy retrieval and parsing of ServletRequest parameters.
-+ 
[ViewContextTool](apidocs/org/apache/velocity/tools/view/ViewContextTool.html) 
- For convenient access to ViewContext data and meta-data.
+Please consult the [Standard Tools](tools-summary.html) page for a list of 
standard view tools.
 
 ## Examples
 
diff --git a/src/content/tools/devel/contributions/left.nav 
b/src/content/tools/devel/contributions/left.nav
new file mode 100644
index 0000000..dcf2453
--- /dev/null
+++ b/src/content/tools/devel/contributions/left.nav
@@ -0,0 +1,24 @@
+## Velocity Tools
+* [Overview](../index.html)
+* [Download](..//download.cgi#tools)
+## Subprojects
+* [GenericTools](../generic.html)
+* [VelocityView](../view.html)
+## Docs
+* [Standard Tools](../tools-summary.html)
+* [Javadoc](../apidocs/index.html)
+* [Upgrading](../upgrading.html)
+* [Configuration](../configuration.html)
+* [Standalone Use](../standalone.html)
+* [Web Integration](../frameworks.html)
+* [Creating Tools](../creating-tools.html)
+* [Contributions](../contributions.html)
+* [Glossary](/engine/devel/glossary.html)
+* [FAQ](http://wiki.apache.org/velocity/VelocityFAQ)
+* [Wiki](http://wiki.apache.org/velocity/)
+## Development
+* [Changes](../changes.html)
+* [Dependencies](../dependencies.html)
+* [Participating](/index.html#helping-out)
+* [Source Code](/download.cgi#tools)
+* [Report Issue](https://issues.apache.org/jira/browse/VELTOOLS)
diff --git a/src/content/tools/devel/generic.mdtext 
b/src/content/tools/devel/generic.mdtext
index f00541c..3beb407 100644
--- a/src/content/tools/devel/generic.mdtext
+++ b/src/content/tools/devel/generic.mdtext
@@ -15,7 +15,7 @@ For inclusion in a Maven project, use the following 
dependency block:
         <version>3.0</version>
     </dependency>
 
-Otherwise, see the [download page](/download.html#tools) for how to get the 
Velocity Generic Tools jar.
+Otherwise, see the [download page](/download.cgi#tools) for how to get the 
Velocity Generic Tools jar.
 
 ## Usage
 
@@ -78,20 +78,4 @@ The dependencies required for GenericTools vary somewhat 
depending on which tool
 
 ## Tools
 
-+ 
[AlternatorTool](apidocs/org/apache/velocity/tools/generic/AlternatorTool.html) 
- For creating 
[Alternator](apidocs/org/apache/velocity/tools/generic/Alternator.html)s to 
easily alternate over a set of values.
-+ [ClassTool](apidocs/org/apache/velocity/tools/generic/ClassTool.html) - For 
simplifying reflective lookup of information about Classes and their fields, 
methods and constructors.
-+ [ContextTool](apidocs/org/apache/velocity/tools/generic/ContextTool.html) - 
For convenient access to Context data and meta-data.
-+ 
[ConversionTool](apidocs/org/apache/velocity/tools/generic/ConversionTool.html) 
- For converting String values to richer object types.
-+ [DateTool](apidocs/org/apache/velocity/tools/generic/DateTool.html) & 
[ComparisonDateTool](apidocs/org/apache/velocity/tools/generic/ComparisonDateTool.html)
 - For manipulating, formatting, and comparing dates.
-+ [DisplayTool](apidocs/org/apache/velocity/tools/generic/DisplayTool.html) - 
For controlling display of references (e.g. truncating values, "pretty 
printing" lists, and displaying alternates when a reference is null).
-+ [EscapeTool](apidocs/org/apache/velocity/tools/generic/EscapeTool.html) - 
For common escaping needs in Velocity templates (e.g. escaping html, xml, 
javascript etc.).
-+ [FieldTool](apidocs/org/apache/velocity/tools/generic/FieldTool.html) - For 
(easy) access to static fields in a class, such as string constants.
-+ [LoopTool](apidocs/org/apache/velocity/tools/generic/LoopTool.html) - 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.
-+ [LinkTool](apidocs/org/apache/velocity/tools/generic/LinkTool.html) - 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.
-+ [ListTool](apidocs/org/apache/velocity/tools/generic/ListTool.html) - For 
working with arrays and lists, treats both transparently the same.
-+ [MathTool](apidocs/org/apache/velocity/tools/generic/MathTool.html) - For 
performing math functions.
-+ [NumberTool](apidocs/org/apache/velocity/tools/generic/NumberTool.html) - 
For formatting and converting numbers.
-+ [RenderTool](apidocs/org/apache/velocity/tools/generic/RenderTool.html) - To 
evaluate and render arbitrary strings of VTL, including recursive rendering.
-+ [ResourceTool](apidocs/org/apache/velocity/tools/generic/ResourceTool.html) 
- For simplified access to ResourceBundles for internationalization or other 
dynamic content needs.
-+ [SortTool](apidocs/org/apache/velocity/tools/generic/SortTool.html) - Used 
to sort collections (or arrays, iterators, etc) on any arbitary set of 
properties exposed by the objects contained within the collection.
-+ [XmlTool](apidocs/org/apache/velocity/tools/generic/XmlTool.html) - For 
reading/navigating XML files.  This uses dom4j under the covers and provides 
complete XPath support.
+Please consult the [Standard Tools](tools-summary.html) page for a list of 
standard generic tools.
diff --git a/src/content/tools/devel/left.nav b/src/content/tools/devel/left.nav
index f576aba..d6f4460 100644
--- a/src/content/tools/devel/left.nav
+++ b/src/content/tools/devel/left.nav
@@ -14,11 +14,11 @@
 * [Creating Tools](creating-tools.html)
 * [Contributions](contributions.html)
 * [Glossary](/engine/devel/glossary.html)
-* [FAQ](http://wiki.apache.org/velocity/VelocityFAQ)
-* [Wiki](http://wiki.apache.org/velocity/)
+* [FAQ](https://wiki.apache.org/velocity/VelocityFAQ)
+* [Wiki](https://wiki.apache.org/velocity/)
 ## Development
 * [Changes](changes.html)
 * [Dependencies](dependencies.html)
 * [Participating](index.html#helping-out)
-* [Source 
Code](http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository)
-* [Report Issue](http://issues.apache.org/jira/browse/VELTOOLS)
+* [Source Code](/download.cgi#tools)
+* [Report Issue](https://issues.apache.org/jira/browse/VELTOOLS)
diff --git a/src/content/tools/devel/upgrading.mdtext 
b/src/content/tools/devel/upgrading.mdtext
index 424ed7b..9e07e0f 100644
--- a/src/content/tools/devel/upgrading.mdtext
+++ b/src/content/tools/devel/upgrading.mdtext
@@ -64,7 +64,7 @@ Some specific ones to watch out for are as follows. If you 
directly referenced:
 + VelocityLayoutServlet, it is now at 
[org.apache.velocity.tools.view.VelocityLayoutServlet](apidocs/org/apache/velocity/tools/view/VelocityLayoutServlet.html)
 + WebappLoader, it is now at 
[org.apache.velocity.tools.view.WebappResourceLoader](apidocs/org/apache/velocity/tools/view/WebappResourceLoader.html)
 + ViewContext, it is now at 
[org.apache.velocity.tools.view.ViewContext](apidocs/org/apache/velocity/tools/view/ViewContext.html)
-+ ServletLogger, it has been replaced by 
[org.apache.velocity.tools.view.ServletLogChute](apidocs/org/apache/velocity/tools/view/ServletLogChute.html)
++ ServletLogger, it has been replaced by 
org.apache.velocity.tools.view.ServletLogChute
 + ServletUtils, it is now at 
[org.apache.velocity.tools.view.ServletUtils](apidocs/org/apache/velocity/tools/view/ServletUtils.html)
 + BrowserSniffer, it is now at 
[org.apache.velocity.tools.view.BrowserTool](apidocs/org/apache/velocity/tools/view/BrowserTool.html)
 + AbstractPagerTool, it is now at 
[org.apache.velocity.tools.view.PagerTool](apidocs/org/apache/velocity/tools/view/PagerTool.html)
@@ -130,7 +130,7 @@ Those of you who write your own custom tools may want to 
make a few changes to u
 
 **Naming:** The recommended practice is to give a tool to be used as `$foo` 
the name `FooTool` . 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 `$foo` in templates, the second best thing is to provide a 
[`@DefaultKey("foo")`](apidocs/org/apache/velocity/tools/config/DefaultKey.html)
 annotation on the class, though this introduces a dependency on VelocityTools. 
As a last resort, if you are provi [...]
 
-**Scoping:** If your tool is only meant to be used in a particular scope, it's 
recommended that you give the class a 
[`@ValidScope(Scope.REQUEST)`](apidocs/org/apache/velocity/tools/config/ValidScope.html)
 annotation as well. If you only want to ban a particular scope and allow all 
others, you could provide a 
[`@InvalidScope(Scope.APPLICATION)`](apidocs/org/apache/velocity/tools/config/InvalidScope.html)
 annotation on the class. The 
[`Scope`](apidocs/org/apache/velocity/tools/Scope.html) [...]
+**Scoping:** If your tool is only meant to be used in a particular scope, it's 
recommended that you give the class a 
[`@ValidScope(Scope.REQUEST)`](apidocs/org/apache/velocity/tools/config/ValidScope.html)
 annotation as well. If you only want to ban a particular scope and allow all 
others, you could provide a `@InvalidScope(Scope.APPLICATION)` annotation on 
the class. The [`Scope`](apidocs/org/apache/velocity/tools/Scope.html) class 
provides constants for REQUEST, SESSION, and APPLICATIO [...]
 
 **Configuration:** If you have a configurable tool whose configuration should 
not changed by the templates which use it, then consider having your tool 
extend the 
[SafeConfig](apidocs/org/apache/velocity/tools/generic/SafeConfig.html) class 
(or [FormatConfig](apidocs/org/apache/velocity/tools/generic/FormatConfig.html) 
or 
[LocaleConfig](apidocs/org/apache/velocity/tools/generic/LocaleConfig.html)). 
These safely standardize configuration of these common configuration 
properties. Also take [...]
 
diff --git a/src/content/tools/devel/view-layoutservlet.mdtext 
b/src/content/tools/devel/view-layoutservlet.mdtext
index ac184af..a8a85c1 100644
--- a/src/content/tools/devel/view-layoutservlet.mdtext
+++ b/src/content/tools/devel/view-layoutservlet.mdtext
@@ -8,7 +8,7 @@ This is an extension to the basic VelocityViewServlet. It 
provides a simple layo
 
 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:
 
-[org.apache.velocity.tools.view.servlet.VelocityLayoutServlet](apidocs/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.html)
+[org.apache.velocity.tools.view.servlet.VelocityLayoutServlet](apidocs/org/apache/velocity/tools/view/VelocityLayoutServlet.html)
 
 ## Configuration Settings
 
diff --git a/src/content/tools/devel/view.mdtext 
b/src/content/tools/devel/view.mdtext
index df38897..d6635c3 100644
--- a/src/content/tools/devel/view.mdtext
+++ b/src/content/tools/devel/view.mdtext
@@ -23,7 +23,7 @@ For inclusion in a Maven project, use the following 
dependency block:
         <version>3.0</version>
     </dependency>
 
-Otherwise, see the [download page](/download.html#tools) for how to get the 
Velocity View Tools jar.
+Otherwise, see the [download page](/download.cgi#tools) for how to get the 
Velocity View Tools jar.
 
 ## Default Configuration
 
@@ -59,16 +59,7 @@ Detailed documentation is [here](view-tag.html).
 
 ## Tools
 
-These are in addition to those provided by [GenericTools](generic.html#Tools):
-
-+ 
[AbstractSearchTool](apidocs/org/apache/velocity/tools/view/AbstractSearchTool.html)
 - For doing "searching" and robust pagination of search results. Requires you 
to create a subclass.
-+ [BrowserTool](apidocs/org/apache/velocity/tools/view/BrowserTool.html) - For 
identifying the browser and features thereof requesting the template.
-+ [CookieTool](apidocs/org/apache/velocity/tools/view/CookieTool.html) - For 
convenient cookie access and creation.
-+ [ImportTool](apidocs/org/apache/velocity/tools/view/ImportTool.html) - For 
pulling down textual content from a URL.
-+ [LinkTool](apidocs/org/apache/velocity/tools/view/LinkTool.html) - For easy 
building of URLs (both relative or absolute).
-+ [PagerTool](apidocs/org/apache/velocity/tools/view/PagerTool.html) - For 
doing request-based pagination of items in an arbitrary list.
-+ [ParameterTool](apidocs/org/apache/velocity/tools/view/ParameterTool.html) - 
For easy retrieval and parsing of ServletRequest parameters.
-+ 
[ViewContextTool](apidocs/org/apache/velocity/tools/view/ViewContextTool.html) 
- For convenient access to ViewContext data and meta-data.
+Please consult the [Standard Tools](tools-summary.html) page for a list of 
standard view tools.
 
 ## Examples

[velocity-site] branch main updated: [site] More broken links fixes

Reply via email to