diff --git a/docs/.htaccess b/docs/.htaccess
deleted file mode 100644
index 01572cb25..000000000
--- a/docs/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-AddOutputFilter INCLUDES .html
\ No newline at end of file
diff --git a/docs/antlibs/antunit/index.html b/docs/antlibs/antunit/index.html
index 5a075918e..f910c0fce 100755
--- a/docs/antlibs/antunit/index.html
+++ b/docs/antlibs/antunit/index.html
@@ -139,7 +139,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="../../images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="../../images/menu-right.gif">
diff --git a/docs/antlibs/bindownload.html b/docs/antlibs/bindownload.html
index 29312a7aa..6da32e6f4 100644
--- a/docs/antlibs/bindownload.html
+++ b/docs/antlibs/bindownload.html
@@ -139,7 +139,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="../images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="../images/menu-right.gif">
diff --git a/docs/antlibs/charter.html b/docs/antlibs/charter.html
index 45b7023e2..b51177cf0 100644
--- a/docs/antlibs/charter.html
+++ b/docs/antlibs/charter.html
@@ -139,7 +139,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="../images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="../images/menu-right.gif">
diff --git a/docs/antlibs/dotnet/index.html b/docs/antlibs/dotnet/index.html
index f7bbc1ece..09269bf10 100755
--- a/docs/antlibs/dotnet/index.html
+++ b/docs/antlibs/dotnet/index.html
@@ -139,7 +139,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="../../images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="../../images/menu-right.gif">
diff --git a/docs/antlibs/index.html b/docs/antlibs/index.html
index cf44e6599..d23e4395a 100644
--- a/docs/antlibs/index.html
+++ b/docs/antlibs/index.html
@@ -139,7 +139,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="../images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="../images/menu-right.gif">
diff --git a/docs/antlibs/proper.html b/docs/antlibs/proper.html
index 632788854..af80e2a8f 100644
--- a/docs/antlibs/proper.html
+++ b/docs/antlibs/proper.html
@@ -139,7 +139,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="../images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="../images/menu-right.gif">
diff --git a/docs/antlibs/sandbox.html b/docs/antlibs/sandbox.html
index be636d281..c317f3647 100644
--- a/docs/antlibs/sandbox.html
+++ b/docs/antlibs/sandbox.html
@@ -139,7 +139,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="../images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="../images/menu-right.gif">
diff --git a/docs/antlibs/srcdownload.html b/docs/antlibs/srcdownload.html
index 3603f6f8a..acde86cf5 100644
--- a/docs/antlibs/srcdownload.html
+++ b/docs/antlibs/srcdownload.html
@@ -139,7 +139,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="../images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="../images/menu-right.gif">
diff --git a/docs/antlibs/svn/index.html b/docs/antlibs/svn/index.html
index 1a76c91ef..8c632e33c 100755
--- a/docs/antlibs/svn/index.html
+++ b/docs/antlibs/svn/index.html
@@ -139,7 +139,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="../../images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="../../images/menu-right.gif">
diff --git a/docs/antnews.html b/docs/antnews.html
index bcf60859e..bd22ccbbd 100644
--- a/docs/antnews.html
+++ b/docs/antnews.html
@@ -195,7 +195,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="./images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="./images/menu-right.gif">
diff --git a/docs/bindownload.html b/docs/bindownload.html
index d92990b44..713d00785 100644
--- a/docs/bindownload.html
+++ b/docs/bindownload.html
@@ -187,7 +187,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="./images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="./images/menu-right.gif">
diff --git a/docs/bugs.html b/docs/bugs.html
index 5e774c60d..1208765d1 100644
--- a/docs/bugs.html
+++ b/docs/bugs.html
@@ -189,7 +189,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="./images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="./images/menu-right.gif">
diff --git a/docs/bylaws.html b/docs/bylaws.html
index 3273734b0..22cc1c28e 100644
--- a/docs/bylaws.html
+++ b/docs/bylaws.html
@@ -189,7 +189,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="./images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="./images/menu-right.gif">
diff --git a/docs/contributors.html b/docs/contributors.html
index 8decf51d8..0022a4307 100644
--- a/docs/contributors.html
+++ b/docs/contributors.html
@@ -189,7 +189,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="./images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="./images/menu-right.gif">
diff --git a/docs/external.html b/docs/external.html
index d2b6c09b4..b004e96ba 100644
--- a/docs/external.html
+++ b/docs/external.html
@@ -189,7 +189,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="./images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="./images/menu-right.gif">
diff --git a/docs/faq.html b/docs/faq.html
index 4529bd67e..00aab64ee 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -189,7 +189,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="./images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="./images/menu-right.gif">
diff --git a/docs/index.html b/docs/index.html
index 97533d52f..72552a800 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -191,7 +191,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="./images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="./images/menu-right.gif">
diff --git a/docs/legal.html b/docs/legal.html
index 2f57bd37a..48d1b1c5d 100644
--- a/docs/legal.html
+++ b/docs/legal.html
@@ -189,7 +189,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="./images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="./images/menu-right.gif">
diff --git a/docs/license.html b/docs/license.html
index 7038d5540..55a9834a8 100644
--- a/docs/license.html
+++ b/docs/license.html
@@ -189,7 +189,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="./images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="./images/menu-right.gif">
diff --git a/docs/mail.html b/docs/mail.html
index 7fc9eeb3e..1337b3e4b 100644
--- a/docs/mail.html
+++ b/docs/mail.html
@@ -189,7 +189,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="./images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="./images/menu-right.gif">
diff --git a/docs/mission.html b/docs/mission.html
index b408f8963..6a3316fb9 100644
--- a/docs/mission.html
+++ b/docs/mission.html
@@ -189,7 +189,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="./images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="./images/menu-right.gif">
diff --git a/docs/nightlies.html b/docs/nightlies.html
index 33f8bf0e1..10432bddc 100644
--- a/docs/nightlies.html
+++ b/docs/nightlies.html
@@ -187,7 +187,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="./images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="./images/menu-right.gif">
diff --git a/docs/problems.html b/docs/problems.html
index 29298c0c0..1c50243e7 100644
--- a/docs/problems.html
+++ b/docs/problems.html
@@ -189,7 +189,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="./images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="./images/menu-right.gif">
diff --git a/docs/projects.html b/docs/projects.html
index 3b60652b6..e4029daff 100644
--- a/docs/projects.html
+++ b/docs/projects.html
@@ -189,7 +189,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="./images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="./images/menu-right.gif">
diff --git a/docs/projects/index.html b/docs/projects/index.html
index 64027a9ec..6deab7a3e 100644
--- a/docs/projects/index.html
+++ b/docs/projects/index.html
@@ -141,7 +141,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="../images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="../images/menu-right.gif">
diff --git a/docs/projects/ivy.html b/docs/projects/ivy.html
index 020a98da3..00696eb92 100644
--- a/docs/projects/ivy.html
+++ b/docs/projects/ivy.html
@@ -139,7 +139,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="../images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="../images/menu-right.gif">
diff --git a/docs/resources.html b/docs/resources.html
index a7ac707da..1eaa7cb06 100644
--- a/docs/resources.html
+++ b/docs/resources.html
@@ -189,7 +189,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="./images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="./images/menu-right.gif">
diff --git a/docs/srcdownload.html b/docs/srcdownload.html
index e66fa3064..4ba85c6bf 100644
--- a/docs/srcdownload.html
+++ b/docs/srcdownload.html
@@ -187,7 +187,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="./images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="./images/menu-right.gif">
diff --git a/docs/svn.html b/docs/svn.html
index 698050774..2f41e67b7 100644
--- a/docs/svn.html
+++ b/docs/svn.html
@@ -189,7 +189,7 @@
             </ul>
     </div>
     <center>
