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 1981211 Merge PR #7 into prod 1981211 is described below commit 198121107a9579aad5ea9280fb2336f5fc28cd9b Author: Claude Brisson <cla...@renegat.net> AuthorDate: Sat Dec 18 12:32:39 2021 +0100 Merge PR #7 into prod --- download.html | 2 +- engine/2.0/developer-guide.html | 2 +- engine/2.1/developer-guide.html | 2 +- engine/2.2/developer-guide.html | 2 +- engine/2.3/developer-guide.html | 2 +- engine/devel/developer-guide.html | 2 +- index.html | 4 ---- tools/3.0/upgrading.html | 2 +- tools/3.1/upgrading.html | 2 +- tools/devel/upgrading.html | 2 +- 10 files changed, 9 insertions(+), 13 deletions(-) diff --git a/download.html b/download.html index 5d43c09..4a28c3c 100644 --- a/download.html +++ b/download.html @@ -651,7 +651,7 @@ git checkout tags/3.1 <tr> <td>Tools</td> <td><a href="https://gitbox.apache.org/repos/asf/velocity-tools.git">https://gitbox.apache.org/repos/asf/velocity-tools.git</a></td> -<td><a href="https://github.com/apache/velocity-engine.git">https://github.com/apache/velocity-engine.git</a></td> +<td><a href="https://github.com/apache/velocity-tools.git">https://github.com/apache/velocity-tools.git</a></td> </tr> <tr> <td>Site</td> diff --git a/engine/2.0/developer-guide.html b/engine/2.0/developer-guide.html index e2ca5f2..cac7281 100644 --- a/engine/2.0/developer-guide.html +++ b/engine/2.0/developer-guide.html @@ -749,7 +749,7 @@ see the Javadoc API documentation.</p> </ul> <p>You can customize this logger in two ways:</p> <ul> -<li>By programmatically giving Velocity a living instance of an orf.slf4j.Logger object, using the runtime.log.instance property key.</li> +<li>By programmatically giving Velocity a living instance of an org.slf4j.Logger object, using the runtime.log.instance property key.</li> <li>By configuring the name of the logger to be used by your velocity instance, using the runtime.log.name property key. It can be done from the velocity.properties file, if present.</li> </ul> <h2 id="space-gobbling">Space Gobbling<a class="headerlink" href="#space-gobbling" title="Permanent link">¶</a></h2> diff --git a/engine/2.1/developer-guide.html b/engine/2.1/developer-guide.html index 425526b..2f5e1da 100644 --- a/engine/2.1/developer-guide.html +++ b/engine/2.1/developer-guide.html @@ -751,7 +751,7 @@ see the Javadoc API documentation.</p> </ul> <p>You can customize this logger in two ways:</p> <ul> -<li>By programmatically giving Velocity a living instance of an orf.slf4j.Logger object, using the runtime.log.instance property key.</li> +<li>By programmatically giving Velocity a living instance of an org.slf4j.Logger object, using the runtime.log.instance property key.</li> <li>By configuring the name of the logger to be used by your velocity instance, using the runtime.log.name property key. It can be done from the velocity.properties file, if present.</li> </ul> <h2 id="space-gobbling">Space Gobbling<a class="headerlink" href="#space-gobbling" title="Permanent link">¶</a></h2> diff --git a/engine/2.2/developer-guide.html b/engine/2.2/developer-guide.html index 33fbe02..bccfcf1 100644 --- a/engine/2.2/developer-guide.html +++ b/engine/2.2/developer-guide.html @@ -752,7 +752,7 @@ see the Javadoc API documentation.</p> </ul> <p>You can customize this logger in two ways:</p> <ul> -<li>By programmatically giving Velocity a living instance of an orf.slf4j.Logger object, using the runtime.log.instance property key.</li> +<li>By programmatically giving Velocity a living instance of an org.slf4j.Logger object, using the runtime.log.instance property key.</li> <li>By configuring the name of the logger to be used by your velocity instance, using the runtime.log.name property key. It can be done from the velocity.properties file, if present.</li> </ul> <h2 id="space-gobbling">Space Gobbling<a class="headerlink" href="#space-gobbling" title="Permanent link">¶</a></h2> diff --git a/engine/2.3/developer-guide.html b/engine/2.3/developer-guide.html index 4b71696..a122b3d 100644 --- a/engine/2.3/developer-guide.html +++ b/engine/2.3/developer-guide.html @@ -752,7 +752,7 @@ see the Javadoc API documentation.</p> </ul> <p>You can customize this logger in two ways:</p> <ul> -<li>By programmatically giving Velocity a living instance of an orf.slf4j.Logger object, using the runtime.log.instance property key.</li> +<li>By programmatically giving Velocity a living instance of an org.slf4j.Logger object, using the runtime.log.instance property key.</li> <li>By configuring the name of the logger to be used by your velocity instance, using the runtime.log.name property key. It can be done from the velocity.properties file, if present.</li> </ul> <h2 id="space-gobbling">Space Gobbling<a class="headerlink" href="#space-gobbling" title="Permanent link">¶</a></h2> diff --git a/engine/devel/developer-guide.html b/engine/devel/developer-guide.html index 6572746..46d55e4 100644 --- a/engine/devel/developer-guide.html +++ b/engine/devel/developer-guide.html @@ -752,7 +752,7 @@ see the Javadoc API documentation.</p> </ul> <p>You can customize this logger in two ways:</p> <ul> -<li>By programmatically giving Velocity a living instance of an orf.slf4j.Logger object, using the runtime.log.instance property key.</li> +<li>By programmatically giving Velocity a living instance of an org.slf4j.Logger object, using the runtime.log.instance property key.</li> <li>By configuring the name of the logger to be used by your velocity instance, using the runtime.log.name property key. It can be done from the velocity.properties file, if present.</li> </ul> <h2 id="space-gobbling">Space Gobbling<a class="headerlink" href="#space-gobbling" title="Permanent link">¶</a></h2> diff --git a/index.html b/index.html index 50e16bd..346c124 100644 --- a/index.html +++ b/index.html @@ -26,10 +26,6 @@ <link rel="stylesheet" type="text/css" href="/css/site.css"> - - - - </head> <body> diff --git a/tools/3.0/upgrading.html b/tools/3.0/upgrading.html index b1b7fe0..87df16e 100644 --- a/tools/3.0/upgrading.html +++ b/tools/3.0/upgrading.html @@ -226,7 +226,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover </div> <h2 id="upgrading-to-30">Upgrading to 3.0<a class="headerlink" href="#upgrading-to-30" title="Permanent link">¶</a></h2> <p>The maven <code>groupId</code> has been changed to <code>org.apache.velocity.tools</code> .</p> -<p>Velocity Tools, as well as Velocity Engine 2.0+, has switched to the SLF4J logging facade. All logger objects are now <code>orf.slf4j.Logger</code> instances.</p> +<p>Velocity Tools, as well as Velocity Engine 2.0+, has switched to the SLF4J logging facade. All logger objects are now <code>org.slf4j.Logger</code> instances.</p> <p>All objects, methods and configuration formats deprecated in 2.0 have been suppressed.</p> <p>Support for the Struts 1.x tools has been discontinued.</p> <p>For custom objects refering directly to the Velocity Engine API, please refer to the <a href="http://velocity.apache.org/engine/2.0/upgrading.html">Velocity Engine 2.0 Upgrading section</a>.</p> diff --git a/tools/3.1/upgrading.html b/tools/3.1/upgrading.html index b256c9a..0b352e4 100644 --- a/tools/3.1/upgrading.html +++ b/tools/3.1/upgrading.html @@ -229,7 +229,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover <p>No special action to take.</p> <h2 id="upgrading-to-30">Upgrading to 3.0<a class="headerlink" href="#upgrading-to-30" title="Permanent link">¶</a></h2> <p>The maven <code>groupId</code> has been changed to <code>org.apache.velocity.tools</code> .</p> -<p>Velocity Tools, as well as Velocity Engine 2.0+, has switched to the SLF4J logging facade. All logger objects are now <code>orf.slf4j.Logger</code> instances.</p> +<p>Velocity Tools, as well as Velocity Engine 2.0+, has switched to the SLF4J logging facade. All logger objects are now <code>org.slf4j.Logger</code> instances.</p> <p>All objects, methods and configuration formats deprecated in 2.0 have been suppressed.</p> <p>Support for the Struts 1.x tools has been discontinued.</p> <p>For custom objects refering directly to the Velocity Engine API, please refer to the <a href="http://velocity.apache.org/engine/2.0/upgrading.html">Velocity Engine 2.0 Upgrading section</a>.</p> diff --git a/tools/devel/upgrading.html b/tools/devel/upgrading.html index b08f782..cfe0e48 100644 --- a/tools/devel/upgrading.html +++ b/tools/devel/upgrading.html @@ -229,7 +229,7 @@ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover <p>No special action to take.</p> <h2 id="upgrading-to-30">Upgrading to 3.0<a class="headerlink" href="#upgrading-to-30" title="Permanent link">¶</a></h2> <p>The maven <code>groupId</code> has been changed to <code>org.apache.velocity.tools</code> .</p> -<p>Velocity Tools, as well as Velocity Engine 2.0+, has switched to the SLF4J logging facade. All logger objects are now <code>orf.slf4j.Logger</code> instances.</p> +<p>Velocity Tools, as well as Velocity Engine 2.0+, has switched to the SLF4J logging facade. All logger objects are now <code>org.slf4j.Logger</code> instances.</p> <p>All objects, methods and configuration formats deprecated in 2.0 have been suppressed.</p> <p>Support for the Struts 1.x tools has been discontinued.</p> <p>For custom objects refering directly to the Velocity Engine API, please refer to the <a href="http://velocity.apache.org/engine/2.0/upgrading.html">Velocity Engine 2.0 Upgrading section</a>.</p>