Updates stage by Jenkins
diff --git a/content/404.html b/content/404.html
index 6e48f24..e14ff37 100644
--- a/content/404.html
+++ b/content/404.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/announce-2002.html b/content/announce-2002.html
index 2bb3cd6..1eef482 100644
--- a/content/announce-2002.html
+++ b/content/announce-2002.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/announce-2003.html b/content/announce-2003.html
index 50f3daf..3b3f452 100644
--- a/content/announce-2003.html
+++ b/content/announce-2003.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/announce-2004.html b/content/announce-2004.html
index c953a1a..0bd3179 100644
--- a/content/announce-2004.html
+++ b/content/announce-2004.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/announce-2005.html b/content/announce-2005.html
index 945e30d..9fd8fd0 100644
--- a/content/announce-2005.html
+++ b/content/announce-2005.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/announce-2006.html b/content/announce-2006.html
index a1802d1..206a3b5 100644
--- a/content/announce-2006.html
+++ b/content/announce-2006.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/announce-2007.html b/content/announce-2007.html
index 72ab997..d2d1ab2 100644
--- a/content/announce-2007.html
+++ b/content/announce-2007.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/announce-2008.html b/content/announce-2008.html
index 0403355..ba30786 100644
--- a/content/announce-2008.html
+++ b/content/announce-2008.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/announce-2009.html b/content/announce-2009.html
index 66364dd..fba27fd 100644
--- a/content/announce-2009.html
+++ b/content/announce-2009.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/announce-2010.html b/content/announce-2010.html
index 82477f7..be157ef 100644
--- a/content/announce-2010.html
+++ b/content/announce-2010.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/announce-2011.html b/content/announce-2011.html
index bcdd06c..bf978a4 100644
--- a/content/announce-2011.html
+++ b/content/announce-2011.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/announce-2012.html b/content/announce-2012.html
index 0b3931f..a04dd43 100644
--- a/content/announce-2012.html
+++ b/content/announce-2012.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/announce-2013.html b/content/announce-2013.html
index ab777f6..4cd143d 100644
--- a/content/announce-2013.html
+++ b/content/announce-2013.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/announce-2014.html b/content/announce-2014.html
index 0db82ea..9af706c 100644
--- a/content/announce-2014.html
+++ b/content/announce-2014.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/announce-2015.html b/content/announce-2015.html
index 31e0fce..927bfd9 100644
--- a/content/announce-2015.html
+++ b/content/announce-2015.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/announce-2016.html b/content/announce-2016.html
index edebbae..cbd5132 100644
--- a/content/announce-2016.html
+++ b/content/announce-2016.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/announce-2017.html b/content/announce-2017.html
index f71b743..aa038bd 100644
--- a/content/announce-2017.html
+++ b/content/announce-2017.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/announce-2018.html b/content/announce-2018.html
index 5762724..b4bd009 100644
--- a/content/announce-2018.html
+++ b/content/announce-2018.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/announce-2019.html b/content/announce-2019.html
index 708b15c..caf8383 100644
--- a/content/announce-2019.html
+++ b/content/announce-2019.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/announce-2020.html b/content/announce-2020.html
index 09b3377..3cee763 100644
--- a/content/announce-2020.html
+++ b/content/announce-2020.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/announce-2021.html b/content/announce-2021.html
index 9eeb643..0915fbd 100644
--- a/content/announce-2021.html
+++ b/content/announce-2021.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/birdseye.html b/content/birdseye.html
index 7c8ab28..38ca871 100644
--- a/content/birdseye.html
+++ b/content/birdseye.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/builds.html b/content/builds.html
index b8ef78a..73c19b5 100644
--- a/content/builds.html
+++ b/content/builds.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/bylaws.html b/content/bylaws.html
index 056ee49..e843959 100644
--- a/content/bylaws.html
+++ b/content/bylaws.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/coding-standards.html b/content/coding-standards.html
index 076d166..5c15abb 100644
--- a/content/coding-standards.html
+++ b/content/coding-standards.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/contributors/building-fast-track-release.html b/content/contributors/building-fast-track-release.html
index 1f08e64..1fc8aac 100644
--- a/content/contributors/building-fast-track-release.html
+++ b/content/contributors/building-fast-track-release.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/contributors/building-normal-release.html b/content/contributors/building-normal-release.html
index 592a261..a8499bf 100644
--- a/content/contributors/building-normal-release.html
+++ b/content/contributors/building-normal-release.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/contributors/building-struts-annotations.html b/content/contributors/building-struts-annotations.html
index 0b9a6c0..c6e079b 100644
--- a/content/contributors/building-struts-annotations.html
+++ b/content/contributors/building-struts-annotations.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/contributors/building-struts-master.html b/content/contributors/building-struts-master.html
index 56fff2c..f6b33d6 100644
--- a/content/contributors/building-struts-master.html
+++ b/content/contributors/building-struts-master.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/contributors/building-the-framework-from-source.html b/content/contributors/building-the-framework-from-source.html
index 54b21fe..0cad9db 100644
--- a/content/contributors/building-the-framework-from-source.html
+++ b/content/contributors/building-the-framework-from-source.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/contributors/building-with-maven.html b/content/contributors/building-with-maven.html
index 5899360..d5381cb 100644
--- a/content/contributors/building-with-maven.html
+++ b/content/contributors/building-with-maven.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/contributors/creating-and-signing-a-distribution.html b/content/contributors/creating-and-signing-a-distribution.html
index 5499e69..5ef19da 100644
--- a/content/contributors/creating-and-signing-a-distribution.html
+++ b/content/contributors/creating-and-signing-a-distribution.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/contributors/documentation-style-guide.html b/content/contributors/documentation-style-guide.html
index 258450c..ed0d5aa 100644
--- a/content/contributors/documentation-style-guide.html
+++ b/content/contributors/documentation-style-guide.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/contributors/editing-the-documentation.html b/content/contributors/editing-the-documentation.html
index eeb956e..2d35b64 100644
--- a/content/contributors/editing-the-documentation.html
+++ b/content/contributors/editing-the-documentation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/contributors/index.html b/content/contributors/index.html
index 451d2fb..2ada52b 100644
--- a/content/contributors/index.html
+++ b/content/contributors/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/contributors/obtaining-an-idea-license.html b/content/contributors/obtaining-an-idea-license.html
index 10ab14f..5f44123 100644
--- a/content/contributors/obtaining-an-idea-license.html
+++ b/content/contributors/obtaining-an-idea-license.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/contributors/one-time-steps.html b/content/contributors/one-time-steps.html
index a7b363b..0c62597 100644
--- a/content/contributors/one-time-steps.html
+++ b/content/contributors/one-time-steps.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/contributors/precise-error-reporting.html b/content/contributors/precise-error-reporting.html
index 6506c79..476aff6 100644
--- a/content/contributors/precise-error-reporting.html
+++ b/content/contributors/precise-error-reporting.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/contributors/sample-announcements.html b/content/contributors/sample-announcements.html
index ccd212e..466d4eb 100644
--- a/content/contributors/sample-announcements.html
+++ b/content/contributors/sample-announcements.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/accessing-application-session-request-objects.html b/content/core-developers/accessing-application-session-request-objects.html
index 21bf18c..dbf130c 100644
--- a/content/core-developers/accessing-application-session-request-objects.html
+++ b/content/core-developers/accessing-application-session-request-objects.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/action-chaining.html b/content/core-developers/action-chaining.html
index c59bf8b..63e30c9 100644
--- a/content/core-developers/action-chaining.html
+++ b/content/core-developers/action-chaining.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/action-configuration.html b/content/core-developers/action-configuration.html
index 8a81bf0..c70662e 100644
--- a/content/core-developers/action-configuration.html
+++ b/content/core-developers/action-configuration.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/action-event-listener.html b/content/core-developers/action-event-listener.html
index e5611be..5323845 100644
--- a/content/core-developers/action-event-listener.html
+++ b/content/core-developers/action-event-listener.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/action-mapper.html b/content/core-developers/action-mapper.html
index ff82f76..9956213 100644
--- a/content/core-developers/action-mapper.html
+++ b/content/core-developers/action-mapper.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/action-proxy-and-actionproxy-factory.html b/content/core-developers/action-proxy-and-actionproxy-factory.html
index cfa243e..59ac6f5 100644
--- a/content/core-developers/action-proxy-and-actionproxy-factory.html
+++ b/content/core-developers/action-proxy-and-actionproxy-factory.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/after-annotation.html b/content/core-developers/after-annotation.html
index 1456fed..868b39b 100644
--- a/content/core-developers/after-annotation.html
+++ b/content/core-developers/after-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/ajax-client-side-validation.html b/content/core-developers/ajax-client-side-validation.html
index 9c54b93..2e9eb89 100644
--- a/content/core-developers/ajax-client-side-validation.html
+++ b/content/core-developers/ajax-client-side-validation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/ajax.html b/content/core-developers/ajax.html
index e09bfcd..4e7e4e3 100644
--- a/content/core-developers/ajax.html
+++ b/content/core-developers/ajax.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/alias-interceptor.html b/content/core-developers/alias-interceptor.html
index dfd26b5..59e6e36 100644
--- a/content/core-developers/alias-interceptor.html
+++ b/content/core-developers/alias-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/annotation-parameter-filter-interceptor.html b/content/core-developers/annotation-parameter-filter-interceptor.html
index c9aafeb..8d3dd98 100644
--- a/content/core-developers/annotation-parameter-filter-interceptor.html
+++ b/content/core-developers/annotation-parameter-filter-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/annotation-workflow-interceptor.html b/content/core-developers/annotation-workflow-interceptor.html
index 1263916..a93b19d 100644
--- a/content/core-developers/annotation-workflow-interceptor.html
+++ b/content/core-developers/annotation-workflow-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/annotations.html b/content/core-developers/annotations.html
index 50bb32b..07c2bfc 100644
--- a/content/core-developers/annotations.html
+++ b/content/core-developers/annotations.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/application-servers.html b/content/core-developers/application-servers.html
index cb6f18a..038b60e 100644
--- a/content/core-developers/application-servers.html
+++ b/content/core-developers/application-servers.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/basic-validation.html b/content/core-developers/basic-validation.html
index bfa26dd..2ae595b 100644
--- a/content/core-developers/basic-validation.html
+++ b/content/core-developers/basic-validation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/bean-configuration.html b/content/core-developers/bean-configuration.html
index 83566d3..f61df31 100644
--- a/content/core-developers/bean-configuration.html
+++ b/content/core-developers/bean-configuration.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/before-annotation.html b/content/core-developers/before-annotation.html
index 636fe53..85836cc 100644
--- a/content/core-developers/before-annotation.html
+++ b/content/core-developers/before-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/before-result-annotation.html b/content/core-developers/before-result-annotation.html
index ac1074c..d2d4985 100644
--- a/content/core-developers/before-result-annotation.html
+++ b/content/core-developers/before-result-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/big-picture.html b/content/core-developers/big-picture.html
index fafbd01..474dea0 100644
--- a/content/core-developers/big-picture.html
+++ b/content/core-developers/big-picture.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/chain-result.html b/content/core-developers/chain-result.html
index a1e5ccf..3650840 100644
--- a/content/core-developers/chain-result.html
+++ b/content/core-developers/chain-result.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/chaining-interceptor.html b/content/core-developers/chaining-interceptor.html
index 81df1a8..67516c8 100644
--- a/content/core-developers/chaining-interceptor.html
+++ b/content/core-developers/chaining-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/checkbox-interceptor.html b/content/core-developers/checkbox-interceptor.html
index 10b1517..cfce218 100644
--- a/content/core-developers/checkbox-interceptor.html
+++ b/content/core-developers/checkbox-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/clear-session-interceptor.html b/content/core-developers/clear-session-interceptor.html
index 2aa87c5..1d87c17 100644
--- a/content/core-developers/clear-session-interceptor.html
+++ b/content/core-developers/clear-session-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/client-side-validation.html b/content/core-developers/client-side-validation.html
index 0bc7c98..f57be59 100644
--- a/content/core-developers/client-side-validation.html
+++ b/content/core-developers/client-side-validation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/client-validation.html b/content/core-developers/client-validation.html
index 6fa6629..3bbe62e 100644
--- a/content/core-developers/client-validation.html
+++ b/content/core-developers/client-validation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/coep-interceptor.html b/content/core-developers/coep-interceptor.html
index eb76da9..90bb135 100644
--- a/content/core-developers/coep-interceptor.html
+++ b/content/core-developers/coep-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/conditionalvisitor-validator.html b/content/core-developers/conditionalvisitor-validator.html
index 2a3ed6f..d4c5a21 100644
--- a/content/core-developers/conditionalvisitor-validator.html
+++ b/content/core-developers/conditionalvisitor-validator.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/configuration-elements.html b/content/core-developers/configuration-elements.html
index e94b351..38706a4 100644
--- a/content/core-developers/configuration-elements.html
+++ b/content/core-developers/configuration-elements.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/configuration-files.html b/content/core-developers/configuration-files.html
index 1d93e45..b1cf422 100644
--- a/content/core-developers/configuration-files.html
+++ b/content/core-developers/configuration-files.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/configuration-provider-and-configuration.html b/content/core-developers/configuration-provider-and-configuration.html
index e43c4aa..6cfa865 100644
--- a/content/core-developers/configuration-provider-and-configuration.html
+++ b/content/core-developers/configuration-provider-and-configuration.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/constant-configuration.html b/content/core-developers/constant-configuration.html
index 17445ec..00f6316 100644
--- a/content/core-developers/constant-configuration.html
+++ b/content/core-developers/constant-configuration.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/conversion-annotation.html b/content/core-developers/conversion-annotation.html
index c1b5556..c8d86ae 100644
--- a/content/core-developers/conversion-annotation.html
+++ b/content/core-developers/conversion-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/conversion-error-field-validator-annotation.html b/content/core-developers/conversion-error-field-validator-annotation.html
index 038d0c5..f557886 100644
--- a/content/core-developers/conversion-error-field-validator-annotation.html
+++ b/content/core-developers/conversion-error-field-validator-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/conversion-error-interceptor.html b/content/core-developers/conversion-error-interceptor.html
index ea23742..c689e5d 100644
--- a/content/core-developers/conversion-error-interceptor.html
+++ b/content/core-developers/conversion-error-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/conversion-validator.html b/content/core-developers/conversion-validator.html
index 13726d1..1c005ea 100644
--- a/content/core-developers/conversion-validator.html
+++ b/content/core-developers/conversion-validator.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/cookie-interceptor.html b/content/core-developers/cookie-interceptor.html
index 7d3a70f..b9ff30d 100644
--- a/content/core-developers/cookie-interceptor.html
+++ b/content/core-developers/cookie-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/cookie-provider-interceptor.html b/content/core-developers/cookie-provider-interceptor.html
index 7dd5d4a..22b8e15 100644
--- a/content/core-developers/cookie-provider-interceptor.html
+++ b/content/core-developers/cookie-provider-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/coop-interceptor.html b/content/core-developers/coop-interceptor.html
index bf454a3..a3ceebf 100644
--- a/content/core-developers/coop-interceptor.html
+++ b/content/core-developers/coop-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/create-if-null-annotation.html b/content/core-developers/create-if-null-annotation.html
index 196a9a7..502016b 100644
--- a/content/core-developers/create-if-null-annotation.html
+++ b/content/core-developers/create-if-null-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/create-session-interceptor.html b/content/core-developers/create-session-interceptor.html
index a9c0a33..0de84cb 100644
--- a/content/core-developers/create-session-interceptor.html
+++ b/content/core-developers/create-session-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/custom-validator-annotation.html b/content/core-developers/custom-validator-annotation.html
index 50121c0..29d25a0 100644
--- a/content/core-developers/custom-validator-annotation.html
+++ b/content/core-developers/custom-validator-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/date-range-field-validator-annotation.html b/content/core-developers/date-range-field-validator-annotation.html
index e2b7d2f..4316225 100644
--- a/content/core-developers/date-range-field-validator-annotation.html
+++ b/content/core-developers/date-range-field-validator-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/date-validator.html b/content/core-developers/date-validator.html
index 5e6d12b..d981757 100644
--- a/content/core-developers/date-validator.html
+++ b/content/core-developers/date-validator.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/debugging-interceptor.html b/content/core-developers/debugging-interceptor.html
index da34751..d821a86 100644
--- a/content/core-developers/debugging-interceptor.html
+++ b/content/core-developers/debugging-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/debugging.html b/content/core-developers/debugging.html
index a007799..3ad6ed0 100644
--- a/content/core-developers/debugging.html
+++ b/content/core-developers/debugging.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/default-properties.html b/content/core-developers/default-properties.html
index a004ecb..4304f07 100644
--- a/content/core-developers/default-properties.html
+++ b/content/core-developers/default-properties.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/default-workflow-interceptor.html b/content/core-developers/default-workflow-interceptor.html
index 63791c7..5eaafff 100644
--- a/content/core-developers/default-workflow-interceptor.html
+++ b/content/core-developers/default-workflow-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/dependency-injection.html b/content/core-developers/dependency-injection.html
index 8924468..157b30a 100644
--- a/content/core-developers/dependency-injection.html
+++ b/content/core-developers/dependency-injection.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/development-mode.html b/content/core-developers/development-mode.html
index c33d1d6..76873eb 100644
--- a/content/core-developers/development-mode.html
+++ b/content/core-developers/development-mode.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/dispatcher-listener.html b/content/core-developers/dispatcher-listener.html
index c527f01..f5e4456 100644
--- a/content/core-developers/dispatcher-listener.html
+++ b/content/core-developers/dispatcher-listener.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/dispatcher-result.html b/content/core-developers/dispatcher-result.html
index da4013c..62b3fd0 100644
--- a/content/core-developers/dispatcher-result.html
+++ b/content/core-developers/dispatcher-result.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/dispatcher.html b/content/core-developers/dispatcher.html
index 363f5c5..3e89b06 100644
--- a/content/core-developers/dispatcher.html
+++ b/content/core-developers/dispatcher.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/double-range-field-validator-annotation.html b/content/core-developers/double-range-field-validator-annotation.html
index 68102b8..85fd9b3 100644
--- a/content/core-developers/double-range-field-validator-annotation.html
+++ b/content/core-developers/double-range-field-validator-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/double-validator.html b/content/core-developers/double-validator.html
index 19ee150..55b0ee8 100644
--- a/content/core-developers/double-validator.html
+++ b/content/core-developers/double-validator.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/element-annotation.html b/content/core-developers/element-annotation.html
index 25cbb47..18b9965 100644
--- a/content/core-developers/element-annotation.html
+++ b/content/core-developers/element-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/email-validator-annotation.html b/content/core-developers/email-validator-annotation.html
index 9fd2705..fd7cd3f 100644
--- a/content/core-developers/email-validator-annotation.html
+++ b/content/core-developers/email-validator-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/email-validator.html b/content/core-developers/email-validator.html
index 455b18f..1d2f2e9 100644
--- a/content/core-developers/email-validator.html
+++ b/content/core-developers/email-validator.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/exception-configuration.html b/content/core-developers/exception-configuration.html
index 1c2748b..669bf77 100644
--- a/content/core-developers/exception-configuration.html
+++ b/content/core-developers/exception-configuration.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/exception-interceptor.html b/content/core-developers/exception-interceptor.html
index f914271..76d7b71 100644
--- a/content/core-developers/exception-interceptor.html
+++ b/content/core-developers/exception-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/execute-and-wait-interceptor.html b/content/core-developers/execute-and-wait-interceptor.html
index f501874..88eba91 100644
--- a/content/core-developers/execute-and-wait-interceptor.html
+++ b/content/core-developers/execute-and-wait-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/expression-validator-annotation.html b/content/core-developers/expression-validator-annotation.html
index a2fcd75..d4dae94 100644
--- a/content/core-developers/expression-validator-annotation.html
+++ b/content/core-developers/expression-validator-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/expression-validator.html b/content/core-developers/expression-validator.html
index 234f851..a0b792e 100644
--- a/content/core-developers/expression-validator.html
+++ b/content/core-developers/expression-validator.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/fetch-metadata-interceptor.html b/content/core-developers/fetch-metadata-interceptor.html
index 90690db..eb55728 100644
--- a/content/core-developers/fetch-metadata-interceptor.html
+++ b/content/core-developers/fetch-metadata-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/field-expression-validator-annotation.html b/content/core-developers/field-expression-validator-annotation.html
index 406ae2d..97a3989 100644
--- a/content/core-developers/field-expression-validator-annotation.html
+++ b/content/core-developers/field-expression-validator-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/fieldexpression-validator.html b/content/core-developers/fieldexpression-validator.html
index 1bf7012..fb4fb9d 100644
--- a/content/core-developers/fieldexpression-validator.html
+++ b/content/core-developers/fieldexpression-validator.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/file-upload-interceptor.html b/content/core-developers/file-upload-interceptor.html
index 1f18e2e..01d5c7e 100644
--- a/content/core-developers/file-upload-interceptor.html
+++ b/content/core-developers/file-upload-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/file-upload.html b/content/core-developers/file-upload.html
index b07d437..20437c0 100644
--- a/content/core-developers/file-upload.html
+++ b/content/core-developers/file-upload.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/formatting-dates-and-numbers.html b/content/core-developers/formatting-dates-and-numbers.html
index 5ae563d..1b8ee14 100644
--- a/content/core-developers/formatting-dates-and-numbers.html
+++ b/content/core-developers/formatting-dates-and-numbers.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/freemarker-result.html b/content/core-developers/freemarker-result.html
index f8f88c8..9b895e5 100644
--- a/content/core-developers/freemarker-result.html
+++ b/content/core-developers/freemarker-result.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/freemarker-support.html b/content/core-developers/freemarker-support.html
index f181934..d14a980 100644
--- a/content/core-developers/freemarker-support.html
+++ b/content/core-developers/freemarker-support.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/glassfish-2-x.html b/content/core-developers/glassfish-2-x.html
index cf3c816..9e90ff8 100644
--- a/content/core-developers/glassfish-2-x.html
+++ b/content/core-developers/glassfish-2-x.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/httpheader-result.html b/content/core-developers/httpheader-result.html
index 41bfe6b..9f7788d 100644
--- a/content/core-developers/httpheader-result.html
+++ b/content/core-developers/httpheader-result.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/https-and-ie-issues.html b/content/core-developers/https-and-ie-issues.html
index 218c9f2..68301ff 100644
--- a/content/core-developers/https-and-ie-issues.html
+++ b/content/core-developers/https-and-ie-issues.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/i18n-interceptor.html b/content/core-developers/i18n-interceptor.html
index 53a1c7f..fe7d1bf 100644
--- a/content/core-developers/i18n-interceptor.html
+++ b/content/core-developers/i18n-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/include-configuration.html b/content/core-developers/include-configuration.html
index 4a3ef06..53f093b 100644
--- a/content/core-developers/include-configuration.html
+++ b/content/core-developers/include-configuration.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/index.html b/content/core-developers/index.html
index 2d6f5a5..33f84f7 100644
--- a/content/core-developers/index.html
+++ b/content/core-developers/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/input-config-annotation.html b/content/core-developers/input-config-annotation.html
index 59106f2..12f046e 100644
--- a/content/core-developers/input-config-annotation.html
+++ b/content/core-developers/input-config-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/int-range-field-validator-annotation.html b/content/core-developers/int-range-field-validator-annotation.html
index 3db3b6b..6271b41 100644
--- a/content/core-developers/int-range-field-validator-annotation.html
+++ b/content/core-developers/int-range-field-validator-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/int-validator.html b/content/core-developers/int-validator.html
index 3e314d5..fc62f03 100644
--- a/content/core-developers/int-validator.html
+++ b/content/core-developers/int-validator.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/interceptor-configuration.html b/content/core-developers/interceptor-configuration.html
index b7224d4..a4c6668 100644
--- a/content/core-developers/interceptor-configuration.html
+++ b/content/core-developers/interceptor-configuration.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/interceptors.html b/content/core-developers/interceptors.html
index ce5508b..e786c02 100644
--- a/content/core-developers/interceptors.html
+++ b/content/core-developers/interceptors.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/jboss-5.html b/content/core-developers/jboss-5.html
index 386e80c..db521c5 100644
--- a/content/core-developers/jboss-5.html
+++ b/content/core-developers/jboss-5.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/key-annotation.html b/content/core-developers/key-annotation.html
index c6b0ec0..6f29d40 100644
--- a/content/core-developers/key-annotation.html
+++ b/content/core-developers/key-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/key-property-annotation.html b/content/core-developers/key-property-annotation.html
index 4d248f6..40a925f 100644
--- a/content/core-developers/key-property-annotation.html
+++ b/content/core-developers/key-property-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/localization.html b/content/core-developers/localization.html
index 91cf698..c43a0c0 100644
--- a/content/core-developers/localization.html
+++ b/content/core-developers/localization.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/logging-interceptor.html b/content/core-developers/logging-interceptor.html
index 5c63204..77ed07b 100644
--- a/content/core-developers/logging-interceptor.html
+++ b/content/core-developers/logging-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/logging.html b/content/core-developers/logging.html
index e803d73..f56910f 100644
--- a/content/core-developers/logging.html
+++ b/content/core-developers/logging.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/message-store-interceptor.html b/content/core-developers/message-store-interceptor.html
index f31cc24..c428274 100644
--- a/content/core-developers/message-store-interceptor.html
+++ b/content/core-developers/message-store-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/model-driven-interceptor.html b/content/core-developers/model-driven-interceptor.html
index a97e36c..0fa4e9a 100644
--- a/content/core-developers/model-driven-interceptor.html
+++ b/content/core-developers/model-driven-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/model-driven.html b/content/core-developers/model-driven.html
index 67abc53..8d1155b 100644
--- a/content/core-developers/model-driven.html
+++ b/content/core-developers/model-driven.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/multiselect-interceptor.html b/content/core-developers/multiselect-interceptor.html
index 3501bdc..9d8a548 100644
--- a/content/core-developers/multiselect-interceptor.html
+++ b/content/core-developers/multiselect-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/namespace-annotation.html b/content/core-developers/namespace-annotation.html
index 9a16f73..e33233a 100644
--- a/content/core-developers/namespace-annotation.html
+++ b/content/core-developers/namespace-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/namespace-configuration.html b/content/core-developers/namespace-configuration.html
index a762a4b..f6f62d4 100644
--- a/content/core-developers/namespace-configuration.html
+++ b/content/core-developers/namespace-configuration.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/no-op-interceptor.html b/content/core-developers/no-op-interceptor.html
index 33c4da0..978ec10 100644
--- a/content/core-developers/no-op-interceptor.html
+++ b/content/core-developers/no-op-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/nutshell.html b/content/core-developers/nutshell.html
index d059c01..81cab8c 100644
--- a/content/core-developers/nutshell.html
+++ b/content/core-developers/nutshell.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/object-factory.html b/content/core-developers/object-factory.html
index 5b99ecc..ff47ea9 100644
--- a/content/core-developers/object-factory.html
+++ b/content/core-developers/object-factory.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/package-configuration.html b/content/core-developers/package-configuration.html
index 2c459c7..5d1c647 100644
--- a/content/core-developers/package-configuration.html
+++ b/content/core-developers/package-configuration.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/parameter-remover-interceptor.html b/content/core-developers/parameter-remover-interceptor.html
index 27ee348..3e05ee4 100644
--- a/content/core-developers/parameter-remover-interceptor.html
+++ b/content/core-developers/parameter-remover-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/parameters-interceptor.html b/content/core-developers/parameters-interceptor.html
index ec69fd5..2c7cd4f 100644
--- a/content/core-developers/parameters-interceptor.html
+++ b/content/core-developers/parameters-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/performance-tuning.html b/content/core-developers/performance-tuning.html
index 76ae747..f58a4c3 100644
--- a/content/core-developers/performance-tuning.html
+++ b/content/core-developers/performance-tuning.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/plain-result.html b/content/core-developers/plain-result.html
index f563f6c..c01502b 100644
--- a/content/core-developers/plain-result.html
+++ b/content/core-developers/plain-result.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/plaintext-result.html b/content/core-developers/plaintext-result.html
index df4fe4a..f1dbe95 100644
--- a/content/core-developers/plaintext-result.html
+++ b/content/core-developers/plaintext-result.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/postback-result.html b/content/core-developers/postback-result.html
index 976af60..384f3c0 100644
--- a/content/core-developers/postback-result.html
+++ b/content/core-developers/postback-result.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/pre-result-listener.html b/content/core-developers/pre-result-listener.html
index ddcf6b3..0051b01 100644
--- a/content/core-developers/pre-result-listener.html
+++ b/content/core-developers/pre-result-listener.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/prepare-interceptor.html b/content/core-developers/prepare-interceptor.html
index 9dc742d..610b7c9 100644
--- a/content/core-developers/prepare-interceptor.html
+++ b/content/core-developers/prepare-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/pure-java-script-client-side-validation.html b/content/core-developers/pure-java-script-client-side-validation.html
index 394b339..9f00faa 100644
--- a/content/core-developers/pure-java-script-client-side-validation.html
+++ b/content/core-developers/pure-java-script-client-side-validation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/redirect-action-result.html b/content/core-developers/redirect-action-result.html
index 4aadc50..ba19ebd 100644
--- a/content/core-developers/redirect-action-result.html
+++ b/content/core-developers/redirect-action-result.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/redirect-result.html b/content/core-developers/redirect-result.html
index 784e102..16a54ba 100644
--- a/content/core-developers/redirect-result.html
+++ b/content/core-developers/redirect-result.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/regex-field-validator-annotation.html b/content/core-developers/regex-field-validator-annotation.html
index ba3ec08..9a5428f 100644
--- a/content/core-developers/regex-field-validator-annotation.html
+++ b/content/core-developers/regex-field-validator-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/regex-validator.html b/content/core-developers/regex-validator.html
index 7c92add..7e69fb8 100644
--- a/content/core-developers/regex-validator.html
+++ b/content/core-developers/regex-validator.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/reloading-configuration.html b/content/core-developers/reloading-configuration.html
index c263ff7..3224a60 100644
--- a/content/core-developers/reloading-configuration.html
+++ b/content/core-developers/reloading-configuration.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/required-field-validator-annotation.html b/content/core-developers/required-field-validator-annotation.html
index e3222aa..329d06d 100644
--- a/content/core-developers/required-field-validator-annotation.html
+++ b/content/core-developers/required-field-validator-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/required-string-validator-annotation.html b/content/core-developers/required-string-validator-annotation.html
index 1a5bc27..fc32d08 100644
--- a/content/core-developers/required-string-validator-annotation.html
+++ b/content/core-developers/required-string-validator-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/required-validator.html b/content/core-developers/required-validator.html
index 12ea3b0..449b5db 100644
--- a/content/core-developers/required-validator.html
+++ b/content/core-developers/required-validator.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/requiredstring-validator.html b/content/core-developers/requiredstring-validator.html
index 24580b0..78d6e0f 100644
--- a/content/core-developers/requiredstring-validator.html
+++ b/content/core-developers/requiredstring-validator.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/restful-action-mapper.html b/content/core-developers/restful-action-mapper.html
index 087f377..b57f5ae 100644
--- a/content/core-developers/restful-action-mapper.html
+++ b/content/core-developers/restful-action-mapper.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/result-configuration.html b/content/core-developers/result-configuration.html
index 2c52ece..1b0eecc 100644
--- a/content/core-developers/result-configuration.html
+++ b/content/core-developers/result-configuration.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/result-types.html b/content/core-developers/result-types.html
index af6dd95..a1f018d 100644
--- a/content/core-developers/result-types.html
+++ b/content/core-developers/result-types.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/roles-interceptor.html b/content/core-developers/roles-interceptor.html
index 7c7cbe3..cd35224 100644
--- a/content/core-developers/roles-interceptor.html
+++ b/content/core-developers/roles-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/scope-interceptor.html b/content/core-developers/scope-interceptor.html
index f62d127..1e101d3 100644
--- a/content/core-developers/scope-interceptor.html
+++ b/content/core-developers/scope-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/scoped-model-driven-interceptor.html b/content/core-developers/scoped-model-driven-interceptor.html
index 1b0dff4..03b37ba 100644
--- a/content/core-developers/scoped-model-driven-interceptor.html
+++ b/content/core-developers/scoped-model-driven-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/servlet-config-interceptor.html b/content/core-developers/servlet-config-interceptor.html
index 8fe1fb3..f61db38 100644
--- a/content/core-developers/servlet-config-interceptor.html
+++ b/content/core-developers/servlet-config-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/short-validator.html b/content/core-developers/short-validator.html
index 84ee44f..eee27a9 100644
--- a/content/core-developers/short-validator.html
+++ b/content/core-developers/short-validator.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/static-content.html b/content/core-developers/static-content.html
index eaf063c..5a74338 100644
--- a/content/core-developers/static-content.html
+++ b/content/core-developers/static-content.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/static-parameters-interceptor.html b/content/core-developers/static-parameters-interceptor.html
index 8abcafa..b5ce297 100644
--- a/content/core-developers/static-parameters-interceptor.html
+++ b/content/core-developers/static-parameters-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/stream-result.html b/content/core-developers/stream-result.html
index a9a300f..dcd2127 100644
--- a/content/core-developers/stream-result.html
+++ b/content/core-developers/stream-result.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/string-length-field-validator-annotation.html b/content/core-developers/string-length-field-validator-annotation.html
index 256be3b..d67985b 100644
--- a/content/core-developers/string-length-field-validator-annotation.html
+++ b/content/core-developers/string-length-field-validator-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/stringlength-validator.html b/content/core-developers/stringlength-validator.html
index a2c8129..3c04e70 100644
--- a/content/core-developers/stringlength-validator.html
+++ b/content/core-developers/stringlength-validator.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/struts-default-vm.html b/content/core-developers/struts-default-vm.html
index 10ed293..de42902 100644
--- a/content/core-developers/struts-default-vm.html
+++ b/content/core-developers/struts-default-vm.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/struts-default-xml.html b/content/core-developers/struts-default-xml.html
index 8d939a1..f2fddf6 100644
--- a/content/core-developers/struts-default-xml.html
+++ b/content/core-developers/struts-default-xml.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/struts-xml.html b/content/core-developers/struts-xml.html
index 4724439..28c0bb0 100644
--- a/content/core-developers/struts-xml.html
+++ b/content/core-developers/struts-xml.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/sunone-7-0.html b/content/core-developers/sunone-7-0.html
index d764bb8..6ccfbfe 100644
--- a/content/core-developers/sunone-7-0.html
+++ b/content/core-developers/sunone-7-0.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/timer-interceptor.html b/content/core-developers/timer-interceptor.html
index 0d66cc0..40c815b 100644
--- a/content/core-developers/timer-interceptor.html
+++ b/content/core-developers/timer-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/token-interceptor.html b/content/core-developers/token-interceptor.html
index 3e32a10..46275dd 100644
--- a/content/core-developers/token-interceptor.html
+++ b/content/core-developers/token-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/token-session-interceptor.html b/content/core-developers/token-session-interceptor.html
index cd95504..9876032 100644
--- a/content/core-developers/token-session-interceptor.html
+++ b/content/core-developers/token-session-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/type-conversion-annotation.html b/content/core-developers/type-conversion-annotation.html
index a5a26b3..cd2b6a5 100644
--- a/content/core-developers/type-conversion-annotation.html
+++ b/content/core-developers/type-conversion-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/type-conversion.html b/content/core-developers/type-conversion.html
index 34b427f..c7e7a84 100644
--- a/content/core-developers/type-conversion.html
+++ b/content/core-developers/type-conversion.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/unknown-handlers.html b/content/core-developers/unknown-handlers.html
index c22996d..f603820 100644
--- a/content/core-developers/unknown-handlers.html
+++ b/content/core-developers/unknown-handlers.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/url-validator-annotation.html b/content/core-developers/url-validator-annotation.html
index f23ae35..4c016ff 100644
--- a/content/core-developers/url-validator-annotation.html
+++ b/content/core-developers/url-validator-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/url-validator.html b/content/core-developers/url-validator.html
index 26ee9b8..23b685c 100644
--- a/content/core-developers/url-validator.html
+++ b/content/core-developers/url-validator.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/using-field-validators.html b/content/core-developers/using-field-validators.html
index 670e6c2..db204e3 100644
--- a/content/core-developers/using-field-validators.html
+++ b/content/core-developers/using-field-validators.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/using-non-field-validators.html b/content/core-developers/using-non-field-validators.html
index 5b365eb..891a3c5 100644
--- a/content/core-developers/using-non-field-validators.html
+++ b/content/core-developers/using-non-field-validators.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/using-visitor-field-validator.html b/content/core-developers/using-visitor-field-validator.html
index d1a5cc0..3a74223 100644
--- a/content/core-developers/using-visitor-field-validator.html
+++ b/content/core-developers/using-visitor-field-validator.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/validation-annotation.html b/content/core-developers/validation-annotation.html
index c87303f..b6c7cc4 100644
--- a/content/core-developers/validation-annotation.html
+++ b/content/core-developers/validation-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/validation-interceptor.html b/content/core-developers/validation-interceptor.html
index 32ffdbf..2c97b00 100644
--- a/content/core-developers/validation-interceptor.html
+++ b/content/core-developers/validation-interceptor.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/validation-parameter-annotation.html b/content/core-developers/validation-parameter-annotation.html
index 41a6f3e..862a55f 100644
--- a/content/core-developers/validation-parameter-annotation.html
+++ b/content/core-developers/validation-parameter-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/validation.html b/content/core-developers/validation.html
index 63887eb..78b0717 100644
--- a/content/core-developers/validation.html
+++ b/content/core-developers/validation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/validations-annotation.html b/content/core-developers/validations-annotation.html
index 014dee7..c6183ac 100644
--- a/content/core-developers/validations-annotation.html
+++ b/content/core-developers/validations-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/velocity-properties.html b/content/core-developers/velocity-properties.html
index 70d7d17..dd20469 100644
--- a/content/core-developers/velocity-properties.html
+++ b/content/core-developers/velocity-properties.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/velocity-result.html b/content/core-developers/velocity-result.html
index 373c387..d1a1afe 100644
--- a/content/core-developers/velocity-result.html
+++ b/content/core-developers/velocity-result.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/visitor-field-validator-annotation.html b/content/core-developers/visitor-field-validator-annotation.html
index dc48905..9b6a49c 100644
--- a/content/core-developers/visitor-field-validator-annotation.html
+++ b/content/core-developers/visitor-field-validator-annotation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/visitor-validator.html b/content/core-developers/visitor-validator.html
index 9435d8b..e1fd210 100644
--- a/content/core-developers/visitor-validator.html
+++ b/content/core-developers/visitor-validator.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/web-xml.html b/content/core-developers/web-xml.html
index 98b6d9e..b12dc13 100644
--- a/content/core-developers/web-xml.html
+++ b/content/core-developers/web-xml.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/weblogic-6-1.html b/content/core-developers/weblogic-6-1.html
index bd7fb76..d302d09 100644
--- a/content/core-developers/weblogic-6-1.html
+++ b/content/core-developers/weblogic-6-1.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/weblogic.html b/content/core-developers/weblogic.html
index b1bb3be..168433a 100644
--- a/content/core-developers/weblogic.html
+++ b/content/core-developers/weblogic.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/websphere.html b/content/core-developers/websphere.html
index 3238f00..414bcd0 100644
--- a/content/core-developers/websphere.html
+++ b/content/core-developers/websphere.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/wildcard-mappings.html b/content/core-developers/wildcard-mappings.html
index 6c62e5a..22fa13c 100644
--- a/content/core-developers/wildcard-mappings.html
+++ b/content/core-developers/wildcard-mappings.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/writing-interceptors.html b/content/core-developers/writing-interceptors.html
index 47bd15f..eff80de 100644
--- a/content/core-developers/writing-interceptors.html
+++ b/content/core-developers/writing-interceptors.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/core-developers/xsl-result.html b/content/core-developers/xsl-result.html
index 2d60708..029fc17 100644
--- a/content/core-developers/xsl-result.html
+++ b/content/core-developers/xsl-result.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/dev-mail.html b/content/dev-mail.html
index f4e584d..b5d212a 100644
--- a/content/dev-mail.html
+++ b/content/dev-mail.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/docs/index.html b/content/docs/index.html
index cd625a2..65899de 100644
--- a/content/docs/index.html
+++ b/content/docs/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/download.html b/content/download.html
index b4f6515..c1fdd8b 100644
--- a/content/download.html
+++ b/content/download.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/getting-started/annotations.html b/content/getting-started/annotations.html
index 78abfa8..34ed9cc 100644
--- a/content/getting-started/annotations.html
+++ b/content/getting-started/annotations.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/getting-started/coding-actions.html b/content/getting-started/coding-actions.html
index 8aef319..289a7a2 100644
--- a/content/getting-started/coding-actions.html
+++ b/content/getting-started/coding-actions.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/getting-started/control-tags.html b/content/getting-started/control-tags.html
index fc35ebd..6009e16 100644
--- a/content/getting-started/control-tags.html
+++ b/content/getting-started/control-tags.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/getting-started/debugging-struts.html b/content/getting-started/debugging-struts.html
index 9ffc7c2..456669f 100644
--- a/content/getting-started/debugging-struts.html
+++ b/content/getting-started/debugging-struts.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/getting-started/exception-handling.html b/content/getting-started/exception-handling.html
index 44bdc46..34abfca 100644
--- a/content/getting-started/exception-handling.html
+++ b/content/getting-started/exception-handling.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/getting-started/exclude-parameters.html b/content/getting-started/exclude-parameters.html
index 5b7a1f8..e7b3560 100644
--- a/content/getting-started/exclude-parameters.html
+++ b/content/getting-started/exclude-parameters.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/getting-started/form-tags.html b/content/getting-started/form-tags.html
index 752f53a..e8da060 100644
--- a/content/getting-started/form-tags.html
+++ b/content/getting-started/form-tags.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/getting-started/form-validation-using-xml.html b/content/getting-started/form-validation-using-xml.html
index b843802..bdc4bcd 100644
--- a/content/getting-started/form-validation-using-xml.html
+++ b/content/getting-started/form-validation-using-xml.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/getting-started/form-validation.html b/content/getting-started/form-validation.html
index 3859d66..76e707d 100644
--- a/content/getting-started/form-validation.html
+++ b/content/getting-started/form-validation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/getting-started/hello-world-using-struts2.html b/content/getting-started/hello-world-using-struts2.html
index de92b73..be1029f 100644
--- a/content/getting-started/hello-world-using-struts2.html
+++ b/content/getting-started/hello-world-using-struts2.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/getting-started/how-to-create-a-struts2-web-application.html b/content/getting-started/how-to-create-a-struts2-web-application.html
index ac3f7e0..2d82fda 100644
--- a/content/getting-started/how-to-create-a-struts2-web-application.html
+++ b/content/getting-started/how-to-create-a-struts2-web-application.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/getting-started/http-session.html b/content/getting-started/http-session.html
index 4457762..e8bea03 100644
--- a/content/getting-started/http-session.html
+++ b/content/getting-started/http-session.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/getting-started/index.html b/content/getting-started/index.html
index 1dbf895..7f3a24a 100644
--- a/content/getting-started/index.html
+++ b/content/getting-started/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/getting-started/introducing-interceptors.html b/content/getting-started/introducing-interceptors.html
index 9e91bc9..692eac8 100644
--- a/content/getting-started/introducing-interceptors.html
+++ b/content/getting-started/introducing-interceptors.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/getting-started/jasper-reports-tutorial.html b/content/getting-started/jasper-reports-tutorial.html
index 7acf04a..93091df 100644
--- a/content/getting-started/jasper-reports-tutorial.html
+++ b/content/getting-started/jasper-reports-tutorial.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/getting-started/message-resource-files.html b/content/getting-started/message-resource-files.html
index 505cb2a..14d4c32 100644
--- a/content/getting-started/message-resource-files.html
+++ b/content/getting-started/message-resource-files.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/getting-started/preperable-interface.html b/content/getting-started/preperable-interface.html
index fd2696e..f3a1409 100644
--- a/content/getting-started/preperable-interface.html
+++ b/content/getting-started/preperable-interface.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/getting-started/processing-forms.html b/content/getting-started/processing-forms.html
index f472143..c340750 100644
--- a/content/getting-started/processing-forms.html
+++ b/content/getting-started/processing-forms.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/getting-started/spring.html b/content/getting-started/spring.html
index 26ab9df..1eecb6b 100644
--- a/content/getting-started/spring.html
+++ b/content/getting-started/spring.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/getting-started/themes.html b/content/getting-started/themes.html
index 062052d..53bcb62 100644
--- a/content/getting-started/themes.html
+++ b/content/getting-started/themes.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/getting-started/unit-testing.html b/content/getting-started/unit-testing.html
index 65deeb5..9e66e70 100644
--- a/content/getting-started/unit-testing.html
+++ b/content/getting-started/unit-testing.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/getting-started/using-tags.html b/content/getting-started/using-tags.html
index b777381..2144a3c 100644
--- a/content/getting-started/using-tags.html
+++ b/content/getting-started/using-tags.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/getting-started/wildcard-method-selection.html b/content/getting-started/wildcard-method-selection.html
index 90ba7bd..2f91ea0 100644
--- a/content/getting-started/wildcard-method-selection.html
+++ b/content/getting-started/wildcard-method-selection.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/helping.html b/content/helping.html
index f97862d..e456766 100644
--- a/content/helping.html
+++ b/content/helping.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/index.html b/content/index.html
index ebbea4c..04d62fb 100644
--- a/content/index.html
+++ b/content/index.html
@@ -47,7 +47,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/kickstart.html b/content/kickstart.html
index 24b085f..4dbd6a8 100644
--- a/content/kickstart.html
+++ b/content/kickstart.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/mail.html b/content/mail.html
index f17b208..ba784ce 100644
--- a/content/mail.html
+++ b/content/mail.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/maven-archetypes/index.html b/content/maven-archetypes/index.html
index 0d469f5..5cad467 100644
--- a/content/maven-archetypes/index.html
+++ b/content/maven-archetypes/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/maven-archetypes/struts2-archetype-blank.html b/content/maven-archetypes/struts2-archetype-blank.html
index 07d0d76..0be2d0b 100644
--- a/content/maven-archetypes/struts2-archetype-blank.html
+++ b/content/maven-archetypes/struts2-archetype-blank.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/bean-validation/index.html b/content/plugins/bean-validation/index.html
index 5090102..f3cafb2 100644
--- a/content/plugins/bean-validation/index.html
+++ b/content/plugins/bean-validation/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/cdi/index.html b/content/plugins/cdi/index.html
index c53c124..29d2f17 100644
--- a/content/plugins/cdi/index.html
+++ b/content/plugins/cdi/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/codebehind/index.html b/content/plugins/codebehind/index.html
index f273b78..50b0eb2 100644
--- a/content/plugins/codebehind/index.html
+++ b/content/plugins/codebehind/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/config-browser/index.html b/content/plugins/config-browser/index.html
index b9ce5d6..58ab8fa 100644
--- a/content/plugins/config-browser/index.html
+++ b/content/plugins/config-browser/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/convention/converting.html b/content/plugins/convention/converting.html
index d351bbd..1262138 100644
--- a/content/plugins/convention/converting.html
+++ b/content/plugins/convention/converting.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/convention/index.html b/content/plugins/convention/index.html
index 8ac6974..2baaf08 100644
--- a/content/plugins/convention/index.html
+++ b/content/plugins/convention/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/dwr/index.html b/content/plugins/dwr/index.html
index d0ea69b..f09f2d7 100644
--- a/content/plugins/dwr/index.html
+++ b/content/plugins/dwr/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/embedded-jsp/index.html b/content/plugins/embedded-jsp/index.html
index 4ca2533..9b62fc9 100644
--- a/content/plugins/embedded-jsp/index.html
+++ b/content/plugins/embedded-jsp/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/extending-an-application-with-custom-plugins.html b/content/plugins/extending-an-application-with-custom-plugins.html
index 24939df..803da27 100644
--- a/content/plugins/extending-an-application-with-custom-plugins.html
+++ b/content/plugins/extending-an-application-with-custom-plugins.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/index.html b/content/plugins/index.html
index 3695ae0..b5d0df5 100644
--- a/content/plugins/index.html
+++ b/content/plugins/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/jasperreports/index.html b/content/plugins/jasperreports/index.html
index 32a77da..c5748d9 100644
--- a/content/plugins/jasperreports/index.html
+++ b/content/plugins/jasperreports/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/java-8-support/index.html b/content/plugins/java-8-support/index.html
index 2088f23..1b7871b 100644
--- a/content/plugins/java-8-support/index.html
+++ b/content/plugins/java-8-support/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/javatemplates/index.html b/content/plugins/javatemplates/index.html
index 60173da..341a529 100644
--- a/content/plugins/javatemplates/index.html
+++ b/content/plugins/javatemplates/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/jfreechart/index.html b/content/plugins/jfreechart/index.html
index 6c613da..d3ae31d 100644
--- a/content/plugins/jfreechart/index.html
+++ b/content/plugins/jfreechart/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/jsf/index.html b/content/plugins/jsf/index.html
index db7bf08..26f2062 100644
--- a/content/plugins/jsf/index.html
+++ b/content/plugins/jsf/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/json/index.html b/content/plugins/json/index.html
index 7ab6b10..e457797 100644
--- a/content/plugins/json/index.html
+++ b/content/plugins/json/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/json/json-ajax-validation.html b/content/plugins/json/json-ajax-validation.html
index 84cb81a..4efca2b 100644
--- a/content/plugins/json/json-ajax-validation.html
+++ b/content/plugins/json/json-ajax-validation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/junit/index.html b/content/plugins/junit/index.html
index 9fb09a3..53c6883 100644
--- a/content/plugins/junit/index.html
+++ b/content/plugins/junit/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/osgi/index.html b/content/plugins/osgi/index.html
index af11737..ae176d2 100644
--- a/content/plugins/osgi/index.html
+++ b/content/plugins/osgi/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/oval/index.html b/content/plugins/oval/index.html
index 49ca193..e6ac870 100644
--- a/content/plugins/oval/index.html
+++ b/content/plugins/oval/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/plexus/index.html b/content/plugins/plexus/index.html
index 0464cb9..77a7df0 100644
--- a/content/plugins/plexus/index.html
+++ b/content/plugins/plexus/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/plugins.html b/content/plugins/plugins.html
index 8f8d99f..12e7537 100644
--- a/content/plugins/plugins.html
+++ b/content/plugins/plugins.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/portlet-tiles/index.html b/content/plugins/portlet-tiles/index.html
index bf51c3c..d213d17 100644
--- a/content/plugins/portlet-tiles/index.html
+++ b/content/plugins/portlet-tiles/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/portlet/index.html b/content/plugins/portlet/index.html
index 5d5ddbb..039e918 100644
--- a/content/plugins/portlet/index.html
+++ b/content/plugins/portlet/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/portlet/struts-2-portlet-tutorial.html b/content/plugins/portlet/struts-2-portlet-tutorial.html
index 6653def..18173c8 100644
--- a/content/plugins/portlet/struts-2-portlet-tutorial.html
+++ b/content/plugins/portlet/struts-2-portlet-tutorial.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/rest/index.html b/content/plugins/rest/index.html
index fdb4368..fd460b6 100644
--- a/content/plugins/rest/index.html
+++ b/content/plugins/rest/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/sitegraph/index.html b/content/plugins/sitegraph/index.html
index 068a33e..58279c9 100644
--- a/content/plugins/sitegraph/index.html
+++ b/content/plugins/sitegraph/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/sitemesh/index.html b/content/plugins/sitemesh/index.html
index 1759c61..4b8b573 100644
--- a/content/plugins/sitemesh/index.html
+++ b/content/plugins/sitemesh/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/spring/index.html b/content/plugins/spring/index.html
index 19a8406..9e3d5d6 100644
--- a/content/plugins/spring/index.html
+++ b/content/plugins/spring/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/spring/spring-session-components-workarounds.html b/content/plugins/spring/spring-session-components-workarounds.html
index 540c32e..de805a7 100644
--- a/content/plugins/spring/spring-session-components-workarounds.html
+++ b/content/plugins/spring/spring-session-components-workarounds.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/struts-1/index.html b/content/plugins/struts-1/index.html
index 674e64f..0b53cc1 100644
--- a/content/plugins/struts-1/index.html
+++ b/content/plugins/struts-1/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/testng/index.html b/content/plugins/testng/index.html
index e4dbc07..b509590 100644
--- a/content/plugins/testng/index.html
+++ b/content/plugins/testng/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/tiles-3/index.html b/content/plugins/tiles-3/index.html
index fb722aa..1fd2c16 100644
--- a/content/plugins/tiles-3/index.html
+++ b/content/plugins/tiles-3/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/tiles/index.html b/content/plugins/tiles/index.html
index f784c5d..f3bc29b 100644
--- a/content/plugins/tiles/index.html
+++ b/content/plugins/tiles/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/plugins/tiles/tiles-use.html b/content/plugins/tiles/tiles-use.html
index 339e1e1..786896a 100644
--- a/content/plugins/tiles/tiles-use.html
+++ b/content/plugins/tiles/tiles-use.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/primer.html b/content/primer.html
index f925b7e..cf36ad1 100644
--- a/content/primer.html
+++ b/content/primer.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/release-guidelines.html b/content/release-guidelines.html
index 7542d9a..fa1f0b7 100644
--- a/content/release-guidelines.html
+++ b/content/release-guidelines.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/releases.html b/content/releases.html
index ba51139..beebb1e 100644
--- a/content/releases.html
+++ b/content/releases.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/security.html b/content/security.html
index 466852f..bce6e5a 100644
--- a/content/security.html
+++ b/content/security.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/security/index.html b/content/security/index.html
index 6b48f83..366f683 100644
--- a/content/security/index.html
+++ b/content/security/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/struts1eol-announcement.html b/content/struts1eol-announcement.html
index b89a5ba..fb90fc6 100644
--- a/content/struts1eol-announcement.html
+++ b/content/struts1eol-announcement.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/struts1eol-press.html b/content/struts1eol-press.html
index 2c7339c..8da1174 100644
--- a/content/struts1eol-press.html
+++ b/content/struts1eol-press.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/struts23-eol-announcement.html b/content/struts23-eol-announcement.html
index 1e14aae..8cc97fe 100644
--- a/content/struts23-eol-announcement.html
+++ b/content/struts23-eol-announcement.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/submitting-patches.html b/content/submitting-patches.html
index 440d8b1..c0a2360 100644
--- a/content/submitting-patches.html
+++ b/content/submitting-patches.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/a-tag.html b/content/tag-developers/a-tag.html
index c691ac6..ccf68f2 100644
--- a/content/tag-developers/a-tag.html
+++ b/content/tag-developers/a-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/access-to-valuestack-from-jsps.html b/content/tag-developers/access-to-valuestack-from-jsps.html
index 3596225..5b91f48 100644
--- a/content/tag-developers/access-to-valuestack-from-jsps.html
+++ b/content/tag-developers/access-to-valuestack-from-jsps.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/action-tag.html b/content/tag-developers/action-tag.html
index 9175121..dcc1b0f 100644
--- a/content/tag-developers/action-tag.html
+++ b/content/tag-developers/action-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/actionerror-tag.html b/content/tag-developers/actionerror-tag.html
index cd655d3..2eff6f0 100644
--- a/content/tag-developers/actionerror-tag.html
+++ b/content/tag-developers/actionerror-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/actionmessage-tag.html b/content/tag-developers/actionmessage-tag.html
index ab6aa5a..7da51e1 100644
--- a/content/tag-developers/actionmessage-tag.html
+++ b/content/tag-developers/actionmessage-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/ajax-a-template.html b/content/tag-developers/ajax-a-template.html
index 0a8ea3e..3df93b7 100644
--- a/content/tag-developers/ajax-a-template.html
+++ b/content/tag-developers/ajax-a-template.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/ajax-and-javascript-recipes.html b/content/tag-developers/ajax-and-javascript-recipes.html
index 8965ada..c044bc9 100644
--- a/content/tag-developers/ajax-and-javascript-recipes.html
+++ b/content/tag-developers/ajax-and-javascript-recipes.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/ajax-div-template.html b/content/tag-developers/ajax-div-template.html
index 8af31d3..f07464b 100644
--- a/content/tag-developers/ajax-div-template.html
+++ b/content/tag-developers/ajax-div-template.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/ajax-event-system.html b/content/tag-developers/ajax-event-system.html
index c2192bb..cad6a29 100644
--- a/content/tag-developers/ajax-event-system.html
+++ b/content/tag-developers/ajax-event-system.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/ajax-head-template.html b/content/tag-developers/ajax-head-template.html
index 0f88aad..133bf46 100644
--- a/content/tag-developers/ajax-head-template.html
+++ b/content/tag-developers/ajax-head-template.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/ajax-tags.html b/content/tag-developers/ajax-tags.html
index 79ce419..b64f080 100644
--- a/content/tag-developers/ajax-tags.html
+++ b/content/tag-developers/ajax-tags.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/ajax-theme.html b/content/tag-developers/ajax-theme.html
index 312d4a8..4e61068 100644
--- a/content/tag-developers/ajax-theme.html
+++ b/content/tag-developers/ajax-theme.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/alt-syntax.html b/content/tag-developers/alt-syntax.html
index 0e748ca..791baa1 100644
--- a/content/tag-developers/alt-syntax.html
+++ b/content/tag-developers/alt-syntax.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/append-tag.html b/content/tag-developers/append-tag.html
index f687c98..212c102 100644
--- a/content/tag-developers/append-tag.html
+++ b/content/tag-developers/append-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/bean-tag.html b/content/tag-developers/bean-tag.html
index f9a0d52..4c50d62 100644
--- a/content/tag-developers/bean-tag.html
+++ b/content/tag-developers/bean-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/cewolf-charts-using-velocity-templates.html b/content/tag-developers/cewolf-charts-using-velocity-templates.html
index a6ca684..6dc4bba 100644
--- a/content/tag-developers/cewolf-charts-using-velocity-templates.html
+++ b/content/tag-developers/cewolf-charts-using-velocity-templates.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/checkbox-tag.html b/content/tag-developers/checkbox-tag.html
index 23d5c7b..c05c94b 100644
--- a/content/tag-developers/checkbox-tag.html
+++ b/content/tag-developers/checkbox-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/checkboxlist-tag.html b/content/tag-developers/checkboxlist-tag.html
index 2a52525..54f22b5 100644
--- a/content/tag-developers/checkboxlist-tag.html
+++ b/content/tag-developers/checkboxlist-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/combobox-tag.html b/content/tag-developers/combobox-tag.html
index 4c02458..c332d49 100644
--- a/content/tag-developers/combobox-tag.html
+++ b/content/tag-developers/combobox-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/component-tag.html b/content/tag-developers/component-tag.html
index 50a7be3..ca81bc4 100644
--- a/content/tag-developers/component-tag.html
+++ b/content/tag-developers/component-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/css-xhtml-theme.html b/content/tag-developers/css-xhtml-theme.html
index eb9f02b..d5f3326 100644
--- a/content/tag-developers/css-xhtml-theme.html
+++ b/content/tag-developers/css-xhtml-theme.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/date-tag.html b/content/tag-developers/date-tag.html
index a204910..9e68c2f 100644
--- a/content/tag-developers/date-tag.html
+++ b/content/tag-developers/date-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/datetextfield-tag.html b/content/tag-developers/datetextfield-tag.html
index 0c3acfb..cb7a798 100644
--- a/content/tag-developers/datetextfield-tag.html
+++ b/content/tag-developers/datetextfield-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/debug-tag.html b/content/tag-developers/debug-tag.html
index b59599c..088b121 100644
--- a/content/tag-developers/debug-tag.html
+++ b/content/tag-developers/debug-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/dojo-a-tag.html b/content/tag-developers/dojo-a-tag.html
index 98c8131..a3a1063 100644
--- a/content/tag-developers/dojo-a-tag.html
+++ b/content/tag-developers/dojo-a-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/dojo-autocompleter-tag.html b/content/tag-developers/dojo-autocompleter-tag.html
index aef4d87..c42eb2b 100644
--- a/content/tag-developers/dojo-autocompleter-tag.html
+++ b/content/tag-developers/dojo-autocompleter-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/dojo-bind-tag.html b/content/tag-developers/dojo-bind-tag.html
index d7e111f..e17c679 100644
--- a/content/tag-developers/dojo-bind-tag.html
+++ b/content/tag-developers/dojo-bind-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/dojo-datetimepicker-tag.html b/content/tag-developers/dojo-datetimepicker-tag.html
index 0eccc5d..a1a2e41 100644
--- a/content/tag-developers/dojo-datetimepicker-tag.html
+++ b/content/tag-developers/dojo-datetimepicker-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/dojo-div-tag.html b/content/tag-developers/dojo-div-tag.html
index c1490f6..5d3d213 100644
--- a/content/tag-developers/dojo-div-tag.html
+++ b/content/tag-developers/dojo-div-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/dojo-head-tag.html b/content/tag-developers/dojo-head-tag.html
index c01bc7f..0035081 100644
--- a/content/tag-developers/dojo-head-tag.html
+++ b/content/tag-developers/dojo-head-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/dojo-submit-tag.html b/content/tag-developers/dojo-submit-tag.html
index c5320e5..5b2a303 100644
--- a/content/tag-developers/dojo-submit-tag.html
+++ b/content/tag-developers/dojo-submit-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/dojo-tabbedpanel-tag.html b/content/tag-developers/dojo-tabbedpanel-tag.html
index 8c17991..9bc11c7 100644
--- a/content/tag-developers/dojo-tabbedpanel-tag.html
+++ b/content/tag-developers/dojo-tabbedpanel-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/dojo-textarea-tag.html b/content/tag-developers/dojo-textarea-tag.html
index 7b89173..a8da657 100644
--- a/content/tag-developers/dojo-textarea-tag.html
+++ b/content/tag-developers/dojo-textarea-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/dojo-tree-tag.html b/content/tag-developers/dojo-tree-tag.html
index d0d1e60..c2b02f3 100644
--- a/content/tag-developers/dojo-tree-tag.html
+++ b/content/tag-developers/dojo-tree-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/dojo-treenode-tag.html b/content/tag-developers/dojo-treenode-tag.html
index 31e326f..c40f2a4 100644
--- a/content/tag-developers/dojo-treenode-tag.html
+++ b/content/tag-developers/dojo-treenode-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/doubleselect-tag.html b/content/tag-developers/doubleselect-tag.html
index e838feb..0cf6017 100644
--- a/content/tag-developers/doubleselect-tag.html
+++ b/content/tag-developers/doubleselect-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/else-tag.html b/content/tag-developers/else-tag.html
index 0efa237..5d70002 100644
--- a/content/tag-developers/else-tag.html
+++ b/content/tag-developers/else-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/elseif-tag.html b/content/tag-developers/elseif-tag.html
index 710cc39..b603058 100644
--- a/content/tag-developers/elseif-tag.html
+++ b/content/tag-developers/elseif-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/extending-themes.html b/content/tag-developers/extending-themes.html
index 9c49da1..41a6e65 100644
--- a/content/tag-developers/extending-themes.html
+++ b/content/tag-developers/extending-themes.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/fielderror-tag.html b/content/tag-developers/fielderror-tag.html
index 2217d6e..62c2795 100644
--- a/content/tag-developers/fielderror-tag.html
+++ b/content/tag-developers/fielderror-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/file-tag.html b/content/tag-developers/file-tag.html
index 8fade28..8d4a01e 100644
--- a/content/tag-developers/file-tag.html
+++ b/content/tag-developers/file-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/form-tag.html b/content/tag-developers/form-tag.html
index 6ad5c28..a02be31 100644
--- a/content/tag-developers/form-tag.html
+++ b/content/tag-developers/form-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/form-tags.html b/content/tag-developers/form-tags.html
index 33efa89..76402b0 100644
--- a/content/tag-developers/form-tags.html
+++ b/content/tag-developers/form-tags.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/freemarker-tags.html b/content/tag-developers/freemarker-tags.html
index 6a7321d..2e5b277 100644
--- a/content/tag-developers/freemarker-tags.html
+++ b/content/tag-developers/freemarker-tags.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/freemarker.html b/content/tag-developers/freemarker.html
index 77308ff..f8540cd 100644
--- a/content/tag-developers/freemarker.html
+++ b/content/tag-developers/freemarker.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/generator-tag.html b/content/tag-developers/generator-tag.html
index c6bb09f..31408d2 100644
--- a/content/tag-developers/generator-tag.html
+++ b/content/tag-developers/generator-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/generic-tags.html b/content/tag-developers/generic-tags.html
index b685246..e7a012b 100644
--- a/content/tag-developers/generic-tags.html
+++ b/content/tag-developers/generic-tags.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/head-tag.html b/content/tag-developers/head-tag.html
index 392ec6d..0fcc341 100644
--- a/content/tag-developers/head-tag.html
+++ b/content/tag-developers/head-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/hidden-tag.html b/content/tag-developers/hidden-tag.html
index 8ae0e53..4f634b0 100644
--- a/content/tag-developers/hidden-tag.html
+++ b/content/tag-developers/hidden-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/i18n-tag.html b/content/tag-developers/i18n-tag.html
index 7d82a03..6f5e727 100644
--- a/content/tag-developers/i18n-tag.html
+++ b/content/tag-developers/i18n-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/if-tag.html b/content/tag-developers/if-tag.html
index a07fd0e..cd43829 100644
--- a/content/tag-developers/if-tag.html
+++ b/content/tag-developers/if-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/include-tag.html b/content/tag-developers/include-tag.html
index 5f9ac43..8afdad5 100644
--- a/content/tag-developers/include-tag.html
+++ b/content/tag-developers/include-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/index.html b/content/tag-developers/index.html
index 3e45a6c..b81f2f8 100644
--- a/content/tag-developers/index.html
+++ b/content/tag-developers/index.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/inputtransferselect-tag.html b/content/tag-developers/inputtransferselect-tag.html
index af586c8..ef18ff7 100644
--- a/content/tag-developers/inputtransferselect-tag.html
+++ b/content/tag-developers/inputtransferselect-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/iterator-tag.html b/content/tag-developers/iterator-tag.html
index 482feb8..2700882 100644
--- a/content/tag-developers/iterator-tag.html
+++ b/content/tag-developers/iterator-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/jsp-tags.html b/content/tag-developers/jsp-tags.html
index 4931404..97c33be 100644
--- a/content/tag-developers/jsp-tags.html
+++ b/content/tag-developers/jsp-tags.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/jsp.html b/content/tag-developers/jsp.html
index d3851fe..a0cba04 100644
--- a/content/tag-developers/jsp.html
+++ b/content/tag-developers/jsp.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/label-tag.html b/content/tag-developers/label-tag.html
index 7a9c293..9062123 100644
--- a/content/tag-developers/label-tag.html
+++ b/content/tag-developers/label-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/merge-tag.html b/content/tag-developers/merge-tag.html
index 932c63f..379e7ca 100644
--- a/content/tag-developers/merge-tag.html
+++ b/content/tag-developers/merge-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/ognl-basics.html b/content/tag-developers/ognl-basics.html
index 8c6bbcb..1655cda 100644
--- a/content/tag-developers/ognl-basics.html
+++ b/content/tag-developers/ognl-basics.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/ognl-expression-compilation.html b/content/tag-developers/ognl-expression-compilation.html
index c651751..dbed37c 100644
--- a/content/tag-developers/ognl-expression-compilation.html
+++ b/content/tag-developers/ognl-expression-compilation.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/ognl.html b/content/tag-developers/ognl.html
index 91d92e4..92cf6aa 100644
--- a/content/tag-developers/ognl.html
+++ b/content/tag-developers/ognl.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/optgroup-tag.html b/content/tag-developers/optgroup-tag.html
index ea0b533..7423841 100644
--- a/content/tag-developers/optgroup-tag.html
+++ b/content/tag-developers/optgroup-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/optiontransferselect-tag.html b/content/tag-developers/optiontransferselect-tag.html
index 9e995c7..cf21cd3 100644
--- a/content/tag-developers/optiontransferselect-tag.html
+++ b/content/tag-developers/optiontransferselect-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/param-tag.html b/content/tag-developers/param-tag.html
index 87d8da7..9b82ebe 100644
--- a/content/tag-developers/param-tag.html
+++ b/content/tag-developers/param-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/password-tag.html b/content/tag-developers/password-tag.html
index 988ea2d..a2aaa0b 100644
--- a/content/tag-developers/password-tag.html
+++ b/content/tag-developers/password-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/property-tag.html b/content/tag-developers/property-tag.html
index fd4ceaf..dbb8aaf 100644
--- a/content/tag-developers/property-tag.html
+++ b/content/tag-developers/property-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/push-tag.html b/content/tag-developers/push-tag.html
index 8c21890..94e97e0 100644
--- a/content/tag-developers/push-tag.html
+++ b/content/tag-developers/push-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/radio-tag.html b/content/tag-developers/radio-tag.html
index cebe7ef..817151b 100644
--- a/content/tag-developers/radio-tag.html
+++ b/content/tag-developers/radio-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/reset-tag.html b/content/tag-developers/reset-tag.html
index 494c1d6..acf43fa 100644
--- a/content/tag-developers/reset-tag.html
+++ b/content/tag-developers/reset-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/select-tag.html b/content/tag-developers/select-tag.html
index 1792ec8..54b22dc 100644
--- a/content/tag-developers/select-tag.html
+++ b/content/tag-developers/select-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/selecting-template-directory.html b/content/tag-developers/selecting-template-directory.html
index ca5f3eb..7be904a 100644
--- a/content/tag-developers/selecting-template-directory.html
+++ b/content/tag-developers/selecting-template-directory.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/selecting-themes.html b/content/tag-developers/selecting-themes.html
index 863c578..3360e70 100644
--- a/content/tag-developers/selecting-themes.html
+++ b/content/tag-developers/selecting-themes.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/set-tag.html b/content/tag-developers/set-tag.html
index dcfb1d8..9579f26 100644
--- a/content/tag-developers/set-tag.html
+++ b/content/tag-developers/set-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/simple-theme.html b/content/tag-developers/simple-theme.html
index 78d1129..2f5da0b 100644
--- a/content/tag-developers/simple-theme.html
+++ b/content/tag-developers/simple-theme.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/sort-tag.html b/content/tag-developers/sort-tag.html
index 5378c4c..235d915 100644
--- a/content/tag-developers/sort-tag.html
+++ b/content/tag-developers/sort-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/struts-tags.html b/content/tag-developers/struts-tags.html
index a05353b..3d1b4f6 100644
--- a/content/tag-developers/struts-tags.html
+++ b/content/tag-developers/struts-tags.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/submit-tag.html b/content/tag-developers/submit-tag.html
index 728df60..39a6c39 100644
--- a/content/tag-developers/submit-tag.html
+++ b/content/tag-developers/submit-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/subset-tag.html b/content/tag-developers/subset-tag.html
index d12a554..716f2fd 100644
--- a/content/tag-developers/subset-tag.html
+++ b/content/tag-developers/subset-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/tag-reference.html b/content/tag-developers/tag-reference.html
index 1829e1a..0922c38 100644
--- a/content/tag-developers/tag-reference.html
+++ b/content/tag-developers/tag-reference.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/tag-syntax.html b/content/tag-developers/tag-syntax.html
index e8ecee5..3038ecf 100644
--- a/content/tag-developers/tag-syntax.html
+++ b/content/tag-developers/tag-syntax.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/template-loading.html b/content/tag-developers/template-loading.html
index 1e2d2e6..3c7f635 100644
--- a/content/tag-developers/template-loading.html
+++ b/content/tag-developers/template-loading.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/text-tag.html b/content/tag-developers/text-tag.html
index 9ee9672..6cbdc24 100644
--- a/content/tag-developers/text-tag.html
+++ b/content/tag-developers/text-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/textarea-tag.html b/content/tag-developers/textarea-tag.html
index 63dcdd4..5d35b20 100644
--- a/content/tag-developers/textarea-tag.html
+++ b/content/tag-developers/textarea-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/textfield-tag.html b/content/tag-developers/textfield-tag.html
index 4bc6690..0875c82 100644
--- a/content/tag-developers/textfield-tag.html
+++ b/content/tag-developers/textfield-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/themes-and-templates.html b/content/tag-developers/themes-and-templates.html
index 85c39e9..4a4652e 100644
--- a/content/tag-developers/themes-and-templates.html
+++ b/content/tag-developers/themes-and-templates.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/token-tag.html b/content/tag-developers/token-tag.html
index 4defc75..fd70e36 100644
--- a/content/tag-developers/token-tag.html
+++ b/content/tag-developers/token-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/ui-tags.html b/content/tag-developers/ui-tags.html
index a51508a..d5f2216 100644
--- a/content/tag-developers/ui-tags.html
+++ b/content/tag-developers/ui-tags.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/updownselect-tag.html b/content/tag-developers/updownselect-tag.html
index 51b09a8..7009405 100644
--- a/content/tag-developers/updownselect-tag.html
+++ b/content/tag-developers/updownselect-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/url-tag.html b/content/tag-developers/url-tag.html
index b69efa7..9707f2b 100644
--- a/content/tag-developers/url-tag.html
+++ b/content/tag-developers/url-tag.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/velocity-tags.html b/content/tag-developers/velocity-tags.html
index c96da9c..c03ff07 100644
--- a/content/tag-developers/velocity-tags.html
+++ b/content/tag-developers/velocity-tags.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/velocity.html b/content/tag-developers/velocity.html
index 0c8d4d2..4776a8d 100644
--- a/content/tag-developers/velocity.html
+++ b/content/tag-developers/velocity.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/tag-developers/xhtml-theme.html b/content/tag-developers/xhtml-theme.html
index 772ff56..344fdba 100644
--- a/content/tag-developers/xhtml-theme.html
+++ b/content/tag-developers/xhtml-theme.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/updating-website.html b/content/updating-website.html
index 5eb842b..0e24579 100644
--- a/content/updating-website.html
+++ b/content/updating-website.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/volunteers.html b/content/volunteers.html
index d76a829..31be0b3 100644
--- a/content/volunteers.html
+++ b/content/volunteers.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
diff --git a/content/youatstruts.html b/content/youatstruts.html
index 481bedb..97ba154 100644
--- a/content/youatstruts.html
+++ b/content/youatstruts.html
@@ -49,7 +49,7 @@
                 <li><a href="/index.html">Welcome</a></li>
                 <li><a href="/download.cgi">Download</a></li>
                 <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="/announce-2021.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>