-    <!--#include virtual="/ads/buttonbar.html" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="./images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="./images/menu-right.gif">
diff --git a/xdocs/stylesheets/site.vsl b/xdocs/stylesheets/site.vsl
index 57c8f2531..dd8aa2f6f 100644
--- a/xdocs/stylesheets/site.vsl
+++ b/xdocs/stylesheets/site.vsl
@@ -45,8 +45,6 @@
     #set ($blue1 = "#CFDCED")
     #set ($sourceborder = "#023264")
     #set ($pound = "#" )
-    #set ($ssi = "include virtual=")
-    #set ($adsurl = "/ads/buttonbar.html")
 ## start the processing
 #document()
 ## end the processing
diff --git a/xdocs/stylesheets/templates.vm b/xdocs/stylesheets/templates.vm
index ac3e03b54..2e788b934 100644
--- a/xdocs/stylesheets/templates.vm
+++ b/xdocs/stylesheets/templates.vm
@@ -216,7 +216,7 @@
       </ul>
     </div>
     <center>
-    <!--$pound$ssi"$adsurl" -->
+    <a href="http://www.apache.org/events/current-event.html"><img border="0" title="ApacheCon" alt="ApacheCon - logo" src="http://www.apache.org/events/current-event-125x125.png" style="width: 125px;height: 125px;"></a>
     </center>
     <img style="float: left" height="10" width="10" border="0" alt="" src="$relativePath/images/menu-left.gif">
     <img style="float: right" height="10" width="10" border="0" alt="" src="$relativePath/images/menu-right.gif">