Merge pull request #187 from apache/clr-apache-amazon-smile-removal
amazon smile removal from contributing pages
diff --git a/.asf.yaml b/.asf.yaml
index 970c014..524811e 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -24,7 +24,7 @@
autobuild: preview/*
target: asf-site
theme: theme/apache
- minimum_page_count: 200
+ minimum_page_count: 180
whoami: main
staging:
diff --git a/README.md b/README.md
index d73a053..030cb66 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@
If you wish to update and test the site locally, there is a Docker build script you can use.
You will also need Git, and familiarity with working in a command-line shell.
-**The following instructions should work for Unix and macOS, but will need adjustment for Windows.**
+**The following instructions should work for Unix, Linux, and macOS, but will need adjustment for Windows.**
- Install [Docker](https://www.docker.com/get-started).
- Change to a suitable directory.
@@ -80,3 +80,11 @@
If you make changes to the local copy of www-site, these will be automatically built, and should
appear in the browser when you refresh the page.
+## Previewing proposed changes
+
+Any branch in the www-site repository that is named preview/* will
+auto-build and stage to www-*.staged.apache.org.
+
+If you need to test your changes, create a branch such as preview/_your-asf-id_
+
+Commits to it will be staged at www-_your-asf-id_.staged.apache.org
diff --git a/content/apache-name/index.md b/content/apache-name/index.md
index 3ac8831..4ab7369 100644
--- a/content/apache-name/index.md
+++ b/content/apache-name/index.md
@@ -6,12 +6,10 @@
The Apache Software Foundation (ASF) was incorporated in 1999 by original members of the Apache Group, 21 individuals from around the world who oversaw the development of the Apache HTTP Server, which was created in 1995.
-Co-founder Brian Behlendorf first came up with the name “Apache” for the server. The name “Apache” was chosen out of reverence and appreciation for the people and tribes who refer to themselves as “Apache”.
+Co-founder Brian Behlendorf first used the name “Apache” for the server. The use of the name “Apache” shows appreciation for the people and tribes who refer to themselves as “Apache”. As of 2023, to our knowledge these are the [Chiricahua Apache](https://camnnation.org/), the [Choctaw Apache](https://choctawapachetribeebarb.org/), the [Fort Sill Apache](https://fortsillapache-nsn.gov/), the Jicarilla Apache, the [Mescalero Apache](https://mescaleroapachetribe.com/), the [Lipan Apache](http://www.lipanapache.org/), the Apache Tribe of Oklahoma, the Plains Apache, the San Carlos Apache, the Tonto Apache, the [White Mountain Apache](http://www.wmat.nsn.us/) and the [Yavapai Apache](https://yavapai-apache.org/); additionally [Fort McDowell Yavapai Nation](https://www.fmyn.org/) is a member of the Apache Alliance.
As the Apache HTTP Server grew from patches applied to the NCSA Server, a pun on the name quickly spread amongst members of the community, with the rumor being that “Apache” actually stood for “a ‘patchy’ server”. As time passed, the popularity of the “A Patchy Server” story grew: rumor became lore, and lore became legend.
-In “Trillions and Trillions Served”, the 2020 documentary on the ASF, [Brian explains the ethos behind his choosing the name “Apache”](https://youtu.be/JUt2nb0mgwg?t=249).
-
On occasion, we have been asked about claims about use of the “Apache” name by the Apache Native American communities. During its twenty-five years of use of “Apache” as part of its name, the ASF has never been involved in any legal dispute with Native American communities or any other party in relation to the use of the “Apache” name.
For information on using the Apache name in promotions, media, and communications, visit [ASF Marketing and Publicity Resources](/press). For guidelines on using The Apache Software Foundation's brands on websites, in books, in presentations and events, in research papers, or in other ways, see the ASF’s Trademarks and Brand Management [Brand Policy](/foundation/marks).
diff --git a/content/css/styles.css b/content/css/styles.css
index 3f434a4..af3d2ea 100644
--- a/content/css/styles.css
+++ b/content/css/styles.css
@@ -11,6 +11,9 @@
font-weight: 600;
}
+h3.h3-small {
+ font-size: 20px;
+}
a {
word-break: normal;
}
@@ -31,6 +34,12 @@
display: block;
}
+.public-good .btn {
+ margin: 0 10px;
+}
+.about-foundation .btn {
+ margin-right: 10px;
+}
.navbar-default .navbar-toggle {
border: none;
@@ -92,6 +101,7 @@
#home #main-header .sideImg:first-child {
order: 1;
+ margin-right: 0px;
} #home #main-header .sideImg:nth-child(3) {
order: 2;
}
@@ -194,6 +204,9 @@
.bg-gray {
background: #eee;
}
+.bg-white {
+ background: #fff;
+}
.letter-header {
display: block;
diff --git a/content/dev/.htaccess b/content/dev/.htaccess
index 52a99ea..e46a5ab 100644
--- a/content/dev/.htaccess
+++ b/content/dev/.htaccess
@@ -6,6 +6,8 @@
Redirect /dev/apache-blogs.html /dev/project-blogs
Redirect /dev/project-creation https://incubator.apache.org/
Redirect /dev/project-creation.html https://incubator.apache.org/
+Redirect /dev/mirrors.html /mirrors
+Redirect /dev/mirrors /mirrors
# Pages moved to infra.apache.org:
#RedirectMatch 301 /dev/apply-license(.*) https://infra.apache.org/apply-license$1
@@ -15,3 +17,99 @@
# Another try; let local host add .html
Redirect /dev/asfbot.html https://infra.apache.org/asfbot.html
+
+Redirect /dev/committers https://infra.apache.org/committers.html
+Redirect /dev/committers.html https://infra.apache.org/committers.html
+
+Redirect /dev/contrib-email-tips https://infra.apache.org/contrib-email-tips.html
+Redirect /dev/contrib-email-tips.html https://infra.apache.org/contrib-email-tips.html
+
+Redirect /dev/contributors https://infra.apache.org/contributors.html
+Redirect /dev/contributors.html https://infra.apache.org/contributors.html
+
+Redirect /dev/crypto https://infra.apache.org/crypto.html
+Redirect /dev/crypto.html https://infra.apache.org/crypto.html
+
+Redirect /dev/git https://infra.apache.org/git.html
+Redirect /dev/git.html https://infra.apache.org/git.html
+
+Redirect /dev/infra-ban https://infra.apache.org/infra-ban.html
+Redirect /dev/infra-ban.html https://infra.apache.org/infra-ban.html
+
+Redirect /dev/infra-contact https://infra.apache.org/infra-contact.html
+Redirect /dev/infra-contact.html https://infra.apache.org/infra-contact.html
+
+Redirect /dev/infra-mail https://infra.apache.org/infra-mail.html
+Redirect /dev/infra-mail.html https://infra.apache.org/infra-mail.html
+
+Redirect /dev/infra-volunteer https://infra.apache.org/infra-volunteer.html
+Redirect /dev/infra-volunteer.html https://infra.apache.org/infra-volunteer.html
+
+Redirect /dev/key-transition https://infra.apache.org/key-transition.html
+Redirect /dev/key-transition.html https://infra.apache.org/key-transition.html
+
+Redirect /dev/licensing-howto https://infra.apache.org/licensing-howto.html
+Redirect /dev/licensing-howto.html https://infra.apache.org/licensing-howto.html
+
+Redirect /dev/machines https://infra.apache.org/machines.html
+Redirect /dev/machines.html https://infra.apache.org/machines.html
+
+Redirect /dev/new-committers-guide https://infra.apache.org/new-committers-guide.html
+Redirect /dev/new-committers-guide.html https://infra.apache.org/new-committers-guide.html
+
+Redirect /dev/open-access-svn https://infra.apache.org/open-access-svn.html
+Redirect /dev/open-access-svn.html https://infra.apache.org/open-access-svn.html
+
+Redirect /dev/openpgp https://infra.apache.org/openpgp.html
+Redirect /dev/openpgp.html https://infra.apache.org/openpgp.html
+
+Redirect /dev/project-blogs https://infra.apache.org/project-blogs.html
+Redirect /dev/project-blogs.html https://infra.apache.org/project-blogs.html
+
+Redirect /dev/project-names https://infra.apache.org/project-names.html
+Redirect /dev/project-names.html https://infra.apache.org/project-names.html
+
+Redirect /dev/project-site https://infra.apache.org/project-site.html
+Redirect /dev/project-site.html https://infra.apache.org/project-site.html
+
+Redirect /dev/publishing-maven-artifacts https://infra.apache.org/publishing-maven-artifacts.html
+Redirect /dev/publishing-maven-artifacts.html https://infra.apache.org/publishing-maven-artifacts.html
+
+Redirect /dev/release-distribution https://infra.apache.org/release-distribution.html
+Redirect /dev/release-distribution.html https://infra.apache.org/release-distribution.html
+
+Redirect /dev/release-download-pages https://infra.apache.org/release-download-pages.html
+Redirect /dev/release-download-pages.html https://infra.apache.org/release-download-pages.html
+
+Redirect /dev/release-publishing https://infra.apache.org/release-publishing.html
+Redirect /dev/release-publishing.html https://infra.apache.org/release-publishing.html
+
+Redirect /dev/release-signing https://infra.apache.org/release-signing.html
+Redirect /dev/release-signing.html https://infra.apache.org/release-signing.html
+
+Redirect /dev/release /legal/release-policy.html
+Redirect /dev/release.html /legal/release-policy.html
+
+Redirect /dev/repository-faq https://infra.apache.org/repository-faq.html
+Redirect /dev/repository-faq.html https://infra.apache.org/repository-faq.html
+
+Redirect /dev/services https://infra.apache.org/services.html
+Redirect /dev/services.html https://infra.apache.org/services.html
+
+Redirect /dev/svngit2jira https://infra.apache.org/svngit2jira.html
+Redirect /dev/svngit2jira.html https://infra.apache.org/svngit2jira.html
+
+Redirect /dev/user-email https://infra.apache.org/committer-email.html
+Redirect /dev/user-email.html https://infra.apache.org/committer-email.html
+
+Redirect /dev/user-ssh-windows https://infra.apache.org/user-ssh.html
+Redirect /dev/user-ssh-windows.html https://infra.apache.org/user-ssh.html
+
+Redirect /dev/user-ssh https://infra.apache.org/user-ssh.html
+Redirect /dev/user-ssh.html https://infra.apache.org/user-ssh.html
+
+Redirect /dev/version-control https://infra.apache.org/version-control.html
+Redirect /dev/version-control.html https://infra.apache.org/version-control.html
+
+Redirect /dev/writable-git https://infra.apache.org/git-primer.html
+Redirect /dev/writable-git.html https://infra.apache.org/git-primer.html
diff --git a/content/dev/apply-license.md b/content/dev/apply-license.md
deleted file mode 100644
index c044587..0000000
--- a/content/dev/apply-license.md
+++ /dev/null
@@ -1,10 +0,0 @@
-Title: Applying the Apache License, Version 2.0
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<div>
-<script type="text/javascript">
-location.href = location.href.replace(/^https?:\/\/[^\/]+\/dev\//, 'https://infra.apache.org/');
-</script>
-</div>
-
-<h2>This content has moved to <a href="https://infra.apache.org/apply-license.html">here</a>.</h2>
diff --git a/content/dev/asfbot.md b/content/dev/asfbot.md
deleted file mode 100644
index 3630fdf..0000000
--- a/content/dev/asfbot.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Title: ASF IRC Services and Archives
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-location.href = location.href.replace(/^https?:\/\/[^\/]+\/dev\//, 'https://infra.apache.org/');
-</script>
-
-
-## This material has moved [here][1]. ##
-
-
- [1]: https://infra.apache.org/asfbot.html
diff --git a/content/dev/committers.md b/content/dev/committers.md
deleted file mode 100644
index 327a3d9..0000000
--- a/content/dev/committers.md
+++ /dev/null
@@ -1,16 +0,0 @@
-Atom: http://mail-archives.apache.org/mod_mbox/www-community/?format=atom
-Title: Committers' FAQs
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-let old_url = new RegExp('https?://[^/]+/dev/'); // https://apache.org/dev/foo.html etc
-let new_url = 'https://infra.apache.org/';
-location.href = location.href.replace(old_url, new_url);
-</script>
-
-
-
-This information has moved **[here][1]**
-
-
- [1]: https://infra.apache.org/committers.html
diff --git a/content/dev/contrib-email-tips.md b/content/dev/contrib-email-tips.md
deleted file mode 100644
index bd6d7be..0000000
--- a/content/dev/contrib-email-tips.md
+++ /dev/null
@@ -1,14 +0,0 @@
-Atom: http://mail-archives.apache.org/mod_mbox/community-dev/?format=atom
-Title: Tips for email contributors
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-let old_url = new RegExp('https?://[^/]+/dev/'); // https://apache.org/dev/foo.html etc
-let new_url = 'https://infra.apache.org/';
-location.href = location.href.replace(old_url, new_url);
-</script>
-
-# Apache Mailing List Etiquette Tips
-
-This information has moved to <a href="https://infra.apache.org/contrib-email-tips.html">here</a>.
-
diff --git a/content/dev/contributors.md b/content/dev/contributors.md
deleted file mode 100644
index 8c579cc..0000000
--- a/content/dev/contributors.md
+++ /dev/null
@@ -1,17 +0,0 @@
-Atom: http://mail-archives.apache.org/mod_mbox/community-dev/?format=atom
-Title: Guide for new project contributors
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-let old_url = new RegExp('https?://[^/]+/dev/'); // https://apache.org/dev/foo.html etc
-let new_url = 'https://infra.apache.org/';
-location.href = location.href.replace(old_url, new_url);
-</script>
-
-# Guide For New Project Contributors {#policy}
-
-This information has moved **[here][1]**.
-
-
-
- [1]: https://infra.apache.org/contributors.html
diff --git a/content/dev/crypto.md b/content/dev/crypto.md
deleted file mode 100644
index e22124b..0000000
--- a/content/dev/crypto.md
+++ /dev/null
@@ -1,16 +0,0 @@
-Title: Handling Cryptography within an ASF Release
-Atom: http://mail-archives.apache.org/mod_mbox/www-legal-discuss/?format=atom
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-let old_url = new RegExp('https?://[^/]+/dev/'); // https://apache.org/dev/foo.html etc
-let new_url = 'https://infra.apache.org/';
-location.href = location.href.replace(old_url, new_url);
-</script>
-
-# Handling cryptography within an ASF release #
-
-This information has moved **[here][1]**.
-
-
- [1]: https://infra.apache.org/crypto.html
diff --git a/content/dev/git.md b/content/dev/git.md
deleted file mode 100644
index 795b075..0000000
--- a/content/dev/git.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Title: Git access to Apache codebases
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-location.href = location.href.replace(/^https?:\/\/[^\/]+\/dev\//, 'https://infra.apache.org/');
-</script>
-
-## This information has moved [here][1]
-
-
- [1]: https://infra.apache.org/git.html
diff --git a/content/dev/infra-ban.md b/content/dev/infra-ban.md
deleted file mode 100644
index 8c7f069..0000000
--- a/content/dev/infra-ban.md
+++ /dev/null
@@ -1,10 +0,0 @@
-Title: Site-wide ban policy
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-location.href = location.href.replace(/^https?:\/\/[^\/]+\/dev\//, 'https://infra.apache.org/');
-</script>
-
-## Site-wide ban policy ##
-
-This information is now available <a href="https://infra.apache.org/infra-ban.html" target="_blank">here</a>.
diff --git a/content/dev/infra-contact.md b/content/dev/infra-contact.md
deleted file mode 100644
index 63ba6b8..0000000
--- a/content/dev/infra-contact.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Title: Contacting the Infrastructure Team
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-location.href = location.href.replace(/^https?:\/\/[^\/]+\/dev\//, 'https://infra.apache.org/');
-</script>
-
-
-
-## This information has moved [here][1].
-
-
- [1]: https://infra.apache.org/infra-contact.html
diff --git a/content/dev/infra-mail.md b/content/dev/infra-mail.md
deleted file mode 100644
index e6d8eed..0000000
--- a/content/dev/infra-mail.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Atom: http://mail-archives.apache.org/mod_mbox/www-repository/?format=atom
-Title: ASF Infrastructure mailing lists
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-location.href = location.href.replace(/^https?:\/\/[^\/]+\/dev\//, 'https://infra.apache.org/');
-</script>
-
-
-## This information has moved [here][1] ##
-
-
- [1]: https://infra.apache.org/infra-mail.html
diff --git a/content/dev/infra-volunteer.md b/content/dev/infra-volunteer.md
deleted file mode 100644
index ef74599..0000000
--- a/content/dev/infra-volunteer.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Title: How to be an ASF Infrastructure volunteer
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-location.href = location.href.replace(/^https?:\/\/[^\/]+\/dev\//, 'https://infra.apache.org/');
-</script>
-
-
-
-## This information has moved [here][1] ##
-
-
- [1]: https://infra.apache.org/volunteer.html
diff --git a/content/dev/infrastructure.md b/content/dev/infrastructure.md
index 0db53bc..1595b90 100644
--- a/content/dev/infrastructure.md
+++ b/content/dev/infrastructure.md
@@ -60,9 +60,3 @@
- [Public Host and Service Status](https://status.apache.org/) -
ASF Infra has already been automatically alerted if a service is marked as down.
-
-## Internal services {#internal-services}
-
-- We use a fork of [CKL (CloudKick Logger)](ckl) to record shell sessions
- during our work.
-
diff --git a/content/dev/key-transition.md b/content/dev/key-transition.md
deleted file mode 100644
index eb5f02b..0000000
--- a/content/dev/key-transition.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Title: How To Transition To A Longer Key
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-location.href = location.href.replace(/^https?:\/\/[^\/]+\/dev\//, 'https://infra.apache.org/');
-</script>
-
-
-## This information has moved [here][1] ##
-
-
- [1]: https://infra.apache.org/key-transition.html
diff --git a/content/dev/licensing-howto.md b/content/dev/licensing-howto.md
deleted file mode 100644
index 4ac1b9e..0000000
--- a/content/dev/licensing-howto.md
+++ /dev/null
@@ -1,15 +0,0 @@
-Title: Assembling LICENSE and NOTICE files
-
-<script type="text/javascript">
-let old_url = new RegExp('https?://[^/]+/dev/'); // https://apache.org/dev/foo.html etc
-let new_url = 'https://infra.apache.org/';
-location.href = location.href.replace(old_url, new_url);
-</script>
-
-
-## Assembling LICENSE and NOTICE files ##
-
-This information has moved **[here][1]**
-
-
- [1]: https://infra.apache.org/licensing-howto.html
diff --git a/content/dev/machines.md b/content/dev/machines.md
deleted file mode 100644
index b4fc2d1..0000000
--- a/content/dev/machines.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Title: ASF Machines List
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-let old_url = new RegExp('https?://[^/]+/dev/'); // https://apache.org/dev/foo.html etc
-let new_url = 'https://infra.apache.org/';
-location.href = location.href.replace(old_url, new_url);
-</script>
-
-This information has moved to [infra.apache.org/machines.html][1]
-
-
- [1]: https://infra.apache.org/machines.html
diff --git a/content/dev/mirrors.md b/content/dev/mirrors.md
deleted file mode 100644
index 2ae4945..0000000
--- a/content/dev/mirrors.md
+++ /dev/null
@@ -1,10 +0,0 @@
-Title: Apache Mirroring Information
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-# Apache download mirror system
-
-As of the third quarter of 2021, the ASF stopped using its download mirror system. It is now using a global content distribution network (CDN).
-
-Read about <a href="https://apache.org/history/mirror-history.html">the history of the Apache mirror system</a>.
-
-
diff --git a/content/dev/new-committers-guide.md b/content/dev/new-committers-guide.md
deleted file mode 100644
index 32253b9..0000000
--- a/content/dev/new-committers-guide.md
+++ /dev/null
@@ -1,16 +0,0 @@
-Atom: http://mail-archives.apache.org/mod_mbox/www-community/?format=atom
-Title: Guide for new committers
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-let old_url = new RegExp('https?://[^/]+/dev/'); // https://apache.org/dev/foo.html etc
-let new_url = 'https://infra.apache.org/';
-location.href = location.href.replace(old_url, new_url);
-</script>
-
-# Guide for new committers #
-
-This information has moved **[here][1]**.
-
-
- [1]: https://infra.apache.org/new-committers-guide.html
diff --git a/content/dev/open-access-svn.md b/content/dev/open-access-svn.md
deleted file mode 100644
index f8dc967..0000000
--- a/content/dev/open-access-svn.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Title: Open Access SVN
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-let old_url = new RegExp('https?://[^/]+/dev/'); // https://apache.org/dev/foo.html etc
-let new_url = 'https://infra.apache.org/';
-location.href = location.href.replace(old_url, new_url);
-</script>
-
-This material has moved to **[infra.a.o][1]**
-
-
- [1]: https://infra.apache.org/open-access-svn.html
diff --git a/content/dev/openpgp.md b/content/dev/openpgp.md
deleted file mode 100644
index 88a0ef8..0000000
--- a/content/dev/openpgp.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Title: How To OpenPGP
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-location.href = location.href.replace(/^https?:\/\/[^\/]+\/dev\//, 'https://infra.apache.org/');
-</script>
-
-
-## This material has moved [here][1] ##
-
-
- [1]: https://infra.apache.org/openpgp.html
diff --git a/content/dev/project-blogs.md b/content/dev/project-blogs.md
deleted file mode 100644
index eaf48d5..0000000
--- a/content/dev/project-blogs.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Title: How To Request A Blog For Your Apache Project
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-location.href = location.href.replace(/^https?:\/\/[^\/]+\/dev\//, 'https://infra.apache.org/');
-</script>
-
-**Request a blog for your Apache project**
-
-This information has moved [here][1].
-
-
- [1]: https://infra.apache.org/project-blogs.html
diff --git a/content/dev/project-names.md b/content/dev/project-names.md
deleted file mode 100644
index fb321c1..0000000
--- a/content/dev/project-names.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Title: Choosing names for ASF projects
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-let old_url = new RegExp('https?://[^/]+/dev/'); // https://apache.org/dev/foo.html etc
-let new_url = 'https://infra.apache.org/';
-location.href = location.href.replace(old_url, new_url);
-</script>
-
-This material has moved to [infra.apache.org/project-names.html][1]
-
-
- [1]: https://infra.apache.org/project-names.html
diff --git a/content/dev/project-site.md b/content/dev/project-site.md
deleted file mode 100644
index f96f67a..0000000
--- a/content/dev/project-site.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Title: Manage your project web site
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-location.href = location.href.replace(/^https?:\/\/[^\/]+\/dev\//, 'https://infra.apache.org/');
-</script>
-
-
-This information has moved [**here**][1].
-
-
- [1]: https://infra.apache.org/project-site.html
diff --git a/content/dev/publishing-maven-artifacts.md b/content/dev/publishing-maven-artifacts.md
deleted file mode 100644
index 47194a4..0000000
--- a/content/dev/publishing-maven-artifacts.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Title: Publishing Maven Artifacts
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-location.href = location.href.replace(/^https?:\/\/[^\/]+\/dev\//, 'https://infra.apache.org/');
-</script>
-
-
-<h3>The information on Maven releases has moved to <a href="https://infra.apache.org/pages/maven-releases.html">https://infra.apache.org/pages/maven-releases.html</a> </h3>
-
-
diff --git a/content/dev/release-distribution.md b/content/dev/release-distribution.md
deleted file mode 100644
index b2746e3..0000000
--- a/content/dev/release-distribution.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Title: Release Distribution Policy
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-location.href = location.href.replace(/^https?:\/\/[^\/]+\/dev\//, 'https://infra.apache.org/');
-</script>
-
-
-# Release Distribution Policy #
-
-<h4>This information has moved to <a href="https://infra.apache.org/pages/release-distribution.html">https://infra.apache.org/pages/release-distribution.html</a>.
diff --git a/content/dev/release-download-pages.md b/content/dev/release-download-pages.md
deleted file mode 100644
index de9bf7f..0000000
--- a/content/dev/release-download-pages.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Title: Release Download Pages
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-location.href = location.href.replace(/^https?:\/\/[^\/]+\/dev\//, 'https://infra.apache.org/');
-</script>
-
-## This content has moved [here][1] ##
-
-
- [1]: https://infra.apache.org/release-download-pages.html
diff --git a/content/dev/release-publishing.md b/content/dev/release-publishing.md
deleted file mode 100644
index 596b939..0000000
--- a/content/dev/release-publishing.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Title: Publishing Releases
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-location.href = location.href.replace(/^https?:\/\/[^\/]+\/dev\//, 'https://infra.apache.org/');
-</script>
-
-
-## This material has moved [here][1] ##
-
-
- [1]: https://infra.apache.org/release-publishing.html
diff --git a/content/dev/release-signing.md b/content/dev/release-signing.md
deleted file mode 100644
index 56825b7..0000000
--- a/content/dev/release-signing.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Title: Signing Releases
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-location.href = location.href.replace(/^https?:\/\/[^\/]+\/dev\//, 'https://infra.apache.org/');
-</script>
-
-## This material has move to [here][1].
-
-
- [1]: https://infra.apache.org/release-signing.html
diff --git a/content/dev/release.md b/content/dev/release.md
deleted file mode 100644
index 269e2ad..0000000
--- a/content/dev/release.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Title: Releases Policy
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-if(window.location.hostname == 'www.apache.org' || window.location.hostname == 'www.staging.apache.org' || window.location.hostname == 'apache.org') {
- location.href = "/legal/release-policy.html" + (location.hash||"");
-}
-</script>
diff --git a/content/dev/repository-faq.md b/content/dev/repository-faq.md
deleted file mode 100644
index 24a00b5..0000000
--- a/content/dev/repository-faq.md
+++ /dev/null
@@ -1,10 +0,0 @@
-Title: ASF Jar Repositories
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-location.href = location.href.replace(/^https?:\/\/[^\/]+\/dev\//, 'https://infra.apache.org/');
-</script>
-
-
-<h4>This information has moved <a href="https://infra.apache.org/repository-faq.html" target="_blank">here</a>.</h4>
-
diff --git a/content/dev/services.md b/content/dev/services.md
deleted file mode 100644
index b450c8f..0000000
--- a/content/dev/services.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Title: Services List
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-location.href = location.href.replace(/^https?:\/\/[^\/]+\/dev\//, 'https://infra.apache.org/');
-</script>
-
-#List of Services #
-
-##This information has been combined with other information [here][1].
-
-
- [1]: https://infra.apache.org/services.html
diff --git a/content/dev/svngit2jira.md b/content/dev/svngit2jira.md
deleted file mode 100644
index 501b1f7..0000000
--- a/content/dev/svngit2jira.md
+++ /dev/null
@@ -1,15 +0,0 @@
-Title: Subversion and Git integration with JIRA tickets
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-location.href = location.href.replace(/^https?:\/\/[^\/]+\/dev\//, 'https://infra.apache.org/');
-</script>
-
-
-
-# Subversion and Git integration with Jira tickets
-
-## This information has moved [here][1].
-
-
- [1]: https://infra.apache.org/svngit2jira.html
diff --git a/content/dev/user-email.md b/content/dev/user-email.md
deleted file mode 100644
index bd1d1e3..0000000
--- a/content/dev/user-email.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Title: Committer email configuration
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-This page has moved to [here](https://infra.apache.org/committer-email.html)
diff --git a/content/dev/user-ssh-windows.md b/content/dev/user-ssh-windows.md
deleted file mode 100644
index 8391d66..0000000
--- a/content/dev/user-ssh-windows.md
+++ /dev/null
@@ -1,10 +0,0 @@
-Title: Committer SSH Configuration on Windows
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-location.href = location.href.replace(/^https?:\/\/[^\/]+\/dev\//, 'https://infra.apache.org/');
-</script>
-
-
-<h2>This information has moved to <a href="https://infra.apache.org/user-ssh-windows.html">here</a></h2>
-
diff --git a/content/dev/user-ssh.md b/content/dev/user-ssh.md
deleted file mode 100644
index 9629b24..0000000
--- a/content/dev/user-ssh.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Title: Committer SSH Access
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-location.href = location.href.replace(/^https?:\/\/[^\/]+\/dev\//, 'https://infra.apache.org/');
-</script>
-
-## The contents of this page have moved [here][1] ##
-
-
- [1]: https://infra.apache.org/user-ssh.html
diff --git a/content/dev/version-control.md b/content/dev/version-control.md
deleted file mode 100644
index 8118523..0000000
--- a/content/dev/version-control.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Title: Source Code Repository
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-location.href = location.href.replace(/^https?:\/\/[^\/]+\/dev\//, 'https://infra.apache.org/');
-</script>
-
-
-## This information is now [here][1] ##
-
-
- [1]: https://infra.apache.org/version-control.html
diff --git a/content/dev/writable-git.md b/content/dev/writable-git.md
deleted file mode 100644
index 48663e5..0000000
--- a/content/dev/writable-git.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Title: Git repositories
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-<script type="text/javascript">
-location.href = location.href.replace(/^https?:\/\/[^\/]+\/dev\//, 'https://infra.apache.org/');
-</script>
-
-## This material has moved [here][1] ##
-
-
- [1]: https://infra.apache.org/writable-git.html
diff --git a/content/foundation/.htaccess b/content/foundation/.htaccess
index b6ecf7e..79c8f8d 100644
--- a/content/foundation/.htaccess
+++ b/content/foundation/.htaccess
@@ -5,3 +5,4 @@
Redirect /foundation/licence-FAQ.html /foundation/license-faq.html
Redirect /foundation/contributing-v5.html /foundation/contributing.html
Redirect /foundation/policies/privacy.html https://privacy.apache.org/policies/privacy-policy-public.html
+Redirect /foundation/thanks_old.html /foundation/thanks.html
diff --git a/content/foundation/README.md b/content/foundation/README.md
index e318ee1..269a210 100644
--- a/content/foundation/README.md
+++ b/content/foundation/README.md
@@ -34,3 +34,12 @@
For trivial changes commit and let the stakeholders know.
The [svn history](http://svn.apache.org/viewvc/infrastructure/site/trunk/content/foundation) was not migrated and remains available.
+
+# Previewing proposed changes
+
+Any branch in the www-site repository that is named preview/* will
+auto-build and stage to www-*.staged.apache.org.
+
+If you need to test your changes, create a branch such as preview/<your-asf-id>
+Commits to it will be staged at www-<your-asf-id>.staged.apache.org
+
\ No newline at end of file
diff --git a/content/foundation/how-it-works.md b/content/foundation/how-it-works.md
index 9a19d8c..2b26b74 100644
--- a/content/foundation/how-it-works.md
+++ b/content/foundation/how-it-works.md
@@ -23,8 +23,6 @@
- [What is the Apache Software Foundation?](#what)
-- [A bit of history](#history)
-
- [Meritocracy](#meritocracy)
- [The Foundation structure](#structure)
@@ -62,39 +60,6 @@
That's the dry facts, but how did all this come to be and what does it
really mean? We need to step back a little in history.
-## A bit of history {#history}
-
-A group of people calling themselves the “Apache Group” created the foundation in 1999. They had come together several years earlier,
-to continue to support and maintain the HTTPD web server written by the
-National Center for Supercomputing Applications (NCSA) at the University of Illinois.
-
-That server was freely available, came with its source code, its license allowed very open modification and redistribution, but
-the original developers lost interest in that project and moved onto
-something else, leaving users with no support for the application.
-
-Some of those users started to exchange fixes (called "patches") and
-information on how to prevent problems and improve the existing software.
-Brian Behlendorf created a mailing list on which those users
-could collaborate to fix, maintain and improve that software.
-
-The group chose the name 'Apache' out of respect for the Native American Apache
-Nation, well-known for their superior skills in warfare strategy and their
-inexhaustible endurance. It also makes a cute pun on "a patchy web server"
--- a server made from a series of patches -- but this was not its origin.
-The group soon started to call themselves the "Apache Group".
-
-Between 1995 and 1999, the Apache HTTPD Web Server that the Apache
-Group created and supported became the leader of the market (and currently still is, with more
-than 65% of the web sites in the world powered by it).
-
-But as the web grew bigger, economic interests started to grow, and the
-Apache web site hosted new sister projects (such as the mod_ perl project,
-the PHP project, the Java Apache project). The need for a more coherent and
-structured organization that would shield individuals from potential legal
-attacks became more and more clear.
-
-Read more about [ASF History](/history/).
-
## Meritocracy {#meritocracy}
Unlike other software development efforts under an open source
diff --git a/content/foundation/members.md b/content/foundation/members.md
index d9204e6..e411427 100644
--- a/content/foundation/members.md
+++ b/content/foundation/members.md
@@ -42,7 +42,8 @@
## Members of The Apache Software Foundation
-N.B. the listing below is optional; there is a separate summary of [members](http://home.apache.org/committers-by-project.html#member)
+N.B. the listing below is *optional*, and is **not a complete listing**.
+There is a complete summary of the [member LDAP group](http://home.apache.org/committers-by-project.html#member)
| Id | Name | Projects |
|----|------|----------|
@@ -53,17 +54,13 @@
| abaker | Anthony Baker | [Geode](https://geode.apache.org) |
| abayer | Andrew Bayer | [Whirr](http://whirr.apache.org), [Bigtop](http://bigtop.apache.org), [jclouds](http://jclouds.incubator.apache.org)|
| abti | Abhishek Tiwari | [Gobblin](https://gobblin.apache.org) |
-| acmurthy | Arun Murthy |
| adc | Alan D. Cabrera |
| adelbene | [Andrea Del Bene](https://twitter.com/andreaDelBene19) | [Wicket](http://wicket.apache.org/) |
| adityasharma | Aditya Sharma | [OFBiz](https://ofbiz.apache.org), [Roller](https://roller.apache.org), [ComDev](https://community.apache.org) |
| adrianocrestani | Adriano Crestani Campos |
| aestrada | Adam Estrada | [SIS](http://sis.apache.org) |
| afuchs | Adam Fuchs | [Accumulo](http://accumulo.apache.org)|
-| agrieve | Andrew Grieve |
| aheritier | [Arnaud Héritier](http://aheritier.net/) | [Maven](http://maven.apache.org/), [Archiva](http://archiva.apache.org/)|
-| ajack | Adam Jack |
-| ajith | Ajith H Ranabahu |
| akarasulu | [Alex Karasulu](mailto:akarasulu@apache.org) | [directory](http://incubator.apache.org/directory) ; [excalibur](http://excalibur.apache.org/) ; [jakarta](http://jakarta.apache.org/)|
| akm | Andrew Musselman | [Mahout](http://mahout.apache.org) |
| alfonsonishikawa | [Alfonso Nishikawa Muñumer](http://people.apache.org/~alfonsonishikawa) | [Gora](https://gora.apache.org) |
@@ -74,16 +71,13 @@
| angela | Angela Schreiber | [Jackrabbit](http://jackrabbit.apache.org/)|
| anshum | Anshum Gupta | [Lucene](http://lucene.apache.org/), [Solr](http://solr.apache.org/) |
| antelder | Ant Elder |
-| antoine | Antoine Levy-Lambert |
| antonio | [Antonio Gallardo Rivera](http://home.apache.org/~antonio/) | [Cocoon](http://cocoon.apache.org/) , [Forrest](http://forrest.apache.org/) , [Lenya](http://lenya.apache.org/)|
-| arje | [Arjé Cahn](http://www.bloomreach.com) | [Cocoon](http://cocoon.apache.org/) |
+apache.org/) |
| arkurth | Andy Kurth | [VCL](http://vcl.apache.org/) |
| arp | Arpit Agarwal |
| arreyder | [Christopher R. Rhodes](http://arreyder.com) |
| arvind | [Arvind Prabhakar](http://home.apache.org/~arvind) | [Sqoop](http://sqoop.apache.org/) ; [Flume](http://incubator.apache.org/flume)|
| asankha | [Asankha Perera](http://people.apache.org/~asankha) | [HttpComponents](http://hc.apache.org)
-| asanso | Antonio Sanso |
-| asavory | [Andrew Savory](http://www.andrewsavory.com/blog/) |
| asifdxtreme | [Mohammad Asif Siddiqui](https://asifdxr.netlify.app) | Incubator, Nuttx, Servicecomb |
| aslom | Alek Slominski |
| ate | [Ate Douma](http://home.apache.org/~ate/) | [Airavata](https://airavata.apache.org/), [AsterixDB](https://asterixdb.apache.org/), [Commons](https://commons.apache.org/), [Incubator](https://incubator.apache.org/), [NetBeans](https://netbeans.apache.org/), [Portals](https://portals.apache.org/), [Streams](https://streams.apache.org/), [Wicket](https://wicket.apache.org/) |
@@ -93,9 +87,7 @@
| bayard | Henri Yandell |
| bdelacretaz | [Bertrand Delacrétaz](http://www.codeconsult.ch/) | [Cocoon](http://cocoon.apache.org/) , [FOP](http://xml.apache.org/fop/)|
| ben | Ben Laurie | [httpd](http://httpd.apache.org/) ; [ApacheCon](http://www.apachecon.com/)|
-| berndf | [Bernd Fondermann](http://brainlounge.de) |
| bigosmallm | [OmPrakash Muppirala](https://twitter.com/bigosmallm) | [Flex](http://flex.apache.org/), [Royale](http://royale.apache.org/) |
-| billbarker | William Barker |
| billcole | William K. (Bill) Cole | [SpamAssassin](http://spamassassin.apache.org/)|
| billie | Billie Rinaldi | [Accumulo](http://accumulo.apache.org)|
| bjh | [Brian Havard](http://silk.apana.org.au) | [httpd](http://httpd.apache.org/) , [APR](http://apr.apache.org/)|
@@ -105,7 +97,6 @@
| bob | Bob Paulin | [Felix](http://felix.apache.org/) , [Tika](http://tika.apache.org/)|
| bobby | Robert (Bobby) Evans | [Storm](http://storm.apache.org) , [Hadoop](http://hadoop.apache.org) , [Spark](http://spark.apache.org) , [Tez](http://tez.apache.org/) |
| bodewig | [Stefan Bodewig](http://stefan.samaflost.de/) | [Ant](http://ant.apache.org/) , [Gump](http://gump.apache.org/) , [Jakarta](http://jakarta.apache.org/)|
-| boisvert | Alex Boisvert |
| bommel | Bernd Bohmann | [MyFaces](http://myfaces.apache.org/)|
| brane | Branko Čibej |
| breser | Ben Reser | [Subversion](http://subversion.apache.org) ; [httpd](http://httpd.apache.org) |
@@ -115,112 +106,80 @@
| briang | Brian Geffon |
| brianleroux | [Brian LeRoux](https://brian.io) |
| brianm | [Brian McCallister](http://home.apache.org/~brianm/) |
-| britter | Benedikt Ritter | [Commons](http://commons.apache.org) |
-| bruno | Bruno Dumon |
-| bryanduxbury | Bryan Duxbury |
| bsnyder | [Bruce Snyder](http://bruceblog.org/) | [ActiveMQ](http://activemq.apache.org) ; [Geronimo](http://geronimo.apache.org/) ; [Incubator](http://incubator.apache.org/) ; [ServiceMix](http://servicemix.apache.org/)|
| busbey | Sean Busbey |
| buschmi | Michael Busch |
| caijunj | Jun Jie Cai |
| carlos | [Carlos Sanchez](http://www.carlossanchez.eu) | [Maven](http://maven.apache.org) ; [Archiva](http://archiva.apache.org) ; [Continuum](http://continuum.apache.org)|
-| carlosrovira | [Carlos Rovira](https://www.carlosrovira.com) | [Royale](https://royale.apache.org) ; [Flex](https://flex.apache.org) |
-| carnold | Curt Arnold |
-| cbegin | Clinton Begin |
-| cctrieloff | Carl Trieloff |
-| ccustine | [Chris Custine](http://blog.organicelement.com/) | [ServiceMix](http://servicemix.apache.org/) , [Karaf](http://karaf.apache.org/) , [Felix](http://felix.apache.org/) , [Directory Server](http://directory.apache.org/)|
| cdouglas | Chris Douglas |
| cdutz | Christofer Dutz | [ComDev](https://community.apache.org), [Daffodil](https://daffodil.apache.org), [Flex](https://flex.apache.org), [Incubator](https://incubator.apache.org), [Infrastructure](https://infra.apache.org), [IoTDB](https://iotdb.apache.org), [Kibble](https://kibble.apache.org), [Mahout](https://mahout.apache.org), [PLC4X](https://plc4x.apache.org), [Royale](https://royale.apache.org), [StreamPipes (incubating)](https://streampipes.apache.org), [Training (incubating)](https://training.apache.org), [Wayang (incubating)](https://wayang.apache.org) |
-| ceki | Ceki Gülcü | [Jakarta](http://jakarta.apache.org/) , log4j|
| centic | Dominik Stadler | [POI](http://poi.apache.org) |
| cezar | [Cezar Cristian Andrei](http://cezarandrei.com) | [XMLBeans](http://xmlbeans.apache.org/) , [VXQuery](http://incubator.apache.org/vxquery/)|
| chenpei | [Pei Chen](mailto:chenpei@apache.org) | [cTAKES](http://ctakes.apache.org) |
-| chinthaka | [Eran Chinthaka](http://home.apache.org/~chinthaka/) | [Axis2](http://ws.apache.org/axis2/) , [Axiom](http://ws.apache.org/commons/axiom/) , [Neethi](http://ws.apache.org/commons/policy/)|
| chipchilders | [Chip Childers](http://www.chipchilders.com/) | [CloudStack](http://cloudstack.apache.org) |
-| chirino | Hiram Chirino |
| chrisg | Christian Geisert | [XML Graphics](http://xmlgraphics.apache.org/) , [FOP](http://xmlgraphics.apache.org/fop/)|
| christ | Chris Thistlethwaite | Infrastructure , [Warble (incubating)](http://warble.apache.org/) |
| chtompki | [Rob Tompkins](http://www.robtompkins.com) | [Commons](http://commons.apache.org) |
| claude | Claude N. Warren, Jr. | [Jena](http://jena.apache.org) |
-| cliff | Cliff Skolnick | [httpd](http://httpd.apache.org/)|
-| cliffs | Cliff Schmidt |
| clr | Craig L Russell | [JDO](http://db.apache.org/jdo) ; [Incubator](http://incubator.apache.org/) ; [OpenJPA](http://openjpa.apache.org/)|
| cmccabe | Colin P. McCabe |
| cmpilato | C. Michael Pilato |
-| cmueller | Christian Müller | [Camel](http://camel.apache.org) |
| cnauroth | Chris Nauroth | [Hadoop](http://hadoop.apache.org/) , [ZooKeeper](https://zookeeper.apache.org) |
| coar | Ken Coar | [ApacheCon](http://www.apachecon.com/) , [APR](http://apr.apache.org/) , board , [commons](http://commons.apache.org/) , fund-raising , [httpd](http://httpd.apache.org/) , [httpd-docs](http://httpd.apache.org/docs-project/) , [incubator](http://incubator.apache.org/) , [PHP](http://www.php.net/)|
| coheigea | Colm Ó hÉigeartaigh |
| colm | [Colm MacCárthaigh](mailto:colm@(anti-spam)stdlib.net) |
| conor | Conor MacNeill | [Ant](http://ant.apache.org/) ; [Jakarta](http://jakarta.apache.org/)|
| cos | [Konstantin Boudnik](http://www.boudnik.org/~cos) | [Bigtop](http://bigtop.apache.org) , [Groovy](http://groovy.apache.org) , [Celix](http://celix.apache.org) , [Hadoop](http://hadoop.apache.org) , [Ignite](http://ignite.apache.org) , [Incubator](http://incubator.apache.org) , [Geode](http://geode.apache.org) |
-| costin | Doru Costin Manolache |
| covener | Eric Covener |
| craigmcc | Craig R. McClanahan | [Jakarta](http://jakarta.apache.org/)|
-| crichton | Dan Crichton |
| crossley | [David Crossley](http://www.indexgeo.com.au/apache/) | [Cocoon](http://cocoon.apache.org/) , [Forrest](http://xml.apache.org/forrest/) , [xml-commons](http://xml.apache.org/commons/)|
| ctubbsii | Christopher Tubbs | [Accumulo](https://accumulo.apache.org) , [Fluo](https://fluo.apache.org)|
| curcuru | Shane Curcuru | [xalan](http://xml.apache.org/xalan-j/) , [xml-commons](http://xml.apache.org/commons/)|
| cutting | [Doug Cutting](http://blog.lucene.com/) |
| cziegeler | [Carsten Ziegeler](mailto:cziegeler@apache.org) | [Sling](http://sling.apache.org/), [Felix](http://Felix.apache.org/), [Portals](http://portals.apache.org/)|
| dain | Dain Sundstrom |
-| damien | Damien F. Katz |
-| damitha | Damitha N.M. Kumarage |
| danese | Danese Cooper |
-| danielf | Daniel Fagerstrom |
+| danhaywood | Dan Haywood | [Causeway](https://causeway.apache.org) |
| danielsh | Daniel Shahaf | [Subversion](http://subversion.apache.org/), [Infrastructure](http://www.apache.org/dev/infrastructure)|
| danny | [Danny Angus](http://blog.killerbees.co.uk) | [James](http://james.apache.org/) , [Jakarta](http://jakarta.apache.org/), [Labs](http://labs.apache.org)|
| dashorst | Martijn Dashorst |
-| davidw | [David N. Welton](http://www.dedasys.com/davidw/) | [tcl](http://tcl.apache.org) ; [libapreq](http://httpd.apache.org/apreq/)|
| davisp | Paul Joseph Davis |
| davor | [Davor Bonaci](http://davorbonaci.com/) | [Beam](https://beam.apache.org/) |
-| dbertoni | David Bertoni |
| dblevins | David Blevins |
| deepal | [Deepal Jayasinghe](http://blogs.deepal.org/) |
| dennisl | Dennis Lundberg |
| dgrove | Dave Grove | [OpenWhisk](https://openwhisk.apache.org)|
+| dims | Davanum Srinivas |
| dirkx | Dirk-Willem van Gulik | [httpd](http://httpd.apache.org/) , [XML](http://xml.apache.org)|
-| djd | Daniel Debrunner |
| djencks | David Jencks |
| djkevincr | Kevin Ratnasekera | [Gora](http://gora.apache.org), [Incubator](http://incubator.apache.org/) |
| dkulp | [J. Daniel Kulp](http://www.dankulp.com/blog) | [CXF](http://cxf.apache.org/) ; [Maven](http://maven.apache.org/) ; [ServiceMix](http://servicemix.apache.org)|
| dlr | Daniel L. Rall | [Turbine](http://java.apache.org/turbine/) ; [Velocity](http://jakarta.apache.org/velocity/) ; Jakarta Commons ; XML-RPC ; Infrastructure|
| dmeikle | David Meikle | [Tika](http://tika.apache.org) |
-| dos | [Daryl C. W. O'Shea](http://daryl.dostech.ca/) | [SpamAssassin](http://spamassassin.apache.org/)|
| dpsenner | Dominik Psenner | [Logging](http://logging.apache.org/) |
-| dreid | David Reid | [httpd](http://httpd.apache.org/) ; [APR](http://apr.apache.org/)|
| drew | Andrew L. (Drew) Farris | [accumulo](http://accumulo.apache.org), [mahout](http://mahout.apache.org)|
| dsmiley | David Smiley | lucene, solr |
| dweiss | Dawid Weiss | [Lucene](http://lucene.apache.org/), [Mahout](http://lucene.apache.org/mahout) , [Solr](http://lucene.apache.org/solr/) |
-| dwoods | [Donald Woods](http://home.apache.org/~dwoods/) |
| ebourg | Emmanuel Bourg |
| echauchot | Etienne Chauchot | [Beam](http://beam.apache.org) |
-| ed | [Ed Korthof](mailto:ed@apache.org) | [httpd](http://httpd.apache.org/) ; [JServ](http://java.apache.org/jserv/)|
-| edwardyoon | [Edward J. Yoon](http://blog.udanax.org/) | [Hama](http://hama.apache.org/) |
| ehatcher | Erik Hatcher | [Ant](http://ant.apache.org/) , jakarta-lucene , jakarta-lucene-sandbox|
-| ekoneil | Eddie O'Neil |
| elecharny | [Emmanuel Lécharny](http://hrabal.blogspot.com/) | [Directory](http://directory.apache.org/) ; [Mina](http://mina.apache.org/)|
| elserj | Josh Elser | [Accumulo](https://accumulo.apache.org), [Calcite](https://calcite.apache.org), [Incubator](https://incubator.apache.org), [Phoenix](https://phoenix.apache.org) |
| eolivelli | Enrico Olivelli | [BookKeeper](https://bookkeeper.apache.org), [ZooKeeper](https://zookeeper.apache.org), [Curator](https://curator.apache.org), [Maven](https://maven.apache.org) |
| enis | Enis Söztutar |
-| erikabele | [Erik Abele](http://www.codefaktor.de/) | [HttpComponents](http://hc.apache.org/) , [httpd](http://httpd.apache.org/) , [httpd-docs](http://httpd.apache.org/docs-project/) , [incubator](http://incubator.apache.org/) , infrastructure|
+| epugh | Eric Pugh |
| evansye | Evans Ye | [Bigtop](https://bigtop.apache.org/), [Ignite](https://ignite.apache.org) |
-| evenisse | Emmanuel Venisse |
+| fanningpj | PJ Fanning | [POI](https://poi.apache.org/), [Drill](https://drill.apache.org/), [Linkis](https://linkis.apache.org/), [Incubator](https://incubator.apache.org/), [Pekko](https://pekko.apache.org) |
| farra | J. Aaron Farr |
-| fchrist | [Fabian Christ](http://home.apache.org/~fchrist/) | [Stanbol](http://stanbol.apache.org/) |
| ffang | Freeman Yue Fang | [Cxf](http://cxf.apache.org/) ; [Servicemix](http://servicemix.apache.org/) ; [Karaf](http://karaf.apache.org/) ; [Camel](http://Camel.apache.org/) ; [Felix](http://felix.apache.org/)|
| fhanik | Filip Hanik |
| fielding | [Roy T. Fielding](http://roy.gbiv.com/) | [httpd](http://httpd.apache.org/) , [APR](http://apr.apache.org/) , board , fund-raising , [incubator](http://incubator.apache.org/)|
-| fitz | [Brian W. Fitzpatrick](http://www.red-bean.com/fitz/) | [APR](http://apr.apache.org/) , [commons](http://commons.apache.org/) , [incubator](http://incubator.apache.org/)|
-| fmeschbe | Felix Meschberger |
-| fmui | Florian Müller |
| fokko | Fokko Driesprong | [Airflow](https://airflow.apache.org/); [Avro](https://avro.apache.org/); [Parquet](https://parquet.apache.org/); [Druid](https://druid.apache.org/) |
| fpapon | François Papon | [Geronimo](https://geronimo.apache.org), [Hop](https://hop.apache.org), [Karaf](https://karaf.apache.org), [Shiro](https://shiro.apache.org), [Unomi](https://unomi.apache.org)|
| fpj | Flavio Junqueira | [ZooKeeper](http://zookeeper.apache.org); [BookKeeper](http://bookkeeper.apache.org); [Incubator](http://incubator.apache.org) |
-| fuankg | Guenter Knauf |
| gareth | Gareth Reakes |
| gates | Alan Gates |
| gawor | [Jarek Gawor](http://home.apache.org/~gawor/) |
-| gbrown | Gregory K. Brown |
| gdaniels | Glen Daniels | [Axis](http://ws.apache.org/axis/) |
| geirm | [Geir Magnusson Jr.](mailto:geirm@apache.org) | [Jakarta](http://jakarta.apache.org/)|
| geoff | [Geoffrey Young](http://www.modperlcookbook.org/) | [mod_perl](http://perl.apache.org/) ; httpd-test ; [httpd](http://httpd.apache.org/)|
@@ -228,119 +187,83 @@
| gerdogdu | [Gurkan Erdogdu](http://gurkanerdogdu.blogspot.com) | [OpenWebBeans](http://openwebbeans.apache.org) |
| gertv | Gert Vanthienen |
| ggregory | Gary Gregory |
-| ghudson | Greg Hudson |
-| giacomo | Giacomo Pati | [Cocoon](http://cocoon.apache.org/)|
| gianugo | [Gianugo Rabellino](http://www.rabellino.it/blog/) | [Cocoon](http://cocoon.apache.org/) ; [Xindice](http://xml.apache.org/xindice/)|
| gk | Georg Kallidis | [Turbine](http://turbine.apache.org/) |
-| gkossakowski | Grzegorz Kossakowski |
| gmcdonald | [Gavin McDonald](http://16degrees.com.au) |
| gnodet | [Guillaume Nodet](http://home.apache.org/~gnodet/) | [ActiveMQ](http://activemq.apache.org/) ; [Geronimo](http://geronimo.apache.org/) ; [Ode](http://ode.apache.org/) ; [ServiceMix](http://servicemix.apache.org/)|
| gozer | [Philippe M. Chiasson](http://gozer.ectoplasm.org/) | [mod_perl](http://perl.apache.org/) , modperl-docs|
| gpetracek | Gerhard Petracek |
-| grahamd | Graham Dumpleton |
-| greddin | Gregory D. Reddin |
-| gregames | Greg Ames | [httpd](http://httpd.apache.org/) , [APR](http://apr.apache.org/)|
-| gregor | [Gregor J. Rothfuss](http://greg.abstrakt.ch) | [Lenya](http://lenya.apache.org/) ; [Cocoon](http://cocoon.apache.org/)|
-| grisha | [Gregory Trubetskoy](http://www.ispol.com/home/grisha/) | [httpd](http://httpd.apache.org/)|
| grobmeier | [Christian Grobmeier](http://www.grobmeier.de) |
| grossws | Konstantin Gribov | [Tika](http://tika.apache.org) |
-| gsingers | [Grant Ingersoll](http://www.grantingersoll.com) | [Lucene](http://lucene.apache.org/) : [Java](http://lucene.apache.org/java/) , [Mahout](http://lucene.apache.org/mahout) , [Solr](http://lucene.apache.org/solr/)|
| gstein | [Greg Stein](http://www.lyra.org/greg/) | [httpd](http://httpd.apache.org/) ; [APR](http://apr.apache.org/) ; [incubator](http://incubator.apache.org/) ; board|
| gtrasuk | [Greg Trasuk](https://www.trasuk.com/blogs/trasukg/) |
| hadrian | Hadrian Zbarcea |
-| hammant | Paul Hammant |
| harbs | Gabe Harbater | [Flex](http://flex.apache.org/) |
| hboutemy | Hervé Boutemy | [Maven](http://maven.apache.org), [ComDev](http://community.apache.org), [Attic](http://attic.apache.org) |
-| hemapani | [Srinath Perera](mailto:hperera@cs.indiana.edu) |
| henning | [Henning P. Schmiedehausen](http://henning.schmiedehausen.org/) |
| hexiaoqiao | [He Xiaoqiao](https://hexiaoqiao.github.io/) | [Hadoop](http://hadoop.apache.org) |
| hgomez | [Henri Gomez](http://blog.hgomez.net) ** |
-| hindessm | Mark Hindess |
| hitesh | Hitesh Shah | [Hadoop](http://hadoop.apache.org) ; [Tez](http://tez.apache.org/) ; [Ambari](http://ambari.apache.org/)|
-| hlship | Howard M. Lewis Ship |
| hogstrom | [Matt Hogstrom](http://blog.hogstrom.org) |
-| horwat | Justyna Horwat | [Jakarta](http://jakarta.apache.org/) , colo-keys|
| hossman | [Chris Hostetter](http://home.apache.org/~hossman/) | [Lucene](http://lucene.apache.org/) : [Java](http://lucene.apache.org/java/) , [Solr](http://lucene.apache.org/solr/)|
| hsaputra | Henry Saputra | [Incubator](http://incubator.apache.org/) ; [Flink](http://flink.apache.org/) ; [Twill](https://twill.apache.org/) |
| hughesj | Jeremy Hughes |
| humbedooh | Daniel Gruno | [httpd](https://httpd.apache.org/), [Traffic Server](https://trafficserver.apache.org), [Kibble](https://kibble.apache.org), [STeVe](https://steve.apache.org), [Pony Mail](https://ponymail.apache.org) |
| huxing | Huxing Zhang | [Tomcat](http://tomcat.apache.org), [Dubbo](http://dubbo.apache.org) |
-| hwright | [Hyrum K. Wright](http://www.hyrumwright.org/) |
| hxd | Xiangdong Huang | [IoTDB](https://iotdb.apache.org) |
| hyunsik | Hyunsik Choi | [Tajo](http://tajo.apache.org) |
| ieb | [Ian Boston](http://www.tfd.co.uk/) | [Sling](http://sling.apache.org/), [Shindig](http://shindig.apache.org)|
| iemejia | [Ismaël Mejía](https://ismaelmejia.com/) | [Beam](https://beam.apache.org/) |
-| igalic | Igor Galić |
| ilgrosso | Francesco Chicchiriccò | [Cocoon](http://cocoon.apache.org/) , [CXF](http://cxf.apache.org/), [Olingo](http://olingo.apache.org/), [OpenJPA](http://openjpa.apache.org/), [Syncope](http://syncope.apache.org/)|
| isabel | Isabel Drost |
| isudana | Isuru Udana | [Synapse](http://synapse.apache.org)
| ivan | Ivan Zhakov | [Subversion](http://subversion.apache.org/) ; [Serf](http://serf.apache.org/) ; [APR](http://apr.apache.org/) |
-| ivaynberg | Igor Vaynberg |
| jacopoc | Jacopo Cappellato | [OFBiz](http://ofbiz.apache.org) |
-| jalkanen | [Janne Jalkanen](http://www.ecyrd.com/ButtUgly/) |
| jan | Jan Lehnardt | CouchDB |
| jani | Jan Iversen | |
-| jawi | [Jan Willem Janssen](http://www.lxtreme.nl) | [ACE](http://ace.apache.org), [Felix](http://felix.apache.org)|
| jbellis | Jonathan Ellis |
| jbonofre | [Jean-Baptiste Onofré](https://nanthrax.blogspot.com) | [ActiveMQ](http://activemq.apache.org), [Archiva](http://archiva.apache.org), [Aries](http://aries.apache.org), [Bahir](http://bahir.apache.org), [Beam](http://beam.apache.org), [Brooklyn](http://brooklyn.apache.org), [BRPC](http://brpc.apache.org), [Camel](http://camel.apache.org), [CarbonData](http://carbondata.apache.org), [EventMesh](http://eventmesh.apache.org), [Felix](http://felix.apache.org), [Geronimo](http://geronimo.apache.org), [Gobblin](http://gobblin.apache.org), [Guacamole](http://guacamole.apache.org), [Incubator](http://incubator.apache.org), [InLong](http://inlong.apache.org), [jClouds](http://jclouds.apache.org), [Karaf](http://karaf.apache.org), [Liminal](http://liminal.apache.org), [Livy](http://livy.apache.org), [Nemo](http://nemo.apache.org), [Seatunnel](http://seatunnel.apache.org), [Sedona](http://sedona.apache.org), [ServiceComb](http://servicecomb.apache.org), [ServiceMix](http://servicemix.apache.org), [Shiro](http://shiro.apache.org), [Streampipes](http://streampipes.apache.org), [Syncope](http://syncope.apache.org), [Tuweni](http://tuweni.apache.org), [Unomi](http://unomi.apache.org), [Wayang](http://wayang.apache.org)|
| jcamacho | Jesús Camacho Rodríguez |
-| jcarman | James W. Carman |
| jcorvel | Johan Corveleyn | [Subversion](http://subversion.apache.org/) |
-| jdcasey | John Casey |
| jeagles | Jonathan Eagles | [Hadoop](http://hadoop.apache.org) ; [Tez](http://tez.apache.org/) |
-| jefft | Jeff Turner |
-| jeremias | [Jeremias Märki](http://www.jeremias-maerki.ch) | [XML Graphics](http://xmlgraphics.apache.org/) ; [FOP](http://xmlgraphics.apache.org/fop/) ; [Jakarta Commons IO](http://jakarta.apache.org/commons/io/)|
-| jeremy | [Jeremy Quinn](http://www.fiveone.org) | [Cocoon](http://cocoon.apache.org/)|
| jerenkrantz | [Justin Erenkrantz](http://www.erenkrantz.com/) | [httpd](http://httpd.apache.org/) , [APR](http://apr.apache.org/) , [commons](http://commons.apache.org/) , prc , infrastructure|
| jerrytan | Jerry Tan (Tanzhongyi) | brpc |
| jesus | Theo Schlossnagle |
| jfarrell | Jake Farrell | [Thrift](http://thrift.apache.org) |
| jfclere | Jean-Frederic Clere |
-| jgallacher | Jim Gallacher |
| jgenender | Jeff Genender |
-| jgray | Jonathan Gray |
| jhm | Jan Materne | [Ant](http://ant.apache.org) |
-| jhunter | Jason Hunter | [Jakarta](http://jakarta.apache.org/) , JCP|
| jhyde | [Julian Hyde](http://home.apache.org/~jhyde/) | [Arrow](http://arrow.apache.org/), [Calcite](http://calcite.apache.org/), [Drill](http://drill.apache.org/), [Kylin](http://kylin.apache.org/)
| jim | [Jim Jagielski](http://www.jaguNET.com/jim.html) | lots|
| jlaskowski | Jacek Laskowski |
| jleroux | Jacques Le Roux | [OFBiz](http://ofbiz.apache.org), [Incubator](http://incubator.apache.org/) |
| jlk | John Kinsella | [CloudStack](https://cloudstack.apache.org) |
| jlowe | Jason Lowe | [Hadoop](http://hadoop.apache.org) , [Tez](http://tez.apache.org/) |
-| jm | [Justin Mason](http://jmason.org/) | [SpamAssassin](http://spamassassin.apache.org/) ; infrastructure|
| jmclean | Justin Mclean | [Flex](http://flex.apache.org/) ; [Incubator](http://incubator.apache.org/)|
-| jmcnally | John McNally | [Jakarta](http://jakarta.apache.org/)|
-| jnioche | Julien Nioche |
| joehni | Jörg Schaible |
| joern | Jörn Kottmann | [UIMA](http://uima.apache.org/) ; [OpenNLP](http://opennlp.apache.org/)|
-| joes | Joe Schaefer | httpd-apreq|
| joewitt | Joe Witt | [NiFi](https://nifi.apache.org/)|
| jogep | [Johannes Geppert](http://www.jgeppert.com) | [Struts](http://struts.apache.org/) |
-| johan | Johan Oskarsson |
| jon | [Jon Scott Stevens](http://www.whichever.com/) | [Ant](http://ant.apache.org/) ; [ECS](http://jakarta.apache.org/ecs/) ; [ORO](http://jakarta.apache.org/oro/) ; [Regexp](http://jakarta.apache.org/regexp/) ; [Tomcat](http://jakarta.apache.org/tomcat/) ; [Velocity](http://jakarta.apache.org/velocity/) ; [James](http://james.apache.org/) ; [Jetspeed](http://jakarta.apache.org/jetspeed/) ; [JServ](http://java.apache.org/jserv/) ; [Jyve](http://java.apache.org/jyve/) ; [Turbine](http://java.apache.org/turbine/)|
| jonesde | David E. Jones |
| jorton | Joe Orton | [APR](http://apr.apache.org/) ; [httpd](http://httpd.apache.org/)|
| jplevyak | John Bradley Plevyak |
| jrthomerson | [Jeremy Thomerson](http://jeremythomerson.com) |
| jsdelfino | [Jean-Sebastien Delfino](http://jsdelfino.blogspot.com/) | [Tuscany](http://tuscany.apache.org/) , [Nuvem](http://incubator.apache.org/nuvem/)|
-| jstrachan | [James Strachan](http://home.apache.org/~jstrachan/) | [Jakarta](http://jakarta.apache.org/)|
-| jukka | [Jukka Zitting](http://jukkaz.wordpress.com/) | [Jackrabbit](http://jackrabbit.apache.org/)|
| julianfoad | Julian Foad |
| julien | [Julien Le Dem](https://twitter.com/J_) | [Parquet](http://parquet.apache.org) , [Arrow](http://arrow.apache.org), [Pig](http://pig.apache.org), [Tez](http://tez.apache.org) |
| juzhiyuan | [Zhiyuan Ju](https://twitter.com/jjzhiyuan) | [APISIX](https://apisix.apache.org) |
-| jvermillard | [Julien Vermillard](http://home.apache.org/~jvermillard) | [MINA](http://mina.apache.org/)|
+| jvanzyl | [Jason van Zyl](http://www.sonatype.com/people/author/jason) |
| jzemerick | Jeff Zemerick |
| kamaci | [Furkan KAMACI](http://home.apache.org/~kamaci) | [Gora](http://gora.apache.org), [Nutch](http://nutch.apache.org), [ManifoldCF](https://manifoldcf.apache.org/)|
| kanchana | Kanchana Pradeepika Welagedara |
| karanjeet | [Karanjeet Singh](http://people.apache.org/phonebook.html?uid=karanjeet) | [Nutch](http://nutch.apache.org), [DRAT](https://drat.apache.org)|
| ke4qqq | [David Nalley](http://ke4qqq.wordpress.com) | [CloudStack](http://cloudstack.apache.org), [jclouds](http://jclouds.apache.org), [Incubator](http://incubator.apache.org), Infrastructure|
| keith | Keith Wannamaker |
-| kellen | Kellen Sunderland |
| kelly | Sean Kelly | [OODT](http://oodt.apache.org/)|
| kenn | Kenneth Knowles | [Beam](https://beam.apache.org), [Incubator](https://incubator.apache.org), [Datasketches (incubating)](https://github.com/apache/incubator-datasketches), [Training (incubating)](https://training.apache.org) |
| kess | [Astrid Malo](mailto:kess@apache.org) | [httpd](http://httpd.apache.org/) ; [httpd-docs](http://httpd.apache.org/docs-project/)|
| kevan | Kevan Miller |
-| kevj | Kevin Jackson |
| kezhenxu94 | [Zhenxu Ke](https://github.com/kezhenxu94) | [SkyWalking](https://skywalking.apache.org) |
| kfogel | Karl Fogel |
| khmarbaise | [Karl Heinz Marbaise](https://github.com/khmarbaise) | [Maven](https://maven.apache.org) [Creadur](https://creadur.apache.org) |
@@ -349,10 +272,8 @@
| kiwiwings | Andreas Beeker | [POI](http://poi.apache.org) |
| kkolinko | Konstantin Kolinko | [Tomcat](http://tomcat.apache.org), [Gump](http://gump.apache.org) |
| kkrugler | Kenneth William Krugler |
-| kmarsden | Katherine Marsden |
| kmenard | Kevin Joseph Menard, Jr. |
| koji | Koji Sekiguchi | [Lucene](https://lucene.apache.org/core/) , [Solr](http://lucene.apache.org/solr/) , [OpenNLP](https://opennlp.apache.org/) |
-| kristwaa | Kristian Waagan | [Derby](http://db.apache.org/derby/)|
| ksobkowiak | Krzysztof Sobkowiak | [ServiceMix](http://servicemix.apache.org/) |
| kwin | Konrad Windszus | [Sling](https://sling.apache.org/) , [Jackrabbit](https://jackrabbit.apache.org/) |
| lars | Lars Eilebrecht | [httpd](http://httpd.apache.org/) , [httpd-docs](http://httpd.apache.org/docs-project/) , [ApacheCon](http://www.apachecon.com/) , fund-raising|
@@ -362,30 +283,21 @@
| leerho | [Lee Rhodes](mailto:leerho@gmail.com) | [DataSketches](https://datasketches.apache.org) |
| lehmi | Andreas Lehmkühler | [PDFBox](http://pdfbox.apache.org/)|
| lektran | Scott Gray | [OFBiz](http://ofbiz.apache.org) |
-| leosimons | [Leo Simons](http://www.leosimons.com/) | excalibur (VP) ; gump (PMC) ; incubator (PMC) ; wiki|
| lewismc | [Lewis John McGibbney](http://home.apache.org/~lewismc) | [Nutch](http://nutch.apache.org), [Gora](http://gora.apache.org), [Any23](http://any23.apache.org), [Tika](http://tika.apache.org), [OODT](http://oodt.apache.org), [Open Climate Workbench](http://climate.apache.org), [Usergrid](http://usergrid.apache.org), [Joshua](http://joshua.apache.org)|
| lgo | Lieven Govaerts |
-| lindner | Paul Lindner |
| lresende | Luciano Resende |
| luc | Luc Maisonobe | [commons](http://commons.apache.org/)|
| luke1410 | [Stefan Hett](http://www.luke1410.de/) | [Subversion](https://subversion.apache.org/) ; [APR](https://apr.apache.org/) |
| lukehan | Luke Han | [Kylin](http://kylin.apache.org)|
-| lvjing | Jing Lv |
| madhawa | Madhawa Gunasekara | [Gora](http://gora.apache.org), [Incubator](http://incubator.apache.org/) |
| mads | [Mads Toftum](http://www.toftum.org/) | [httpd-docs](http://httpd.apache.org/docs-project/)|
-| magicaltrout | Tom Barber | [OODT](http://oodt.apache.org) |
| manoj | [Manoj Kasichainula](http://www.io.com/~manojk/) | [httpd](http://httpd.apache.org/)|
-| manolito | Manfred Geiler | [MyFaces](http://myfaces.apache.org/)|
| marcelk | Marcel Kinard | [Cordova](http://cordova.apache.org/) |
| marcus | Marcus Lange | [OpenOffice](http://openoffice.apache.org) |
-| markrmiller | Mark Robert Miller |
| markt | Mark Thomas |
| marrs | Marcel Offermans | [ACE](http://incubator.apache.org/ace) ; [Felix](http://felix.apache.org/)|
-| martin | Martin Kraemer | [httpd](http://httpd.apache.org/) ; [PHP](http://www.php.net/)|
-| mattmann | [Chris A. Mattmann](http://sunset.usc.edu/~mattmann/) | [Tika](http://lucene.apache.org/tika/) ; [Nutch](http://lucene.apache.org/nutch/) ; [Lucene](http://lucene.apache.org/) ; [OODT](http://incubator.apache.org/projects/oodt.html) ; [SIS](http://incubator.apache.org/projects/sis.html)|
| mattsicker | Matt Sicker | [Logging](https://logging.apache.org/) |
| matzew | [Matthias Wessendorf](http://matthiaswessendorf.wordpress.com/) |
-| maxb | Max Oliver Bowsher |
| mbenson | Matt Benson |
| mbrohl | Michael Brohl | [OFBiz](http://ofbiz.apache.org) |
| mck | Mick Semb Wever | [Cassandra](http://cassandra.apache.org), [SkyWalking](http://skywalking.apache.org), [Incubator](http://incubator.apache.org), [Tiles](http://tiles.apache.org) |
@@ -396,20 +308,15 @@
| mikemccand | Michael McCandless |
| milamber | [Bruno Demion](http://home.apache.org/~milamber/) | [JMeter](http://jmeter.apache.org/) , [CloudStack](http://cloudstack.apache.org/) |
| milinda | [Milinda Pathirage](http://milinda.pathirage.org) | [Axis](http://axis.apache.org) ; [ODE](http://ode.apache.org) ; [Airavata](http://airavata.apache.org) |
-| minchau | Brian James Minchau |
| minfrin | Graham Leggett | httpd apr|
| mjc | [Mark Cox](http://www.awe.com/mark/) | [httpd](http://httpd.apache.org/)|
| mkienenb | Mike Kienenberger | [Cayenne](http://cayenne.apache.org/) ; [MyFaces](http://myfaces.apache.org/)|
-| mmarinschek | Martin Marinschek |
| mnour | Mohammad Nour El-Din |
-| mrdon | Don Brown | [Struts](http://struts.apache.org/) , [Jakarta](http://jakarta.apache.org/)|
| mreutegg | Marcel Reutegger |
| mrglavas | [Michael Glavassevich](http://home.apache.org/~mrglavas/) | [Xerces-J](http://xerces.apache.org/xerces2-j/) , [XML Commons](http://xml.apache.org/commons/)|
-| mriou | [Matthieu Riou](http://offthelip.org) |
| mseidel | Matthias Seidel | [OpenOffice](https://openoffice.apache.org) |
| mturk | Mladen Turk |
| mvdb | [Martin van den Bemt](http://www.mvdb.org/) | [Jakarta](http://jakarta.apache.org/) , [Db DDLUtils](http://db.apache.org/ddlutils) , [Gump](http://gump.apache.org)|
-| mwomack | Mark Dwayne Womack |
| myrle | Myrle Krantz | [Fineract](https://fineract.apache.org) |
| nacx | Ignasi Barrera | [jclouds](http://jclouds.apache.org) |
| nandika | Korale Gamaralalage Nandika Chandrasiri Jayawardana |
@@ -422,10 +329,8 @@
| niallp | Niall Pemberton | [Jakarta](http://jakarta.apache.org/) ; [Struts](http://struts.apache.org/)|
| nick | Nick Burch |
| niclas | Niclas Hedhman |
-| nigel | Nigel Daley |
| ningjiang | Willem Ning Jiang |[activemq](http://activemq.apache.org/);[camel](http://camel.apache.org);[cxf](http://cxf.apache.org); [doris](http://doris.apache.org); [iotdb](http://iotdb.apache.org); [rocketmq](http://rocketmq.apache.org); [servicecomb](http://servicecomb.apache.org); [servicemix](http://servicemix.apache.org); [shardingsphere](http://shardingsphere.apache.org); [skywalking](http://skywalking.apache.org); [weex](http://weex.apache.org); [zipkin](http://zipkin.apache.org)|
| niq | [Nick Kew](http://home.apache.org/~niq/) | [APR](http://apr.apache.org/) ; [httpd](http://httpd.apache.org/)|
-| nlehuen | Nicolas Lehuen |
| noel | Noel J. Bergman | [ApacheCon](http://www.apachecon.com/) , [incubator](http://incubator.apache.org/) , infrastructure , [James](http://james.apache.org/)|
| norman | Norman Maurer |
| nslater | [Naomi Slater](http://home.apache.org/~nslater/) | [CouchDB](http://couchdb.apache.org/), [ComDev](https://community.apache.org/), [Incubator](http://incubator.apache.org/), [CloudStack](http://cloudstack.apache.org/), [Stratos](http://stratos.apache.org/), [MetaModel](https://metamodel.apache.org/)|
@@ -437,93 +342,60 @@
| olegk | Oleg Kalnichevski |
| omalley | [Owen O'Malley](http://home.apache.org/~omalley) |
| orlikowski | Victor J. Orlikowski | [httpd](http://httpd.apache.org/) ; [APR](http://apr.apache.org/) ; BSF|
-| otis | Otis Gospodnetic |
| ovilia | Zhang Wenli | [ECharts](https://echarts.apache.org/) |
| painter | Jeffery Painter | [Turbine](https://turbine.apache.org/) ; [Torque](https://db.apache.org/torque)|
-| pamarcelot | Pierre-Arnaud Marcelot | [Directory](http://directory.apache.org/)|
+| paulk | Paul King | [Groovy](https://groovy.apache.org), [incubator](https://incubator.apache.org/)
| pauls | Karl Pauls |
-| pburba | Paul Burba |
-| pcs | [Paul Sutton](http://www.awe.com/~paul/) | [httpd](http://httpd.apache.org/)|
-| pctony | [Tony Stevenson](http://blog.pc-tony.com/) |
-| pero | Peter Rossbach |
| perrin | Perrin Harkins | [mod_perl](http://perl.apache.org/)|
| pescetti | Andrea Pescetti | [OpenOffice](http://openoffice.apache.org/) |
| pgollucci | [Philip M. Gollucci](http://p6m7g8.com) | [mod_perl](http://perl.apache.org/) , [httpd-apreq](http://httpd.apache.org/apreq) ,httpd-test, apr, infrastructure|
-| philip | Philip Martin |
-| phred | Fred Moyer |
| phunt | Patrick D. Hunt |
| piergiorgio | [Piergiorgio Lucidi](https://www.open4dev.com) | [ManifoldCF](http://manifoldcf.apache.org/) , [ComDev](https://community.apache.org/)|
| pietsch | Joerg Pietschmann |
| pono | [Daniel Pono Takamori](https://multivariatepolynomial.xyz) | [infrastructure](https://infra.apache.org) |
| pottlinger | Philipp Ottlinger | [Creadur](https://creadur.apache.org) |
| pquerna | [Paul Querna](http://paul.querna.org/) |
-| pramirez | Paul Michael Ramirez |
| proyal | [Peter Royal](http://fotap.org/~osi) |
-| psmith | Paul Jeffrey Smith |
| psteitz | Phil Steitz | [Jakarta](http://jakarta.apache.org) ; [Directory](http://directory.apache.org)|
| ptgoetz | P. Taylor Goetz | [Storm](http://storm.apache.org) |
| purplecabbage | Jesse MacFadyen | [Cordova](http://cordova.apache.org) |
-| pzf | Paul Fremantle |
| panjuan | [Trista Pan](https://tristazero.github.io/) | [ShardingSphere](https://shardingsphere.apache.org/) ; [Incubator](http://incubator.apache.org/)|
| quetwo | Nick Kwiatkowski |
| rahul | Rahul Akolkar |
| randgalt | Jordan Zimmerman | [Curator](http://curator.apache.org) |
| raphael | Raphaël Luta |
| rbowen | [Rich Bowen](http://www.rcbowen.com/) | [httpd](http://httpd.apache.org/) , [httpd-docs](http://httpd.apache.org/docs-project/) , [ApacheCon](http://www.apachecon.com/)|
-| rdonkin | Robert Burrell Donkin | [Jakarta](http://jakarta.apache.org/) , [James](http://james.apache.org/) , [Incubator](http://incubator.apache.org/) , Legal , Infrastructure , [Commons](http://commons.apache.org/)|
| rec | Richard Eckart de Castilho | [UIMA](http://uima.apache.org/) |
| reinhard | Reinhard Poetz |
| remm | Remy Maucherat | [Jakarta](http://jakarta.apache.org/)|
| reschke | Julian Reschke |
-| reto | Reto Bachmann-Gmür | [clerezza](http://clerezza.apache.org), [stanbol](http://stanbol.apache.org) |
-| rfeng | [Raymond Feng (aka. Zhaohui Feng)](http://www.enjoyjava.com/) | [Tuscany](http://tuscany.apache.org/), [Wink](http://incubator.apache.org/wink/), [Nuvem](http://incubator.apache.org/nuvem/)|
| rfrovarp | Richard Frovarp |
-| rgardler | [Ross Gardler](http://www.oss-watch.ac.uk/about/staff.xml) | [Cocoon](http://cocoon.apache.org/) , [Forrest](http://forrest.apache.org/)|
| rgielen | [René Gielen](http://twitter.com/rgielen) | [Struts](http://struts.apache.org)|
| rgoers | Ralph Goers | [Cocoon](http://cocoon.apache.org/) , [Commons](http://commons.apache.org/) , [Logging](http://logging.apache.org/) , [Maven](http://maven.apache.org/) , [Portals](http://portals.apache.org/)|
| rhillegas | Rick Hillegas | [Derby](http://db.apache.org/derby/)|
-| rhirsch | Richard Hirsch | [ESME](http://esme.apache.org/), [Incubator](http://incubator.apache.org/)|
| rhuijben | Bert Huijben | [Subversion](http://subversion.apache.org/)|
| richard | Richard Downer | [Brooklyn](http://brooklyn.apache.org) |
| rickhall | Richard Hall |
-| rickmcguire | Rick McGuire | [Geronimo](http://geronimo.apache.org/) ; [OpenEJB](http://openejb.apache.org) ; [Aries](http://aries.apache.org) ; [Mina](http://mina.apache.org)|
-| ridruejo | [Daniel López Ridruejo](mailto:ridruejo@(no-spam)apache.org) | [httpd](http://httpd.apache.org/) ; [tcl](http://tcl.apache.org)|
| rjung | Rainer Jung | [httpd](http://httpd.apache.org/) , [APR](http://apr.apache.org/) , [Tomcat](http://tomcat.apache.org/)|
| rlenferink | Roy Lenferink | [Celix](https://celix.apache.org), [ComDev](https://community.apache.org) |
| rnewson | Robert Newson | [CouchDB](http://couchdb.apache.org) |
| rohini | Rohini Palaniswamy | [Pig](http://pig.apache.org), [Tez](http://tez.apache.org), [Oozie](http://oozie.apache.org) |
| rony | Rony G. Flatscher | [Jakarta](http://jakarta.apache.org/) |
-| rooneg | Garrett Rooney | [APR](http://apr.apache.org/) ; infrastructure|
| rotty3000 | Raymond Augé | [Aries](https://aries.apache.org) ; [Felix](https://felix.apache.org) ; [Geronimo](https://geronimo.apache.org/); [Tomcat](https://tomcat.apache.org/) |
| rpluem | [Rüdiger Plüm](mailto:rpluem@apache.org) |
| rskraba | [Ryan Skraba](https://skraba.com/) | [Avro](http://avro.apache.org/), [Training (incubating)](https://training.apache.org) |
| rubys | [Sam Ruby](http://www.intertwingly.net/blog/) | [Ant](http://ant.apache.org/) ; [Jakarta](http://jakarta.apache.org/) ; [PHP](http://www.php.net/) ; [XML](http://xml.apache.org)|
-| ruchithf | Ruchith Fernando |
-| ruwan | [Ruwan Linton](http://blog.ruwan.org) | [Synapse](http://synapse.apache.org) ; [Axis](http://axis.apache.org/) ; [Web Services](http://ws.apache.org/) ; [Incubator](http://incubator.apache.org)|
| rvesse | Rob Vesse | [Jena](http://jena.apache.org), [Incubator](http://incubator.apache.org) |
| rvs | Roman Shaposhnik | [Bigtop](http://bigtop.apache.org), [Celix](http://celix.apache.org), [ComDev](http://community.apache.org), [Geode](http://geode.apache.org), [Giraph](http://giraph.apache.org), [Groovy](http://groovy.apache.org), [Hadoop](http://hadoop.apache.org), [Ignite](http://ignite.apache.org), [Incubator](http://incubator.apache.org), [Zest](http://zest.apache.org) |
| rxin | [Reynold Xin](http://rxin.org) | [Spark](http://spark.apache.org) |
-| sabob | Bob Schellink |
-| samisa | [Samisa Abeysinghe](http://www.bloglines.com/blog/samisa) | [Axis2/C](http://ws.apache.org/axis2/c) , [Axis C++](http://ws.apache.org/axis/cpp) , [Axis2](http://ws.apache.org/axis2/)|
| sanders | [Scott Sanders](http://dotnot.org/blog/) | [Jakarta](http://jakarta.apache.org/) ; [commons](http://commons.apache.org/) ; [Gump](http://gump.apache.org/) ; colo-keys|
-| sanjiva | Sanjiva Weerawarana | ws ; [XML](http://xml.apache.org) ; [Jakarta](http://jakarta.apache.org/)|
| sarowe | Steve Rowe | [Lucene](http://lucene.apache.org/) : [Java](http://lucene.apache.org/java/) ; [Solr](http://lucene.apache.org/solr/)|
| sascha | [Sascha Schumann](http://www.schumann.cx/) | [PHP](http://www.php.net/) ; [httpd](http://httpd.apache.org/) ; [APR](http://apr.apache.org/)|
-| sbailliez | Stephane Bailliez |
-| sbutler | Stephen O'Neil Butler |
-| schof | Sean Schofield |
| schor | Marshall Schor | [UIMA](http://uima.apache.org/) |
| schultz | Christopher Schultz | [Tomcat](http://tomcat.apache.org/), [Velocity](http://velocity.apache.org/)|
-| scolebourne | Stephen Colebourne |
-| scottcarey | Scott Carey | [Avro](http://avro.apache.org) |
| sctemme | [Sander Temme](http://www.temme.net/sander/) | [httpd](http://httpd.apache.org/) ; [Gump](http://gump.apache.org/) ; [Labs](http://labs.apache.org/) ; Infrastructure|
| sdeboy | Scott Deboy |
| seade | Scott Eade | [DB](http://db.apache.org/) , [Jakarta](http://jakarta.apache.org/) , [Turbine](http://turbine.apache.org/)|
-| sebgoa | [Sebastien Goasguen](http://sebgoa.blogspot.com) | [CloudStack](http://cloudstack.apache.org) , [Libcloud](http://libcloud.apache.org)|
-| sebor | Martin Sebor |
-| seelmann | Stefan Seelmann | [Directory](http://directory.apache.org/)|
-| senaka | [Senaka Fernando](http://senaka.tel/) | [Axis](http://axis.apache.org/) , [Stonehenge](http://incubator.apache.org/projects/stonehenge.html) , [Web Services](http://ws.apache.org/)|
-| serge | [Serge Knystautas](mailto:sergek@lokitech.com) | [James](http://james.apache.org/) ; [commons](http://commons.apache.org/) ; infrastructure|
| sgala | [Santiago Gala](http://memojo.com/memojowiki/Wiki.jsp?page=SantiagoGala) | [Jakarta](http://jakarta.apache.org/) , ws-wsrp4j|
| sgoeschl | Siegfried Goeschl |
| shankar | Selvaratnam Uthaiyashankar | [Axis](http://axis.apache.org/) ; [Stonehenge](http://incubator.apache.org/projects/stonehenge.html) ; [Web Services](http://ws.apache.org/)|
@@ -537,66 +409,48 @@
| simonw | Simon Willnauer |
| sk | Sally Khudairi |
| slaws | Simon Laws |
-| slive | [Joshua Slive](http://slive.ca/) | [httpd-docs](http://httpd.apache.org/docs-project/) ; [httpd](http://httpd.apache.org/) ; infrastructure|
| smarru | [Suresh Marru](http://home.apache.org/~smarru/) | [Airavata](http://incubator.apache.org/airavata/) ; [Rave](http://rave.apache.org/) ; [Incubator](http://incubator.apache.org/)|
| smarthi | Suneel Marthi | [Mahout](http://mahout.apache.org) |
| smckinney | Shawn McKinney | [Fortress](https://directory.apache.org/fortress/) |
| snoopdave | Dave Johnson |
| solomax | Maxim Solodovnik | [OpenMeetings](http://openmeetings.apache.org/), [Flex](http://flex.apache.org/)|
| sorber | Phil Sorber | [Traffic Server](http://trafficserver.apache.org) |
-| spepping | [Simon Pepping](http://www.leverkruid.eu/) | [XML Graphics](http://xmlgraphics.apache.org/) ; [FOP](http://xmlgraphics.apache.org/fop/)|
| sriksun | Srikanth Sundarrajan | [falcon](http://falcon.apache.org), [lens] (http://lens.apache.org)
| srowen | Sean Owen | [Spark](http://spark.apache.org/), [Mahout](http://mahout.apache.org/) |
| sseifert | Stefan Seifert | [Sling](http://sling.apache.org/), [Felix](http://felix.apache.org/) |
| stack | Michael Stack |
| stain | [Stian Soiland-Reyes](http://orcid.org/0000-0001-9842-9718) | [Taverna](https://taverna.incubator.apache.org/) ; [Commons](https://commons.apache.org/) ; [Incubator](https://incubator.apache.org/) |
-| stefan | Stefan Guggisberg | [Jackrabbit](http://jackrabbit.apache.org/)|
| stevehay | [Steve Hay](http://home.apache.org/~stevehay) | [mod_perl](http://perl.apache.org/) , [httpd-apreq](http://httpd.apache.org/apreq)|
| stevel | Steve Loughran | [Ant](http://ant.apache.org/) ; [Axis](http://ws.apache.org/axis/)|
-| steven | Steven Gill | [Cordova](http://cordova.apache.org) |
| stevenn | Steven Noels | [Cocoon](http://cocoon.apache.org/) ; [Forrest](http://xml.apache.org/forrest/)|
-| stoddard | Bill Stoddard | [APR](http://apr.apache.org/) ; [httpd](http://httpd.apache.org/) ; bsf|
| striker | Sander Striker | [APR](http://apr.apache.org/) ; [commons](http://commons.apache.org/) ; [httpd](http://httpd.apache.org/) ; [incubator](http://incubator.apache.org/) ; infrastructure|
| struberg | Mark Struberg |
| supun | Supun Kamburugamuva |
-| susie | Susan Wu |
-| sussman | Ben Collins-Sussman |
| svogel | Sven Vogel | [CloudStack](http://cloudstack.apache.org) |
| sylvain | [Sylvain Wallez](http://home.apache.org/~sylvain) | [Cocoon](http://cocoon.apache.org/) ; [Avalon](http://avalon.apache.org/)|
| szetszwo | [Tsz-Wo Nicholas Sze](http://home.apache.org/~szetszwo) | [Ratis](http://ratis.apache.org/) ; [Ozone](http://ozone.apache.org/) ; [Hadoop](http://hadoop.apache.org/)|
| taher | Taher Alkhateeb | [OFBiz](http://ofbiz.apache.org/) |
| talat | Talat Uyarer | [Nutch](https://nutch.apache.org/) ; [Gora](https://gora.apache.org/) |
| tallison | Tim Allison | [PDFBox](http://pdfbox.apache.org/) ; [POI](http://poi.apache.org/) ; [Tika](http://tika.apache.org/) |
-| tandraschko | Thomas Andraschko | [DeltaSpike](https://deltaspike.apache.org/), [MyFaces](https://myfaces.apache.org/), [OpenWebBeans](https://openwebbeans.apache.org/), [TomEE](https://tomee.apache.org/), [BVal](https://bval.apache.org/)|
-| taylor | [David Sean Taylor](http://home.apache.org/~taylor/) | [Portals](http://portals.apache.org/)|
| tcurdt | [Torsten Curdt](https://torstencurdt.com) | [Cocoon](https://cocoon.apache.org/), [Commons](https://commons.apache.org/), [Jakarta](https://jakarta.apache.org/)|
| tdunning | Ted Dunning |
| tellison | Tim Ellison |
-| tfischer | Thomas Fischer |
| tgraves | Thomas Graves |
| thiagohp | [Thiago H. de Paula Figueiredo](http://machina.com.br) | [Tapestry](http://tapestry.apache.org) |
| thilina | [Thilina Gunarathne](http://home.apache.org/~thilina/) | [Airavata](http://airavata.apache.org/) ; [Axis](http://axis.apache.org/) ; [WS](http://ws.apache.org/)|
-| thommay | Thom May | [httpd](http://httpd.apache.org/) ; [APR](http://apr.apache.org/) ; Infrastructure|
| thorsten | Thorsten Scherler |
| tilmannz | Tilmann Zäschke |
| tison | [Zili Chen](http://github.com/tisonkun) | [Flink](https://flink.apache.org/), [Curator](https://curator.apache.org/) |
| todd | Todd Lipcon |
| tomaz | Tomaz Muraus | [Libcloud](https://libcloud.apache.org) |
| tomc | Tom Chiverton | [Flex](http://flex.apache.org) , [CouchDB](http://couchdb.apache.org) |
-| tomdz | Thomas Dudziak |
| tomj | [Tom Jordahl](http://tjordahl.blogspot.com/) | [Axis](http://ws.apache.org/axis)|
| tommaso | Tommaso Teofili |
-| tomwhite | [Tom White](http://lexemetech.com/) | [Hadoop](http://hadoop.apache.org)|
-| tonywu | Yue Hao Wu |
| tpalsulich | Tyler Palsulich |
| trawick | Jeff Trawick | [httpd](http://httpd.apache.org/) ; [APR](http://apr.apache.org/)|
| tripod | Tobias Bocanegra | [Jackrabbit](http://jackrabbit.apache.org/)|
-| trustin | [Trustin Lee](http://gleamynode.net/) |
-| tucu | Alejandro Abdelnur |
| tv | Thomas Vandahl | [Turbine](http://turbine.apache.org/) ; [DB-Torque](http://db.apache.org/torque/) ; [Jakarta](http://jakarta.apache.org/) ; [Excalibur](http://excalibur.apache.org/)|
| twilliams | [Tim Williams](http://williamstw.blogspot.com) |
-| twl | [Theodore W. Leung](http://www.sauria.com/~twl) | [XML](http://xml.apache.org) ; ws ; [incubator](http://incubator.apache.org/)|
-| ugo | [Ugo Cei](http://agylen.com/) | [Cocoon](http://cocoon.apache.org/) , [POI](http://poi.apache.org/)|
| uli | Ulrich Stärk |
| umamahesh | [Uma Maheswara Rao G](https://home.apache.org/~umamahesh/umamahesh.html) | [Hadoop](http://hadoop.apache.org); [BookKeeper](http://bookkeeper.apache.org) |
| upayavira | [Upayavira](http://www.odoko.com) | [Lucene](http://lucene.apache.org) ; [Cocoon](http://cocoon.apache.org/) ; infrastructure|
@@ -606,27 +460,21 @@
| venkatesh | Venkatesh Seetharam |
| vgritsenko | [Vadim Gritsenko](http://home.apache.org/~vgritsenko/) | [Cocoon](http://cocoon.apache.org/) , [Regexp](http://jakarta.apache.org/regexp/) , [Xindice](http://xml.apache.org/xindice/)|
| vinodkv | [Vinod Kumar Vavilapalli](http://home.apache.org/~vinodkv) | [Hadoop](http://hadoop.apache.org) ; [Ambari](http://incubator.apache.org/ambari/); [TEZ](http://incubator.apache.org/projects/tez.html)|
-| vsiveton | Vincent Siveton | [Maven](http://maven.apache.org) ; [Shindig](http://shindig.apache.org)|
+| vy | Volkan Yazıcı | [Logging](http://logging.apache.org/) |
| wave | Dave Fisher | [POI](https://poi.apache.org/), [Incubator](https://incubator.apache.org/), [OpenOffice](https://openoffice.apache.org/), [Petri](https://petri.apache.org/), and others |
| weber | Volker Weber | [MyFaces](http://myfaces.apache.org/)|
| weimer | [Markus Weimer](http://www.markusweimer.com) | [REEF](https://reef.apache.org/) |
| wenming | [Ming Wen](mailto:wenming@apache.org) | [APISIX](https://apisix.apache.org) |
| wwei | [Weiwei Yang](https://yangwwei.github.io) | [Hadoop](https://hadoop.apache.org), [Ozone](https://ozone.apache.org), [YuniKorn](https://yunikorn.apache.org) |
-| wglass | William Glass-Husain |
-| wohali | [Joan Touzet](mailto:wohali@apache.org) | [CouchDB](http://couchdb.apache.org) |
-| woollard | David Matthew Woollard |
| woonsan | [Woonsan Ko](http://woonsanko.blogspot.com/) | [Portals](https://portals.apache.org/) , [Commons](https://commons.apache.org/) , [FreeMarker](https://freemarker.apache.org/)|
| wrowe | William A. Rowe, Jr. | [httpd](http://httpd.apache.org/) ; [APR](http://apr.apache.org/) ; [httpd-docs](http://httpd.apache.org/docs-project/)|
| wsanchez | [Wilfredo Sánchez](http://www.mit.edu/people/wsanchez/) | [httpd](http://httpd.apache.org/) ; [APR](http://apr.apache.org/)|
| wsmoak | [Wendy Smoak](http://www.wendysmoak.com) | [Struts](http://struts.apache.org/) ; [MyFaces](http://myfaces.apache.org/) ; [Shale](http://shale.apache.org/)|
-| xli | Xiao-Feng Li |
| xuefu | Xuefu Zhang | [Hive](http://hive.apache.org) ; [Pig](http://pig.apache.org) |
| yegor | Yegor Kozlov |
| ylavic | Yann Ylavic | [httpd](http://httpd.apache.org/) ; [APR](http://apr.apache.org/)|
| yonik | Yonik Seeley | [Lucene](http://lucene.apache.org/) : [Java](http://lucene.apache.org/java/) ; [Solr](http://lucene.apache.org/solr/)|
-| yoshiki | Yoshiki Hayashi | [httpd-docs](http://httpd.apache.org/docs-project/)|
| zabetak | [Stamatis Zampetakis](https://people.apache.org/~zabetak/) | [Calcite](https://calcite.apache.org/), [Hive](https://hive.apache.org/)|
-| zoe | Zoe Slattery |
| zwoop | [Leif Hedstrom](http://www.ogre.com) | [trafficserver](http://trafficserver.apache.org/), [trafficcontrol](http://trafficcontrol.apache.org/), [incubator](http://incubator.apache.org/) |
@@ -637,81 +485,237 @@
| ? | Andrew Wilson |
| ? | Rob Hartill |
| ? | Shane Caraveo |
+| acmurthy | Arun Murthy |
| acoliver | Andrew C. Oliver |
+| agrieve | Andrew Grieve |
+| ajack | Adam Jack |
+| ajith | Ajith H Ranabahu |
| akosut | Alexei Kosut |
| amilas | Amila Suriarachchi |
| andi | Andi Gutmans |
| andreas | Andreas Hartmann |
| andrei | [Andrei Zmievski](mailto:andrei@php.net) | [PHP](http://www.php.net/)|
| andyc | Andy Clark |
-| arved | Arved Henn Sandstrom |
+| antoine | Antoine Levy-Lambert |
+| arje | [Arjé Cahn](http://www.bloomreach.com) | [Cocoon](http://cocoon.| arved | Arved Henn Sandstrom |
+| asanso | Antonio Sanso |
+| asavory | [Andrew Savory](http://www.andrewsavory.com/blog/) |
| ask | [Ask Bjørn Hansen](http://www.askbjoernhansen.com/) |
| assaf | Assaf Arkin |
| balld | Donald Ball |
| bdube | Brian M. Dubé |
+| berndf | [Bernd Fondermann](http://brainlounge.de) |
| bhyde | Ben Hyde |
+| billbarker | William Barker |
| bimargulies | Benson Margulies |
| bloritsch | Berin Loritsch |
+| boisvert | Alex Boisvert |
| bojan | [Bojan Smojver](http://home.apache.org/~bojan/) |
| brianp | Brian Pane |
+| britter | Benedikt Ritter | [Commons](http://commons.apache.org) |
+| bruno | Bruno Dumon |
+| bryanduxbury | Bryan Duxbury |
+| carlosrovira | [Carlos Rovira](https://www.carlosrovira.com) | [Royale](https://royale.apache.org) ; [Flex](https://flex.apache.org) |
+| carnold | Curt Arnold |
+| cbegin | Clinton Begin |
+| cctrieloff | Carl Trieloff |
+| ccustine | [Chris Custine](http://blog.organicelement.com/) | [ServiceMix](http://servicemix.apache.org/) , [Karaf](http://karaf.apache.org/) , [Felix](http://felix.apache.org/) , [Directory Server](http://directory.apache.org/)|
+| ceki | Ceki Gülcü | [Jakarta](http://jakarta.apache.org/) , log4j|
+| chinthaka | [Eran Chinthaka](http://home.apache.org/~chinthaka/) | [Axis2](http://ws.apache.org/axis2/) , [Axiom](http://ws.apache.org/commons/axiom/) , [Neethi](http://ws.apache.org/commons/policy/)|
+| chirino | Hiram Chirino |
| cholet | Eric Cholet |
| chuck | Chuck Murcko |
+| cliff | Cliff Skolnick | [httpd](http://httpd.apache.org/)|
+| cliffs | Cliff Schmidt |
+| cmueller | Christian Müller | [Camel](http://camel.apache.org) |
+| costin | Doru Costin Manolache |
+| crichton | Dan Crichton |
+| damien | Damien F. Katz |
+| damitha | Damitha N.M. Kumarage |
| damonc | Damon J. Courtney |
+| danielf | Daniel Fagerstrom |
+| davidw | [David N. Welton](http://www.dedasys.com/davidw/) | [tcl](http://tcl.apache.org) ; [libapreq](http://httpd.apache.org/apreq/)|
+| dbertoni | David Bertoni |
| dch | [Dave Cottlehuber](mailto:dch@apache.org) | [CouchDB](http://couchdb.apache.org) |
| dgaudet | [Dean Gaudet](http://arctic.org/~dean/) |
-| dims | Davanum Srinivas |
+| djd | Daniel Debrunner |
+| dos | [Daryl C. W. O'Shea](http://daryl.dostech.ca/) | [SpamAssassin](http://spamassassin.apache.org/)|
| dougm | Doug MacEachern |
+| dreid | David Reid | [httpd](http://httpd.apache.org/) ; [APR](http://apr.apache.org/)|
| drtr | David Robinson |
| duncan | James Duncan Davidson |
-| epugh | Eric Pugh |
+| dwoods | [Donald Woods](http://home.apache.org/~dwoods/) |
+| ed | [Ed Korthof](mailto:ed@apache.org) | [httpd](http://httpd.apache.org/) ; [JServ](http://java.apache.org/jserv/)|
+| edwardyoon | [Edward J. Yoon](http://blog.udanax.org/) | [Hama](http://hama.apache.org/) |
+| ekoneil | Eddie O'Neil |
+| erikabele | [Erik Abele](http://www.codefaktor.de/) | [HttpComponents](http://hc.apache.org/) , [httpd](http://httpd.apache.org/) , [httpd-docs](http://httpd.apache.org/docs-project/) , [incubator](http://incubator.apache.org/) , infrastructure|
+| evenisse | Emmanuel Venisse |
| fanf | [Tony Finch](http://dotat.at/) |
+| fchrist | [Fabian Christ](http://home.apache.org/~fchrist/) | [Stanbol](http://stanbol.apache.org/) |
| fede | Federico Barbieri |
| felicity | Theo Van Dinter |
+| fitz | [Brian W. Fitzpatrick](http://www.red-bean.com/fitz/) | [APR](http://apr.apache.org/) , [commons](http://commons.apache.org/) , [incubator](http://incubator.apache.org/)|
+| fmeschbe | Felix Meschberger |
+| fmui | Florian Müller |
| francisdb | Francis De Brabandere | [Empire-db](http://empire-db.apache.org/) |
+| fuankg | Guenter Knauf |
+| gbrown | Gregory K. Brown |
+| ghudson | Greg Hudson |
+| giacomo | Giacomo Pati | [Cocoon](http://cocoon.apache.org/)|
+| gkossakowski | Grzegorz Kossakowski |
| glasser | David Samuel Glasser |
| glenn | Glenn L. Nielsen |
| glens | [Glen Stampoultzis](http://www.jroller.com/page/gstamp/) |
+| grahamd | Graham Dumpleton |
+| gregames | Greg Ames | [httpd](http://httpd.apache.org/) , [APR](http://apr.apache.org/)|
+| gregor | [Gregor J. Rothfuss](http://greg.abstrakt.ch) | [Lenya](http://lenya.apache.org/) ; [Cocoon](http://cocoon.apache.org/)|
+| grisha | [Gregory Trubetskoy](http://www.ispol.com/home/grisha/) | [httpd](http://httpd.apache.org/)|
+| gsingers | [Grant Ingersoll](http://www.grantingersoll.com) | [Lucene](http://lucene.apache.org/) : [Java](http://lucene.apache.org/java/) , [Mahout](http://lucene.apache.org/mahout) , [Solr](http://lucene.apache.org/solr/)|
+| hammant | Paul Hammant |
+| hemapani | [Srinath Perera](mailto:hperera@cs.indiana.edu) |
+| hindessm | Mark Hindess |
+| hlship | Howard M. Lewis Ship |
+| horwat | Justyna Horwat | [Jakarta](http://jakarta.apache.org/) , colo-keys|
| husted | Ted Husted |
+| hwright | [Hyrum K. Wright](http://www.hyrumwright.org/) |
| ianh | [Ian Holsman](http://home.apache.org/~ianh/) | [httpd](http://httpd.apache.org/) , [APR](http://apr.apache.org/)|
+| igalic | Igor Galić |
+| ivaynberg | Igor Vaynberg |
+| jalkanen | [Janne Jalkanen](http://www.ecyrd.com/ButtUgly/) |
+| jawi | [Jan Willem Janssen](http://www.lxtreme.nl) | [ACE](http://ace.apache.org), [Felix](http://felix.apache.org)|
+| jcarman | James W. Carman |
+| jdcasey | John Casey |
+| jefft | Jeff Turner |
+| jeremias | [Jeremias Märki](http://www.jeremias-maerki.ch) | [XML Graphics](http://xmlgraphics.apache.org/) ; [FOP](http://xmlgraphics.apache.org/fop/) ; [Jakarta Commons IO](http://jakarta.apache.org/commons/io/)|
+| jeremy | [Jeremy Quinn](http://www.fiveone.org) | [Cocoon](http://cocoon.apache.org/)|
+| jgallacher | Jim Gallacher |
+| jgray | Jonathan Gray |
+| jhunter | Jason Hunter | [Jakarta](http://jakarta.apache.org/) , JCP|
| jimw | [Jim Winstead](http://trainedmonkey.com/) |
+| jm | [Justin Mason](http://jmason.org/) | [SpamAssassin](http://spamassassin.apache.org/) ; infrastructure|
+| jmcnally | John McNally | [Jakarta](http://jakarta.apache.org/)|
+| jnioche | Julien Nioche |
+| joes | Joe Schaefer | httpd-apreq|
+| johan | Johan Oskarsson |
+| jstrachan | [James Strachan](http://home.apache.org/~jstrachan/) | [Jakarta](http://jakarta.apache.org/)|
| jta | Jean T. Anderson | [Derby](http://db.apache.org/derby/)|
| juergen | Juergen Pill |
-| jvanzyl | [Jason van Zyl](http://www.sonatype.com/people/author/jason) |
+| jukka | [Jukka Zitting](http://jukkaz.wordpress.com/) | [Jackrabbit](http://jackrabbit.apache.org/)|
+| jvermillard | [Julien Vermillard](http://home.apache.org/~jvermillard) | [MINA](http://mina.apache.org/)|
| jwoolley | [Cliff Woolley](http://www.cs.virginia.edu/~jcw5q/) |
| kawai | Hiroaki Kawai |
| keiron | Keiron Liddle |
+| kellen | Kellen Sunderland |
+| kevj | Kevin Jackson |
+| kmarsden | Katherine Marsden |
+| kristwaa | Kristian Waagan | [Derby](http://db.apache.org/derby/)|
+| leosimons | [Leo Simons](http://www.leosimons.com/) | excalibur (VP) ; gump (PMC) ; incubator (PMC) ; wiki|
+| lindner | Paul Lindner |
| lrosen | Lawrence Rosen |
+| lvjing | Jing Lv |
+| magicaltrout | Tom Barber | [OODT](http://oodt.apache.org) |
+| manolito | Manfred Geiler | [MyFaces](http://myfaces.apache.org/)|
| marc | Marc Slemko |
+| markrmiller | Mark Robert Miller |
+| martin | Martin Kraemer | [httpd](http://httpd.apache.org/) ; [PHP](http://www.php.net/)|
| martinc | Martin Cooper |
| marvin | Marvin Humphrey | [Lucy](http://incubator.apache.org/lucy/), [Incubator](http://incubator.apache.org/)|
+| mattmann | [Chris A. Mattmann](http://sunset.usc.edu/~mattmann/) | [Tika](http://lucene.apache.org/tika/) ; [Nutch](http://lucene.apache.org/nutch/) ; [Lucene](http://lucene.apache.org/) ; [OODT](http://incubator.apache.org/projects/oodt.html) ; [SIS](http://incubator.apache.org/projects/sis.html)|
+| maxb | Max Oliver Bowsher |
+| minchau | Brian James Minchau |
+| mmarinschek | Martin Marinschek |
| morgand | [Morgan Delagrange](http://home.apache.org/~morgand/) |
+| mrdon | Don Brown | [Struts](http://struts.apache.org/) , [Jakarta](http://jakarta.apache.org/)|
+| mriou | [Matthieu Riou](http://offthelip.org) |
+| mwomack | Mark Dwayne Womack |
| nicolaken | Nicola Ken Barozzi |
+| nigel | Nigel Daley |
+| nlehuen | Nicolas Lehuen |
| orcmid | [Dennis E. Hamilton](http://nfoWorks.org) | [OpenOffice](http://openoffice.apache.org/) |
+| otis | Otis Gospodnetic |
+| pamarcelot | Pierre-Arnaud Marcelot | [Directory](http://directory.apache.org/)|
+| pburba | Paul Burba |
+| pcs | [Paul Sutton](http://www.awe.com/~paul/) | [httpd](http://httpd.apache.org/)|
+| pctony | [Tony Stevenson](http://blog.pc-tony.com/) |
+| pero | Peter Rossbach |
| peters | Peter Samuelson |
+| philip | Philip Martin |
+| phred | Fred Moyer |
| pier | [Pier Paolo Fumagalli](http://home.apache.org/~pier/) |
+| pramirez | Paul Michael Ramirez |
+| psmith | Paul Jeffrey Smith |
+| pzf | Paul Fremantle |
| quinlan | [Daniel Quinlan](http://www.pathname.com/~quinlan/) |
| randy | Randy Terbush |
| rasmus | [Rasmus Lerdorf](http://lerdorf.com) | [PHP](http://www.php.net/) ; [httpd](http://httpd.apache.org/)|
| rbb | [Ryan Bloom](http://www.rkbloom.net/) |
+| rdonkin | Robert Burrell Donkin | [Jakarta](http://jakarta.apache.org/) , [James](http://james.apache.org/) , [Incubator](http://incubator.apache.org/) , Legal , Infrastructure , [Commons](http://commons.apache.org/)|
+| reto | Reto Bachmann-Gmür | [clerezza](http://clerezza.apache.org), [stanbol](http://stanbol.apache.org) |
+| rfeng | [Raymond Feng (aka. Zhaohui Feng)](http://www.enjoyjava.com/) | [Tuscany](http://tuscany.apache.org/), [Wink](http://incubator.apache.org/wink/), [Nuvem](http://incubator.apache.org/nuvem/)|
+| rgardler | [Ross Gardler](http://www.oss-watch.ac.uk/about/staff.xml) | [Cocoon](http://cocoon.apache.org/) , [Forrest](http://forrest.apache.org/)|
+| rhirsch | Richard Hirsch | [ESME](http://esme.apache.org/), [Incubator](http://incubator.apache.org/)|
| richter | Georg Richter |
+| rickmcguire | Rick McGuire | [Geronimo](http://geronimo.apache.org/) ; [OpenEJB](http://openejb.apache.org) ; [Aries](http://aries.apache.org) ; [Mina](http://mina.apache.org)|
+| ridruejo | [Daniel López Ridruejo](mailto:ridruejo@(no-spam)apache.org) | [httpd](http://httpd.apache.org/) ; [tcl](http://tcl.apache.org)|
| rolandw | Roland Weber |
+| rooneg | Garrett Rooney | [APR](http://apr.apache.org/) ; infrastructure|
| rse | [Ralf S. Engelschall](http://www.engelschall.com/) |
+| ruchithf | Ruchith Fernando |
+| ruwan | [Ruwan Linton](http://blog.ruwan.org) | [Synapse](http://synapse.apache.org) ; [Axis](http://axis.apache.org/) ; [Web Services](http://ws.apache.org/) ; [Incubator](http://incubator.apache.org)|
| rwaldhoff | Rodney Waldhoff |
+| sabob | Bob Schellink |
| sameer | Sameer Parekh |
+| samisa | [Samisa Abeysinghe](http://www.bloglines.com/blog/samisa) | [Axis2/C](http://ws.apache.org/axis2/c) , [Axis C++](http://ws.apache.org/axis/cpp) , [Axis2](http://ws.apache.org/axis2/)|
+| sanjiva | Sanjiva Weerawarana | ws ; [XML](http://xml.apache.org) ; [Jakarta](http://jakarta.apache.org/)|
+| sbailliez | Stephane Bailliez |
| sboag | Scott Boag |
+| sbutler | Stephen O'Neil Butler |
+| schof | Sean Schofield |
+| scolebourne | Stephen Colebourne |
+| scottcarey | Scott Carey | [Avro](http://avro.apache.org) |
+| sebgoa | [Sebastien Goasguen](http://sebgoa.blogspot.com) | [CloudStack](http://cloudstack.apache.org) , [Libcloud](http://libcloud.apache.org)|
+| sebor | Martin Sebor |
+| seelmann | Stefan Seelmann | [Directory](http://directory.apache.org/)|
+| senaka | [Senaka Fernando](http://senaka.tel/) | [Axis](http://axis.apache.org/) , [Stonehenge](http://incubator.apache.org/projects/stonehenge.html) , [Web Services](http://ws.apache.org/)|
+| serge | [Serge Knystautas](mailto:sergek@lokitech.com) | [James](http://james.apache.org/) ; [commons](http://commons.apache.org/) ; infrastructure|
| skitching | Simon Kitching |
+| slive | [Joshua Slive](http://slive.ca/) | [httpd-docs](http://httpd.apache.org/docs-project/) ; [httpd](http://httpd.apache.org/) ; infrastructure|
+| spepping | [Simon Pepping](http://www.leverkruid.eu/) | [XML Graphics](http://xmlgraphics.apache.org/) ; [FOP](http://xmlgraphics.apache.org/fop/)|
| ssb | Stig Bakken |
| stas | [Stas Bekman](http://stason.org/) |
+| stefan | Stefan Guggisberg | [Jackrabbit](http://jackrabbit.apache.org/)|
| stefano | [Stefano Mazzocchi](http://home.apache.org/~stefano/) |
| sterling | Sterling Hughes |
+| steven | Steven Gill | [Cordova](http://cordova.apache.org) |
+| stoddard | Bill Stoddard | [APR](http://apr.apache.org/) ; [httpd](http://httpd.apache.org/) ; bsf|
| stsp | Stefan Sperling |
+| susie | Susan Wu |
+| sussman | Ben Collins-Sussman |
+| tandraschko | Thomas Andraschko | [DeltaSpike](https://deltaspike.apache.org/), [MyFaces](https://myfaces.apache.org/), [OpenWebBeans](https://openwebbeans.apache.org/), [TomEE](https://tomee.apache.org/), [BVal](https://bval.apache.org/)|
+| taylor | [David Sean Taylor](http://home.apache.org/~taylor/) | [Portals](http://portals.apache.org/)|
+| tfischer | Thomas Fischer |
| thies | Thies C. Arntzen |
+| thommay | Thom May | [httpd](http://httpd.apache.org/) ; [APR](http://apr.apache.org/) ; Infrastructure|
| tn | Thomas Neidhart |
+| tomdz | Thomas Dudziak |
+| tomwhite | [Tom White](http://lexemetech.com/) | [Hadoop](http://hadoop.apache.org)|
+| tonywu | Yue Hao Wu |
+| trustin | [Trustin Lee](http://gleamynode.net/) |
+| tucu | Alejandro Abdelnur |
+| twl | [Theodore W. Leung](http://www.sauria.com/~twl) | [XML](http://xml.apache.org) ; ws ; [incubator](http://incubator.apache.org/)|
+| ugo | [Ugo Cei](http://agylen.com/) | [Cocoon](http://cocoon.apache.org/) , [POI](http://poi.apache.org/)|
| uncled | David Nuescheler |
| vhardy | Vincent Hardy |
| vmassol | Vincent Massol |
+| vsiveton | Vincent Siveton | [Maven](http://maven.apache.org) ; [Shindig](http://shindig.apache.org)|
+| wglass | William Glass-Husain |
+| wohali | [Joan Touzet](mailto:wohali@apache.org) | [CouchDB](http://couchdb.apache.org) |
+| woollard | David Matthew Woollard |
+| xli | Xiao-Feng Li |
| yoavs | [Yoav Shapira](http://www.yoavshapira.com) | [Jakarta](http://jakarta.apache.org) ; [Logging](http://logging.apache.org) ; [Tomcat](http://tomcat.apache.org)|
+| yoshiki | Yoshiki Hayashi | [httpd-docs](http://httpd.apache.org/docs-project/)|
| zeev | Zeev Suraski |
+| zoe | Zoe Slattery |
## Deceased Members of The Apache Software Foundation
@@ -721,6 +725,8 @@
- **Randy Kobes**
+- **Gregory D. Reddin**
+
- **[Martin Pöschl](/memorials/martin_poeschl.html)**
- **[Henk P. Penning](/memorials/henk_penning.html)**
diff --git a/content/foundation/thanks_old.md b/content/foundation/thanks_old.md
deleted file mode 100644
index 24a2163..0000000
--- a/content/foundation/thanks_old.md
+++ /dev/null
@@ -1,158 +0,0 @@
-Title: Thanks
-
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-# {{title}}
-
-The Apache Software Foundation could not exist without the continued
-generous support from the community. We would like to take this opportunity
-to thank our Sponsors. If you are interested in sponsoring the ASF, please
-read our [sponsorship page](/foundation/sponsorship.html).
-
-
-<link rel="stylesheet" href="thanks.css">
- <h1 style="text-align: center;">Platinum sponsors:</h1>
- <div class="sponsors">
- <ul id='platinum'>
- <li><a target="_blank" href="http://oath.com"><img src="images/oath_logo.jpg"/></a><p style="text-align: center; font-weight: bold;">Oath</p></li>
- <li><a target="_blank" href="http://microsoft.com"><img src="images/microsoft.png"/></a><p style="text-align: center; font-weight: bold;">Microsoft</p></li>
- <li><a target="_blank" href="http://google.com"><img src="images/google.png"/></a><p style="text-align: center; font-weight: bold;">Google</p></li>
- <li><a target="_blank" href="http://facebook.com"><img src="images/facebook.png"/></a><p style="text-align: center; font-weight: bold;">Facebook</p></li>
- <li><a target="_blank" href="http://cloudera.com"><img src="images/cloudera.png"/></a><p style="text-align: center; font-weight: bold;">Cloudera</p></li>
- <li><a target="_blank" href="https://www.leaseweb.com/"><img src="images/leaseweb-platinum.png"/></a><p style="text-align: center; font-weight: bold;">LeaseWeb</p></li>
- <li><a target="_blank" href="http://comcast.com"><img src="images/comcast-platinum.png"/></a><p style="text-align: center; font-weight: bold;">Comcast</p></li>
- <li><a target="_blank" href="http://pineapplefund.org/"><img src="images/pineapple_fund.png"/></a><p style="text-align: center; font-weight: bold;">Pineapple Fund</p></li>
- </ul>
- </div>
-
-
- <h1 style="text-align: center;">Gold sponsors:</h1>
- <div class="sponsors">
- <ul id='gold'>
- <li><a target="_blank" href="http://www.arm.com/"><img src="images/arm-gold.png"/></a><p style="text-align: center; font-weight: bold;">ARM</p></li>
- <li><a target="_blank" href="http://bloomberg.com"><img src="images/bloomberg-gold.png"/></a><p style="text-align: center; font-weight: bold;">Bloomberg</p></li>
- <li><a target="_blank" href="http://hortonworks.com"><img src="images/hortonworks.png"/></a><p style="text-align: center; font-weight: bold;">Hortonworks</p></li>
- <!-- <li><a target="_blank" href="http://hp.com"><img src="images/hp.png"/></a><p style="text-align: center; font-weight: bold;">Hewlett Packard</p></li> -->
- <li><a target="_blank" href="http://huawei.com"><img src="images/huawei-gold.png"/></a><p style="text-align: center; font-weight: bold;">Huawei</p></li>
- <li><a target="_blank" href="http://ibm.com"><img src="images/ibm.png"/></a><p style="text-align: center; font-weight: bold;">IBM</p></li>
- <li><a target="_blank" href="https://www.odpi.org/"><img src="images/odpi-gold.png"/></a><p style="text-align: center; font-weight: bold;">ODPi</p></li>
- <li><a target="_blank" href="http://phoenixnap.com/"><img src="images/phoenixnap-gold.png"/></a><p style="text-align: center; font-weight: bold;">PhoenixNAP</p></li>
- <li><a target="_blank" href="http://pivotal.io/"><img src="images/pivotal-gold.png"/></a><p style="text-align: center; font-weight: bold;">Pivotal</p></li>
- </ul>
- </div>
-
-
- <h1 style="text-align: center;">Silver sponsors:</h1> <!-- 150x67 -->
- <div class="sponsors">
- <ul id='silver'>
- <li><a target="_blank" href="http://www.aetna.com"><img src="images/aetna_sponsorlogo.png"/></a><p style="text-align: center; font-weight: bold;">Aetna</p></li>
- <li><a target="_blank" href="http://www.alicloud.com"><img src="images/alibabacloud-silver.png"/></a><p style="text-align: center; font-weight: bold;">Alibaba Cloud Computing</p></li>
- <li><a target="_blank" href="http://www.budgetdirect.com.au/"><img src="images/budgetdirect-silver.png"/></a><p style="text-align: center; font-weight: bold;">Budget Direct</p></li>
- <li><a target="_blank" href="https://www.capitalone.com/"><img src="images/capitalone-silver.png"/></a><p style="text-align: center; font-weight: bold;">Capital One</p></li>
- <li><a target="_blank" href="https://www.cashstore.com/"><img src="images/cashstore-silver.png"/></a><p style="text-align: center; font-weight: bold;">Cash Store</p></li>
- <li><a target="_blank" href="http://engineering.cerner.com/"><img src="images/cerner.png"/></a><p style="text-align: center; font-weight: bold;">Cerner</p></li>
- <li><a target="_blank" href="http://www.inspur.com/"><img src="images/inspur.jpg"/></a><p style="text-align: center; font-weight: bold;">Inspur</p></li>
- <li><a target="_blank" href="http://www.isigma.net/"><img src="images/isigma.png"/></a><p style="text-align: center; font-weight: bold;">iSIGMA</p></li>
- <li><a target="_blank" href="https://www.privateinternetaccess.com/"><img src="images/pia-silver.png"/></a><p style="text-align: center; font-weight: bold;">Private Internet Access</p></li>
- <li><a target="_blank" href="http://www.redhat.com/"><img src="images/redhat-silver.png"/></a><p style="text-align: center; font-weight: bold;">Red Hat, Inc.</p></li>
- <li><a target="_blank" href="http://www.serenataflowers.com/"><img src="images/serenataflowers-silver.png"/></a><p style="text-align: center; font-weight: bold;">Serenata Flowers</p></li>
- <li><a target="_blank" href="http://www.target.com/"><img src="images/target-silver.png"/></a><p style="text-align: center; font-weight: bold;">Target</p></li>
- <li><a target="_blank" href="http://www.union-investment.de/"><img src="images/union_investment.png"/></a><p style="text-align: center; font-weight: bold;">Union Investment</p></li>
- <li><a target="_blank" href="http://www.wandisco.com/"><img src="images/wandisco.png"/></a><p style="text-align: center; font-weight: bold;">Wandisco</p></li>
- </ul>
- </div>
-
-
- <h1 style="text-align: center;">Bronze sponsors:</h1>
- <div class="sponsors">
- <ul id='bronze'>
- <li><a target="_blank" href="http://www.7binaryoptions.com/robot/">7 Binary Options</a></li>
- <li><a target="_blank" href="https://www.airportrentals.com/" rel="nofollow">Airport Rentals</a></li>
- <li><a target="_blank" href="https://www.theblogstarter.com">The Blog Starter</a></li>
- <li><a target="_blank" href="https://www.voetbalgokken.nu/bookmakers/">Bookmakers</a></li>
- <li><a target="_blank" href="http://www.casino2k.com/">Casino2k</a></li>
- <li><a target="_blank" href="https://www.compareforexbrokers.com.au/">Compare Forex Brokers</a></li>
- <li><a target="_blank" href="http://www.hostingadvice.com/reviews/">HostingAdvice.com</a></li>
- <li><a target="_blank" href="https://hostchecka.com">HostChecka.com</a></li>
- <li><a target="_blank" href="https://www.hostpapa.com/?utm_source=apache.org&utm_medium=referral&utm_campaign=us-seo&utm_term=web-hosting">HostPapa Web Hosting</a></li>
- <li><a target="_blank" href="http://www.linuxfoundation.org/">The Linux Foundation</a></li>
- <li><a target="_blank" href="https://www.mobileslots.com/" rel="nofollow">Mobile Slots</a><li>
- <!-- <li><a target="_blank" href="http://www.samsung.com">Samsung</a></li> -->
- <li><a target="_blank" href="https://www.scams.info">SCAMS.info</a></li>
- <li><a target="_blank" href="http://www.spotify.com">Spotify</a></li>
- <li><a target="_blank" href="http://www.talend.com">Talend</a></li>
- <li><a target="_blank" href="http://www.travel-ticker.com">Travel Ticker Hotels</a></li>
- <li><a target="_blank" href="http://www.twitter.com">Twitter</a></li>
- <li><a target="_blank" href="https://www.webhostingsecretrevealed.net/hosting-reviews/">Web Hosting Secret Revealed</a></li>
- <li><a target="_blank" href="https://www.wisebuyer.com/">Wise Buyer</a></li>
- </ul>
- </div>
-
- <h1 style="text-align: center;">Infrastructure sponsors:</h1>
- <div class="sponsors">
- <ul id='infra'>
- <li><a target="_blank" href="http://www.osuosl.org/"><img src="images/osuosl.png"/></a><p style="text-align: center; font-weight: bold;">OSU Open Source Labs</p></li>
- <li><a target="_blank" href="http://www.surfnet.nl/"><img src="images/surfnet.png"/></a><p style="text-align: center; font-weight: bold;">SURFnet</p></li>
- <li><a target="_blank" href="http://fu-berlin.de"><img src="images/fub.png"/></a><p style="text-align: center; font-weight: bold;">Freie Universität Berlin</p></li>
- <li><a target="_blank" href="https://www.quenda.co/"><img src="images/logo-quenda.png"/></a><p style="text-align: center; font-weight: bold;">Quenda</p></li>
- <li><a target="_blank" href="http://www.pagerduty.com"><img src="images/pagerduty.png"/></a><p style="text-align: center; font-weight: bold;">PagerDuty</p></li>
- <li><a target="_blank" href="http://www.symantec.com/"><img src="images/symantec.png"/></a><p style="text-align: center; font-weight: bold;">Symantec</p></li>
- <li><a target="_blank" href="http://www.no-ip.com/"><img src="images/noip.png"/></a><p style="text-align: center; font-weight: bold;">No-IP</p></li>
- <li><a target="_blank" href="http://bintray.com/"><img src="images/bintray.png"/></a><p style="text-align: center; font-weight: bold;">Bintray</p></li>
- <li><a target="_blank" href="http://hotwaxsystems.com/"><img src="images/hotwax.png"/></a><p style="text-align: center; font-weight: bold;">Hotwax Systems</p></li>
- <li><a target="_blank" href="http://rackspace.com/"><img src="images/rax.jpg"/></a><p style="text-align: center; font-weight: bold;">Rackspace</p></li>
- <li><a target="_blank" href="http://www.sonatype.com/nexus/product-overview"><img src="images/sonatype.png"/></a><p style="text-align: center; font-weight: bold;">Sonatype</p></li>
- </ul>
- </div>
-
-
-<script type="text/javascript">
- var ar = ['platinum','gold','silver','bronze','infra'];
- var co = [ 2, 3, 5, 8, 4 ]; // column counts
-
- for (y in ar) {
- var ul = document.getElementById(ar[y])
-
- // randomise platinum
- if (ar[y] == 'platinum') {
- for (var i = ul.children.length; i >= 0; i--) {
- ul.appendChild(ul.children[Math.random() * i | 0]);
- }
- }
-
- // force the correct number of columns
- var cols = co[y];
- // we divide by cols+1 to allow for spacing between elements
- var minwidth = (1000 / (cols+1)) | 0;
- var style = "display: inline-block; min-width: " + minwidth + "px;";
- for (var i = ul.children.length-1; i >= 0; i--) {
- ul.children[i].setAttribute("style", style)
- }
-
- ul.setAttribute("style", "margin: 0 auto; max-width: 1000px; list-style: none;")
- }
-</script>
-
-
-## Individual Donations
-
-The Apache Software Foundation receives many smaller donations from
-individuals. More details are available on our [contribution page](/foundation/contributing.html).
-
-We would like to thank all of our individual donors for their
-support of our work, and for their willingness to contribute with
-only this as recognition for their generosity.
-
-
-## Mirrors
-
-And a gigantic thank you to <a href="/mirrors/" target=_blank>all the ASF mirrors</a> around the world that help deliver Apache software at no charge!
-
-
-<div align=center>
- <a href="/foundation/contributing.html" title="Support Apache">
- <img src="/images/SupportApache-small.png" style="height: 150px; width: 150px; margin-top: 5px; margin-bottom: 5px;">
- <a>
- <br>
-</div>
-
diff --git a/content/history/data/directors.js b/content/history/data/directors.js
index 844d1a8..f494d48 100644
--- a/content/history/data/directors.js
+++ b/content/history/data/directors.js
@@ -15,6 +15,7 @@
brett: 'Brett Porter',
brian: 'Brian Behlendorf',
brianm: 'Brian McCallister',
+ cdutz: 'Christopher Dutz',
cliffs: 'Cliff Schmidt',
clr: 'Craig Russell',
coar: 'Ken Coar',
@@ -42,6 +43,7 @@
lrosen: 'Larry Rosen',
myrle: 'Myrle Krantz',
niclas: 'Niclas Hedhman',
+ ningjiang: 'Willem Ning Jiang',
noirin: 'Noirin Plunkett',
pats: 'Patricia Shanahan',
psteitz: 'Phil Steitz',
@@ -51,6 +53,7 @@
rgardler: 'Ross Gardler',
rubys: 'Sam Ruby',
sameer: 'Sameer Parekh',
+ sharan: 'Sharan Foga',
stefano: 'Stefano Mazzocchi',
stoddard: 'Bill Stoddard',
striker: 'Sander Striker',
@@ -59,6 +62,7 @@
wave: 'Dave Fisher',
wohali: 'Joan Touzet',
wrowe: 'William Rowe',
+ wusheng: 'Sheng Wu',
}
function date(y, m, d) {
@@ -92,9 +96,9 @@
y2018 = date(2018, 3, 22);
y2019 = date(2019, 3, 28);
y2020 = date(2020, 4, 2);
-
- // Approximate the next year's meeting
- y2021 = date(2021, 4, 1);
+ y2021 = date(2021, 3, 9);
+ y2022 = date(2022, 3, 1);
+ y2023 = date(2023, 3, 9);
// Transition dates for outgoing/incoming Directors
// fielding -> striker
@@ -199,5 +203,25 @@
add('pats', y2020, y2021);
add('striker', y2020, y2021);
+ add('bdelacretaz', y2021, y2022);
+ add('fielding', y2021, y2022);
+ add('sharan', y2021, y2022);
+ add('justin', y2021, y2022);
+ add('clr', y2021, y2022);
+ add('rubys', y2021, y2022);
+ add('rvs', y2021, y2022);
+ add('striker', y2021, y2022);
+ add('wusheng', y2021, y2022);
+
+ add('rbowen', y2022, y2023);
+ add('bdelacretaz', y2022, y2023);
+ add('cdutz', y2022, y2023);
+ add('fielding', y2022, y2023);
+ add('sharan', y2022, y2023);
+ add('ningjiang', y2022, y2023);
+ add('rubys', y2022, y2023);
+ add('rvs', y2022, y2023);
+ add('striker', y2022, y2023);
+
return dataTable;
}
diff --git a/content/images/feathertm.gif b/content/images/feathertm.gif
index 3bbf178..67a3439 100644
--- a/content/images/feathertm.gif
+++ b/content/images/feathertm.gif
Binary files differ
diff --git a/content/img/Fo3uP-ZX0AMe1od.jpg b/content/img/Fo3uP-ZX0AMe1od.jpg
new file mode 100644
index 0000000..4fe853d
--- /dev/null
+++ b/content/img/Fo3uP-ZX0AMe1od.jpg
Binary files differ
diff --git a/content/index.ezmd b/content/index.ezmd
index f688b9e..01537c0 100644
--- a/content/index.ezmd
+++ b/content/index.ezmd
@@ -4,75 +4,17 @@
<section>
<div class="container">
<div class="row">
-<div class="col-sm-12 text-center">
- <h1 class="h3">The World's Largest Open Source Foundation</h1>
-</div>
-<div class="col-sm-4 col-sm-offset-2">
-
-- All volunteer community
-- [{ code_lines }]+ lines of code in stewardship
-- [{ code_changed }]+ lines of code changed
-- [{ code_commits }]+ code commits
-- [{ asf_members }] individual ASF Members
-- [{ asf_committers }]+ Apache Committers
-- [{ asf_contributors }]+ code contributors
-- [{ asf_people }]+ people involved in our communities
-
-</div>
-<div class="col-sm-4">
-
-- [{ com_initiatives }]+ Projects and Initiatives
-- [{ projects_size }] Top-Level Projects
-- [{ podlings_size }] podlings in the Apache Incubator
-- [{ com_downloads }] source code downloads from Apache mirrors
-- [{ com_emails }]+ emails across [{ com_mailinglists }]+ mailing lists
-- Web requests received from every Internet-connected country on the planet
-- [{ com_pageviews }]+ weekly page views across [[]apache.org](/)
-
-</div>
-<div class="col-sm-8 col-sm-offset-2 text-center">
-
-[[]**$22B+ worth of Apache Open Source software products are made available to the public-at-large at 100% no cost, and benefit billions of users around the world.**](https://s.apache.org/FY2020AnnualReport-PR)
-
-[[]**Make a one-time or recurring donation**](https://donate.apache.org/) **|** [[]**Corporate Support and ASF Sponsorship**](/foundation/contributing.html)
-
-
-</div>
- </div>
-<div id="video" class="row" style="margin-bottom: 30px;">
- <script>
-function swapVideo(videoUrl, title) {
- const videoPlayer = document.getElementById("trillionsVideos");
- videoPlayer.src = videoUrl;
- videoPlayer.title= title;
-}
-</script>
-<noscript>Sorry, your browser settings do not support JavaScript!</noscript>
-<div class="col-sm-8 col-sm-offset-2" style="padding-top: 30px;">
- <div class="video-responsive">
-<iframe id="trillionsVideos" title="Trillions and Trillions" width="560" height="315" src="https://www.youtube.com/embed/JUt2nb0mgwg?rel=0" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
- </div>
-</div>
-</div>
-<div id="video-thumbnails" class="row">
- <div class="col-xs-6 col-sm-2 col-sm-offset-2">
- <button onclick="swapVideo('https://www.youtube.com/embed/YM5dLvNatRs?autoplay=1&rel=0', 'Why Apache?')"><img class="img-responsive" src="img/trillions-and-trillions/why-apache-thumbail.jpg" alt="Why Apache?" /></button>
+ <div class="col-sm-12 text-center">
+ <div class="container public-good">
+ <h1 class="h3">Software for the Public Good</h1>
+ <p>ASF’s open source software is used ubiquitously around the world with more than 8,400 committers contributing to more than 320 active projects.</p>
+ <p><a class="btn btn-default mx-10" href="/index.html#projects-list" role="button">See All Projects</a><a class="btn btn-default mx-10" href="https://community.apache.org/" role="button">Contribute</a></p>
+ <img class="img-responsive" src="img/Fo3uP-ZX0AMe1od.jpg" alt="Apache Everywhere" />
+ </div>
+ </div>
+ </div>
</div>
- <div class="col-xs-6 col-sm-2">
- <button onclick="swapVideo('https://www.youtube.com/embed/nXtIti9jMFI?autoplay=1&rel=0', 'Apache Everywhere')"><img class="img-responsive" src="img/trillions-and-trillions/apache-everywhere-thumbnail.jpg" alt="Apache Everywhere" /></button>
- </div>
- <div class="col-xs-6 col-sm-2">
- <button onclick="swapVideo('https://www.youtube.com/embed/JUt2nb0mgwg?autoplay=1&rel=0', 'Trillions and Trillions Served')"><img class="img-responsive" src="img/trillions-and-trillions/trillions-and-trillions-thumbnail.jpg" alt="Trillions and Trillions Served" /></button>
- </div>
- <div class="col-xs-6 col-sm-2">
- <button onclick="swapVideo('https://www.youtube.com/embed/qkvqJaX4S50?autoplay=1&rel=0', 'Apache Innovation')"><img class="img-responsive" src="img/trillions-and-trillions/apache-innovation-thumbnail.jpg" alt="Apache Innovation" /></button>
- </div>
- <div class="col-xs-12 text-center">
- <a href="https://www.youtube.com/channel/UCLDJ_V9KUOdOFSbDvPfGBxw" target="_blank">View additional videos</a>
- </div>
-</div>
-</div>
-</section>
+</section>
<!-- Quotes -->
<section id="apacheQuotes" class="bg-primary">
<div class="container">
@@ -116,8 +58,8 @@
<h2 class="no-btm-margin">Latest News</h2>
<p>Keep up with the ASF's news and announcements by subscribing to the
<a href="/foundation/mailinglists.html#foundation-announce">Apache Announcements List</a>, as
- well as following the <a href="https://blogs.apache.org/foundation/">Foundation Blog</a>,
- <a href="https://blogs.apache.org/foundation/category/Newsletter">Apache Weekly News Round-Ups</a>,
+ well as following the <a href="https://news.apache.org/">Foundation Blog</a>,
+ <a href="https://news.apache.org/foundation/entry/category/newsletter">Apache Weekly News Round-Ups</a>,
<a href="https://twitter.com/TheASF">@TheASF on Twitter</a>,
<a href="https://www.linkedin.com/company/the-apache-software-foundation/">The Apache Software Foundation on LinkedIn</a>,
on the ASF's <a href="https://www.youtube.com/c/TheApacheFoundation/">YouTube channel</a>, and
@@ -212,47 +154,54 @@
</div>
</section>
<!-- End Highlights-->
-
-<!-- Apache Statements Section -->
-<section class="bg-info">
-<div class="container">
-The ASF develops, shepherds, and incubates hundreds of freely-available, enterprise-grade projects that serve as the
-backbone for some of the most visible and widely used applications in computing today. Through the ASF's merit-based
-process known as [[]"The Apache Way,"](/theapacheway) more than [[][{ asf_members_rounded }] individual volunteer Members and [{ asf_committers }]+ code
-Committers](http://community.zones.apache.org/map.html) across six continents successfully collaborate on innovations
-in Artificial Intelligence and Deep Learning, Big Data, Build Management, Cloud Computing, Content Management, DevOps,
-IoT and Edge Computing, Mobile, Servers, and Web Frameworks, [[]among other categories](https://projects.apache.org/projects.html?category).
-
-**APACHE IS …**
-
-**OPEN:** The Apache Software Foundation provides support for [{ com_initiatives }]+ Apache Projects and their Communities,
-furthering its mission of providing Open Source software for the public good.
-
-**INNOVATION:** Apache Projects are defined by [[]collaborative, consensus-based processes](/theapacheway), an open,
-pragmatic software license and a desire to create high quality software that leads the way in its field.
-
-**COMMUNITY:** We are a [[]community of developers and users](http://community.apache.org/) of enterprise-grade,
-Open Source Apache projects used in every Internet-connected country on the planet.
-
-</div>
+<section class="about-foundation">
+ <div class="container">
+ <div class="row">
+ <div class="col-md-12">
+ <h2>About the Foundation</h2>
+ <p>The ASF is a 501(c)(3) charitable organization run almost exclusively by volunteers who oversee hundreds of projects. Our sponsors enable us to maintain the infrastructure needed to support them.</p>
+ <div class="container">
+ <div class="row">
+ <p><a class="btn btn-default btn-sm" href="/foundation/" role="button">Governance</a><a class="btn btn-default btn-sm" href="/foundation/thanks" role="button">See our sponsors</a></p>
+ <div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
</section>
-<!-- / Apache Statements Section -->
<!-- was Apachecon etc here -->
+<section class="bg-gray">
+ <div class="container">
+ <div class="row">
+ <div class="col-md-12">
+ <h2>ASF Projects</h2>
+ <p>The ASF develops, stewards, and incubates hundreds of freely available, enterprise-grade projects that serve as the backbone for the most visible and widely used applications in computing today.</p>
+ <div class="row ">
+ <div class="col-sm-6">
+ <h3 class="h3-small">Contribute</h3>
+ <p>If you wish to contribute to ASF projects, the Community Development site has tools, processes, and advice to help you get started.</p>
+ <p><a href="https://community.apache.org/">Get Started</a></p>
+ </div>
+ <div class="col-sm-6">
+ <h3 class="h3-small">Host a Project</h3>
+ <p>The Apache Incubator provides a path for projects and their communities that want to enter the ASF.</p>
+ <p><a href="https://incubator.apache.org/">Learn more</a></p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</section>
<!-- Apache Featured Projects Section -->
<section class="bg-gray">
<div class="container">
<div class="row">
<div class="col-md-12">
- <h2>Apache Projects</h2>
- <p>The all-volunteer ASF develops, stewards, and incubates more than 350 Open Source projects and initiatives that cover a wide range of technologies.
- From Accumulo to Zookeeper, if you are looking for a rewarding experience in Open Source and industry leading software, chances are you are going to find it here.
- <a href="/foundation/press/kit/#powerby">Are you powered by Apache?</a>
- </p>
- <!-- Featured Projects Section -->
<div class="container">
<div class="row">
- <h3>Featured Project<span class="visible-md-inline visible-lg-inline">s</span></h3>
+ <h3 class="h3-small">Featured Project<span class="visible-md-inline visible-lg-inline">s</span></h3>
<div class="col-md-3 col-sm-12">
<!-- tabs left -->
<div class="tabbable tabs-left visible-md-inline visible-lg-inline">
@@ -281,11 +230,10 @@
</div><!-- /container -->
</div><!-- /tabs -->
</div><!-- /column -->
-<!-- / Featured Projects Section -->
<!-- Incubator Projects Section -->
<div class="container">
<div class="row">
- <h3>Incubating Project<span class="visible-md-inline visible-lg-inline">s</span></h3>
+ <h3 class="h3-small">Incubating Project<span class="visible-md-inline visible-lg-inline">s</span></h3>
<p>The Apache Incubator is the primary entry path into The Apache Software Foundation for projects and their communities wishing to become part of the Foundation’s efforts.
All code donations from external organisations and existing external projects seeking to join the Apache community enter through the Incubator.</p>
<div class="col-md-3 col-sm-12">
@@ -321,7 +269,6 @@
</div>
</div>
</section>
-<!-- / Apache Featured Projects Section -->
<!-- Apache Projects List -->
<section id="projects-list">
<div class="container">
diff --git a/content/info/.htaccess b/content/info/.htaccess
new file mode 100644
index 0000000..8a12034
--- /dev/null
+++ b/content/info/.htaccess
@@ -0,0 +1,4 @@
+Redirect /info/how-to-mirror.html /mirrors
+Redirect /info/how-to-mirror /mirrors
+Redirect /info/mirror-proxy.html /mirrors
+Redirect /info/mirror-proxy /mirrors
diff --git a/content/info/mirror-proxy.md b/content/info/mirror-proxy.md
deleted file mode 100644
index 9f42e07..0000000
--- a/content/info/mirror-proxy.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Title: Mirroring Using Apache HTTP Server Version 2.2 (experimental)
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-**These instructions are no longer available.**
-
-As of the third quarter of 2021, the ASF stopped using its download mirror system. It is now using a global content distribution network (CDN).
-
-Read about <a href="https://apache.org/history/mirror-history.html">the history of the Apache mirror system</a>.
diff --git a/content/js/jquery.js b/content/js/jquery.js
deleted file mode 100644
index 46a7476..0000000
--- a/content/js/jquery.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * jQuery 1.2.6 - New Wave Javascript
- *
- * Copyright (c) 2008 John Resig (jquery.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * $Date: 2008-11-28 18:23:57 -0600 (Fri, 28 Nov 2008) $
- * $Rev: 721596 $
- */
-(function(){var _jQuery=window.jQuery,_$=window.$;var jQuery=window.jQuery=window.$=function(selector,context){return new jQuery.fn.init(selector,context);};var quickExpr=/^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,isSimple=/^.[^:#\[\.]*$/,undefined;jQuery.fn=jQuery.prototype={init:function(selector,context){selector=selector||document;if(selector.nodeType){this[0]=selector;this.length=1;return this;}if(typeof selector=="string"){var match=quickExpr.exec(selector);if(match&&(match[1]||!context)){if(match[1])selector=jQuery.clean([match[1]],context);else{var elem=document.getElementById(match[3]);if(elem){if(elem.id!=match[3])return jQuery().find(selector);return jQuery(elem);}selector=[];}}else
-return jQuery(context).find(selector);}else if(jQuery.isFunction(selector))return jQuery(document)[jQuery.fn.ready?"ready":"load"](selector);return this.setArray(jQuery.makeArray(selector));},jquery:"1.2.6",size:function(){return this.length;},length:0,get:function(num){return num==undefined?jQuery.makeArray(this):this[num];},pushStack:function(elems){var ret=jQuery(elems);ret.prevObject=this;return ret;},setArray:function(elems){this.length=0;Array.prototype.push.apply(this,elems);return this;},each:function(callback,args){return jQuery.each(this,callback,args);},index:function(elem){var ret=-1;return jQuery.inArray(elem&&elem.jquery?elem[0]:elem,this);},attr:function(name,value,type){var options=name;if(name.constructor==String)if(value===undefined)return this[0]&&jQuery[type||"attr"](this[0],name);else{options={};options[name]=value;}return this.each(function(i){for(name in options)jQuery.attr(type?this.style:this,name,jQuery.prop(this,options[name],type,i,name));});},css:function(key,value){if((key=='width'||key=='height')&&parseFloat(value)<0)value=undefined;return this.attr(key,value,"curCSS");},text:function(text){if(typeof text!="object"&&text!=null)return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(text));var ret="";jQuery.each(text||this,function(){jQuery.each(this.childNodes,function(){if(this.nodeType!=8)ret+=this.nodeType!=1?this.nodeValue:jQuery.fn.text([this]);});});return ret;},wrapAll:function(html){if(this[0])jQuery(html,this[0].ownerDocument).clone().insertBefore(this[0]).map(function(){var elem=this;while(elem.firstChild)elem=elem.firstChild;return elem;}).append(this);return this;},wrapInner:function(html){return this.each(function(){jQuery(this).contents().wrapAll(html);});},wrap:function(html){return this.each(function(){jQuery(this).wrapAll(html);});},append:function(){return this.domManip(arguments,true,false,function(elem){if(this.nodeType==1)this.appendChild(elem);});},prepend:function(){return this.domManip(arguments,true,true,function(elem){if(this.nodeType==1)this.insertBefore(elem,this.firstChild);});},before:function(){return this.domManip(arguments,false,false,function(elem){this.parentNode.insertBefore(elem,this);});},after:function(){return this.domManip(arguments,false,true,function(elem){this.parentNode.insertBefore(elem,this.nextSibling);});},end:function(){return this.prevObject||jQuery([]);},find:function(selector){var elems=jQuery.map(this,function(elem){return jQuery.find(selector,elem);});return this.pushStack(/[^+>] [^+>]/.test(selector)||selector.indexOf("..")>-1?jQuery.unique(elems):elems);},clone:function(events){var ret=this.map(function(){if(jQuery.browser.msie&&!jQuery.isXMLDoc(this)){var clone=this.cloneNode(true),container=document.createElement("div");container.appendChild(clone);return jQuery.clean([container.innerHTML])[0];}else
-return this.cloneNode(true);});var clone=ret.find("*").andSelf().each(function(){if(this[expando]!=undefined)this[expando]=null;});if(events===true)this.find("*").andSelf().each(function(i){if(this.nodeType==3)return;var events=jQuery.data(this,"events");for(var type in events)for(var handler in events[type])jQuery.event.add(clone[i],type,events[type][handler],events[type][handler].data);});return ret;},filter:function(selector){return this.pushStack(jQuery.isFunction(selector)&&jQuery.grep(this,function(elem,i){return selector.call(elem,i);})||jQuery.multiFilter(selector,this));},not:function(selector){if(selector.constructor==String)if(isSimple.test(selector))return this.pushStack(jQuery.multiFilter(selector,this,true));else
-selector=jQuery.multiFilter(selector,this);var isArrayLike=selector.length&&selector[selector.length-1]!==undefined&&!selector.nodeType;return this.filter(function(){return isArrayLike?jQuery.inArray(this,selector)<0:this!=selector;});},add:function(selector){return this.pushStack(jQuery.unique(jQuery.merge(this.get(),typeof selector=='string'?jQuery(selector):jQuery.makeArray(selector))));},is:function(selector){return!!selector&&jQuery.multiFilter(selector,this).length>0;},hasClass:function(selector){return this.is("."+selector);},val:function(value){if(value==undefined){if(this.length){var elem=this[0];if(jQuery.nodeName(elem,"select")){var index=elem.selectedIndex,values=[],options=elem.options,one=elem.type=="select-one";if(index<0)return null;for(var i=one?index:0,max=one?index+1:options.length;i<max;i++){var option=options[i];if(option.selected){value=jQuery.browser.msie&&!option.attributes.value.specified?option.text:option.value;if(one)return value;values.push(value);}}return values;}else
-return(this[0].value||"").replace(/\r/g,"");}return undefined;}if(value.constructor==Number)value+='';return this.each(function(){if(this.nodeType!=1)return;if(value.constructor==Array&&/radio|checkbox/.test(this.type))this.checked=(jQuery.inArray(this.value,value)>=0||jQuery.inArray(this.name,value)>=0);else if(jQuery.nodeName(this,"select")){var values=jQuery.makeArray(value);jQuery("option",this).each(function(){this.selected=(jQuery.inArray(this.value,values)>=0||jQuery.inArray(this.text,values)>=0);});if(!values.length)this.selectedIndex=-1;}else
-this.value=value;});},html:function(value){return value==undefined?(this[0]?this[0].innerHTML:null):this.empty().append(value);},replaceWith:function(value){return this.after(value).remove();},eq:function(i){return this.slice(i,i+1);},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments));},map:function(callback){return this.pushStack(jQuery.map(this,function(elem,i){return callback.call(elem,i,elem);}));},andSelf:function(){return this.add(this.prevObject);},data:function(key,value){var parts=key.split(".");parts[1]=parts[1]?"."+parts[1]:"";if(value===undefined){var data=this.triggerHandler("getData"+parts[1]+"!",[parts[0]]);if(data===undefined&&this.length)data=jQuery.data(this[0],key);return data===undefined&&parts[1]?this.data(parts[0]):data;}else
-return this.trigger("setData"+parts[1]+"!",[parts[0],value]).each(function(){jQuery.data(this,key,value);});},removeData:function(key){return this.each(function(){jQuery.removeData(this,key);});},domManip:function(args,table,reverse,callback){var clone=this.length>1,elems;return this.each(function(){if(!elems){elems=jQuery.clean(args,this.ownerDocument);if(reverse)elems.reverse();}var obj=this;if(table&&jQuery.nodeName(this,"table")&&jQuery.nodeName(elems[0],"tr"))obj=this.getElementsByTagName("tbody")[0]||this.appendChild(this.ownerDocument.createElement("tbody"));var scripts=jQuery([]);jQuery.each(elems,function(){var elem=clone?jQuery(this).clone(true)[0]:this;if(jQuery.nodeName(elem,"script"))scripts=scripts.add(elem);else{if(elem.nodeType==1)scripts=scripts.add(jQuery("script",elem).remove());callback.call(obj,elem);}});scripts.each(evalScript);});}};jQuery.fn.init.prototype=jQuery.fn;function evalScript(i,elem){if(elem.src)jQuery.ajax({url:elem.src,async:false,dataType:"script"});else
-jQuery.globalEval(elem.text||elem.textContent||elem.innerHTML||"");if(elem.parentNode)elem.parentNode.removeChild(elem);}function now(){return+new Date;}jQuery.extend=jQuery.fn.extend=function(){var target=arguments[0]||{},i=1,length=arguments.length,deep=false,options;if(target.constructor==Boolean){deep=target;target=arguments[1]||{};i=2;}if(typeof target!="object"&&typeof target!="function")target={};if(length==i){target=this;--i;}for(;i<length;i++)if((options=arguments[i])!=null)for(var name in options){var src=target[name],copy=options[name];if(target===copy)continue;if(deep&©&&typeof copy=="object"&&!copy.nodeType)target[name]=jQuery.extend(deep,src||(copy.length!=null?[]:{}),copy);else if(copy!==undefined)target[name]=copy;}return target;};var expando="jQuery"+now(),uuid=0,windowData={},exclude=/z-?index|font-?weight|opacity|zoom|line-?height/i,defaultView=document.defaultView||{};jQuery.extend({noConflict:function(deep){window.$=_$;if(deep)window.jQuery=_jQuery;return jQuery;},isFunction:function(fn){return!!fn&&typeof fn!="string"&&!fn.nodeName&&fn.constructor!=Array&&/^[\s[]?function/.test(fn+"");},isXMLDoc:function(elem){return elem.documentElement&&!elem.body||elem.tagName&&elem.ownerDocument&&!elem.ownerDocument.body;},globalEval:function(data){data=jQuery.trim(data);if(data){var head=document.getElementsByTagName("head")[0]||document.documentElement,script=document.createElement("script");script.type="text/javascript";if(jQuery.browser.msie)script.text=data;else
-script.appendChild(document.createTextNode(data));head.insertBefore(script,head.firstChild);head.removeChild(script);}},nodeName:function(elem,name){return elem.nodeName&&elem.nodeName.toUpperCase()==name.toUpperCase();},cache:{},data:function(elem,name,data){elem=elem==window?windowData:elem;var id=elem[expando];if(!id)id=elem[expando]=++uuid;if(name&&!jQuery.cache[id])jQuery.cache[id]={};if(data!==undefined)jQuery.cache[id][name]=data;return name?jQuery.cache[id][name]:id;},removeData:function(elem,name){elem=elem==window?windowData:elem;var id=elem[expando];if(name){if(jQuery.cache[id]){delete jQuery.cache[id][name];name="";for(name in jQuery.cache[id])break;if(!name)jQuery.removeData(elem);}}else{try{delete elem[expando];}catch(e){if(elem.removeAttribute)elem.removeAttribute(expando);}delete jQuery.cache[id];}},each:function(object,callback,args){var name,i=0,length=object.length;if(args){if(length==undefined){for(name in object)if(callback.apply(object[name],args)===false)break;}else
-for(;i<length;)if(callback.apply(object[i++],args)===false)break;}else{if(length==undefined){for(name in object)if(callback.call(object[name],name,object[name])===false)break;}else
-for(var value=object[0];i<length&&callback.call(value,i,value)!==false;value=object[++i]){}}return object;},prop:function(elem,value,type,i,name){if(jQuery.isFunction(value))value=value.call(elem,i);return value&&value.constructor==Number&&type=="curCSS"&&!exclude.test(name)?value+"px":value;},className:{add:function(elem,classNames){jQuery.each((classNames||"").split(/\s+/),function(i,className){if(elem.nodeType==1&&!jQuery.className.has(elem.className,className))elem.className+=(elem.className?" ":"")+className;});},remove:function(elem,classNames){if(elem.nodeType==1)elem.className=classNames!=undefined?jQuery.grep(elem.className.split(/\s+/),function(className){return!jQuery.className.has(classNames,className);}).join(" "):"";},has:function(elem,className){return jQuery.inArray(className,(elem.className||elem).toString().split(/\s+/))>-1;}},swap:function(elem,options,callback){var old={};for(var name in options){old[name]=elem.style[name];elem.style[name]=options[name];}callback.call(elem);for(var name in options)elem.style[name]=old[name];},css:function(elem,name,force){if(name=="width"||name=="height"){var val,props={position:"absolute",visibility:"hidden",display:"block"},which=name=="width"?["Left","Right"]:["Top","Bottom"];function getWH(){val=name=="width"?elem.offsetWidth:elem.offsetHeight;var padding=0,border=0;jQuery.each(which,function(){padding+=parseFloat(jQuery.curCSS(elem,"padding"+this,true))||0;border+=parseFloat(jQuery.curCSS(elem,"border"+this+"Width",true))||0;});val-=Math.round(padding+border);}if(jQuery(elem).is(":visible"))getWH();else
-jQuery.swap(elem,props,getWH);return Math.max(0,val);}return jQuery.curCSS(elem,name,force);},curCSS:function(elem,name,force){var ret,style=elem.style;function color(elem){if(!jQuery.browser.safari)return false;var ret=defaultView.getComputedStyle(elem,null);return!ret||ret.getPropertyValue("color")=="";}if(name=="opacity"&&jQuery.browser.msie){ret=jQuery.attr(style,"opacity");return ret==""?"1":ret;}if(jQuery.browser.opera&&name=="display"){var save=style.outline;style.outline="0 solid black";style.outline=save;}if(name.match(/float/i))name=styleFloat;if(!force&&style&&style[name])ret=style[name];else if(defaultView.getComputedStyle){if(name.match(/float/i))name="float";name=name.replace(/([A-Z])/g,"-$1").toLowerCase();var computedStyle=defaultView.getComputedStyle(elem,null);if(computedStyle&&!color(elem))ret=computedStyle.getPropertyValue(name);else{var swap=[],stack=[],a=elem,i=0;for(;a&&color(a);a=a.parentNode)stack.unshift(a);for(;i<stack.length;i++)if(color(stack[i])){swap[i]=stack[i].style.display;stack[i].style.display="block";}ret=name=="display"&&swap[stack.length-1]!=null?"none":(computedStyle&&computedStyle.getPropertyValue(name))||"";for(i=0;i<swap.length;i++)if(swap[i]!=null)stack[i].style.display=swap[i];}if(name=="opacity"&&ret=="")ret="1";}else if(elem.currentStyle){var camelCase=name.replace(/\-(\w)/g,function(all,letter){return letter.toUpperCase();});ret=elem.currentStyle[name]||elem.currentStyle[camelCase];if(!/^\d+(px)?$/i.test(ret)&&/^\d/.test(ret)){var left=style.left,rsLeft=elem.runtimeStyle.left;elem.runtimeStyle.left=elem.currentStyle.left;style.left=ret||0;ret=style.pixelLeft+"px";style.left=left;elem.runtimeStyle.left=rsLeft;}}return ret;},clean:function(elems,context){var ret=[];context=context||document;if(typeof context.createElement=='undefined')context=context.ownerDocument||context[0]&&context[0].ownerDocument||document;jQuery.each(elems,function(i,elem){if(!elem)return;if(elem.constructor==Number)elem+='';if(typeof elem=="string"){elem=elem.replace(/(<(\w+)[^>]*?)\/>/g,function(all,front,tag){return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?all:front+"></"+tag+">";});var tags=jQuery.trim(elem).toLowerCase(),div=context.createElement("div");var wrap=!tags.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!tags.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||tags.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!tags.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!tags.indexOf("<td")||!tags.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!tags.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||jQuery.browser.msie&&[1,"div<div>","</div>"]||[0,"",""];div.innerHTML=wrap[1]+elem+wrap[2];while(wrap[0]--)div=div.lastChild;if(jQuery.browser.msie){var tbody=!tags.indexOf("<table")&&tags.indexOf("<tbody")<0?div.firstChild&&div.firstChild.childNodes:wrap[1]=="<table>"&&tags.indexOf("<tbody")<0?div.childNodes:[];for(var j=tbody.length-1;j>=0;--j)if(jQuery.nodeName(tbody[j],"tbody")&&!tbody[j].childNodes.length)tbody[j].parentNode.removeChild(tbody[j]);if(/^\s/.test(elem))div.insertBefore(context.createTextNode(elem.match(/^\s*/)[0]),div.firstChild);}elem=jQuery.makeArray(div.childNodes);}if(elem.length===0&&(!jQuery.nodeName(elem,"form")&&!jQuery.nodeName(elem,"select")))return;if(elem[0]==undefined||jQuery.nodeName(elem,"form")||elem.options)ret.push(elem);else
-ret=jQuery.merge(ret,elem);});return ret;},attr:function(elem,name,value){if(!elem||elem.nodeType==3||elem.nodeType==8)return undefined;var notxml=!jQuery.isXMLDoc(elem),set=value!==undefined,msie=jQuery.browser.msie;name=notxml&&jQuery.props[name]||name;if(elem.tagName){var special=/href|src|style/.test(name);if(name=="selected"&&jQuery.browser.safari)elem.parentNode.selectedIndex;if(name in elem&¬xml&&!special){if(set){if(name=="type"&&jQuery.nodeName(elem,"input")&&elem.parentNode)throw"type property can't be changed";elem[name]=value;}if(jQuery.nodeName(elem,"form")&&elem.getAttributeNode(name))return elem.getAttributeNode(name).nodeValue;return elem[name];}if(msie&¬xml&&name=="style")return jQuery.attr(elem.style,"cssText",value);if(set)elem.setAttribute(name,""+value);var attr=msie&¬xml&&special?elem.getAttribute(name,2):elem.getAttribute(name);return attr===null?undefined:attr;}if(msie&&name=="opacity"){if(set){elem.zoom=1;elem.filter=(elem.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(value)+''=="NaN"?"":"alpha(opacity="+value*100+")");}return elem.filter&&elem.filter.indexOf("opacity=")>=0?(parseFloat(elem.filter.match(/opacity=([^)]*)/)[1])/100)+'':"";}name=name.replace(/-([a-z])/ig,function(all,letter){return letter.toUpperCase();});if(set)elem[name]=value;return elem[name];},trim:function(text){return(text||"").replace(/^\s+|\s+$/g,"");},makeArray:function(array){var ret=[];if(array!=null){var i=array.length;if(i==null||array.split||array.setInterval||array.call)ret[0]=array;else
-while(i)ret[--i]=array[i];}return ret;},inArray:function(elem,array){for(var i=0,length=array.length;i<length;i++)if(array[i]===elem)return i;return-1;},merge:function(first,second){var i=0,elem,pos=first.length;if(jQuery.browser.msie){while(elem=second[i++])if(elem.nodeType!=8)first[pos++]=elem;}else
-while(elem=second[i++])first[pos++]=elem;return first;},unique:function(array){var ret=[],done={};try{for(var i=0,length=array.length;i<length;i++){var id=jQuery.data(array[i]);if(!done[id]){done[id]=true;ret.push(array[i]);}}}catch(e){ret=array;}return ret;},grep:function(elems,callback,inv){var ret=[];for(var i=0,length=elems.length;i<length;i++)if(!inv!=!callback(elems[i],i))ret.push(elems[i]);return ret;},map:function(elems,callback){var ret=[];for(var i=0,length=elems.length;i<length;i++){var value=callback(elems[i],i);if(value!=null)ret[ret.length]=value;}return ret.concat.apply([],ret);}});var userAgent=navigator.userAgent.toLowerCase();jQuery.browser={version:(userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[])[1],safari:/webkit/.test(userAgent),opera:/opera/.test(userAgent),msie:/msie/.test(userAgent)&&!/opera/.test(userAgent),mozilla:/mozilla/.test(userAgent)&&!/(compatible|webkit)/.test(userAgent)};var styleFloat=jQuery.browser.msie?"styleFloat":"cssFloat";jQuery.extend({boxModel:!jQuery.browser.msie||document.compatMode=="CSS1Compat",props:{"for":"htmlFor","class":"className","float":styleFloat,cssFloat:styleFloat,styleFloat:styleFloat,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing"}});jQuery.each({parent:function(elem){return elem.parentNode;},parents:function(elem){return jQuery.dir(elem,"parentNode");},next:function(elem){return jQuery.nth(elem,2,"nextSibling");},prev:function(elem){return jQuery.nth(elem,2,"previousSibling");},nextAll:function(elem){return jQuery.dir(elem,"nextSibling");},prevAll:function(elem){return jQuery.dir(elem,"previousSibling");},siblings:function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},children:function(elem){return jQuery.sibling(elem.firstChild);},contents:function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}},function(name,fn){jQuery.fn[name]=function(selector){var ret=jQuery.map(this,fn);if(selector&&typeof selector=="string")ret=jQuery.multiFilter(selector,ret);return this.pushStack(jQuery.unique(ret));};});jQuery.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(name,original){jQuery.fn[name]=function(){var args=arguments;return this.each(function(){for(var i=0,length=args.length;i<length;i++)jQuery(args[i])[original](this);});};});jQuery.each({removeAttr:function(name){jQuery.attr(this,name,"");if(this.nodeType==1)this.removeAttribute(name);},addClass:function(classNames){jQuery.className.add(this,classNames);},removeClass:function(classNames){jQuery.className.remove(this,classNames);},toggleClass:function(classNames){jQuery.className[jQuery.className.has(this,classNames)?"remove":"add"](this,classNames);},remove:function(selector){if(!selector||jQuery.filter(selector,[this]).r.length){jQuery("*",this).add(this).each(function(){jQuery.event.remove(this);jQuery.removeData(this);});if(this.parentNode)this.parentNode.removeChild(this);}},empty:function(){jQuery(">*",this).remove();while(this.firstChild)this.removeChild(this.firstChild);}},function(name,fn){jQuery.fn[name]=function(){return this.each(fn,arguments);};});jQuery.each(["Height","Width"],function(i,name){var type=name.toLowerCase();jQuery.fn[type]=function(size){return this[0]==window?jQuery.browser.opera&&document.body["client"+name]||jQuery.browser.safari&&window["inner"+name]||document.compatMode=="CSS1Compat"&&document.documentElement["client"+name]||document.body["client"+name]:this[0]==document?Math.max(Math.max(document.body["scroll"+name],document.documentElement["scroll"+name]),Math.max(document.body["offset"+name],document.documentElement["offset"+name])):size==undefined?(this.length?jQuery.css(this[0],type):null):this.css(type,size.constructor==String?size:size+"px");};});function num(elem,prop){return elem[0]&&parseInt(jQuery.curCSS(elem[0],prop,true),10)||0;}var chars=jQuery.browser.safari&&parseInt(jQuery.browser.version)<417?"(?:[\\w*_-]|\\\\.)":"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",quickChild=new RegExp("^>\\s*("+chars+"+)"),quickID=new RegExp("^("+chars+"+)(#)("+chars+"+)"),quickClass=new RegExp("^([#.]?)("+chars+"*)");jQuery.extend({expr:{"":function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},"#":function(a,i,m){return a.getAttribute("id")==m[2];},":":{lt:function(a,i,m){return i<m[3]-0;},gt:function(a,i,m){return i>m[3]-0;},nth:function(a,i,m){return m[3]-0==i;},eq:function(a,i,m){return m[3]-0==i;},first:function(a,i){return i==0;},last:function(a,i,m,r){return i==r.length-1;},even:function(a,i){return i%2==0;},odd:function(a,i){return i%2;},"first-child":function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},"last-child":function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},"only-child":function(a){return!jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},parent:function(a){return a.firstChild;},empty:function(a){return!a.firstChild;},contains:function(a,i,m){return(a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},visible:function(a){return"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},hidden:function(a){return"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},enabled:function(a){return!a.disabled;},disabled:function(a){return a.disabled;},checked:function(a){return a.checked;},selected:function(a){return a.selected||jQuery.attr(a,"selected");},text:function(a){return"text"==a.type;},radio:function(a){return"radio"==a.type;},checkbox:function(a){return"checkbox"==a.type;},file:function(a){return"file"==a.type;},password:function(a){return"password"==a.type;},submit:function(a){return"submit"==a.type;},image:function(a){return"image"==a.type;},reset:function(a){return"reset"==a.type;},button:function(a){return"button"==a.type||jQuery.nodeName(a,"button");},input:function(a){return/input|select|textarea|button/i.test(a.nodeName);},has:function(a,i,m){return jQuery.find(m[3],a).length;},header:function(a){return/h\d/i.test(a.nodeName);},animated:function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}}},parse:[/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,new RegExp("^([:.#]*)("+chars+"+)")],multiFilter:function(expr,elems,not){var old,cur=[];while(expr&&expr!=old){old=expr;var f=jQuery.filter(expr,elems,not);expr=f.t.replace(/^\s*,\s*/,"");cur=not?elems=f.r:jQuery.merge(cur,f.r);}return cur;},find:function(t,context){if(typeof t!="string")return[t];if(context&&context.nodeType!=1&&context.nodeType!=9)return[];context=context||document;var ret=[context],done=[],last,nodeName;while(t&&last!=t){var r=[];last=t;t=jQuery.trim(t);var foundToken=false,re=quickChild,m=re.exec(t);if(m){nodeName=m[1].toUpperCase();for(var i=0;ret[i];i++)for(var c=ret[i].firstChild;c;c=c.nextSibling)if(c.nodeType==1&&(nodeName=="*"||c.nodeName.toUpperCase()==nodeName))r.push(c);ret=r;t=t.replace(re,"");if(t.indexOf(" ")==0)continue;foundToken=true;}else{re=/^([>+~])\s*(\w*)/i;if((m=re.exec(t))!=null){r=[];var merge={};nodeName=m[2].toUpperCase();m=m[1];for(var j=0,rl=ret.length;j<rl;j++){var n=m=="~"||m=="+"?ret[j].nextSibling:ret[j].firstChild;for(;n;n=n.nextSibling)if(n.nodeType==1){var id=jQuery.data(n);if(m=="~"&&merge[id])break;if(!nodeName||n.nodeName.toUpperCase()==nodeName){if(m=="~")merge[id]=true;r.push(n);}if(m=="+")break;}}ret=r;t=jQuery.trim(t.replace(re,""));foundToken=true;}}if(t&&!foundToken){if(!t.indexOf(",")){if(context==ret[0])ret.shift();done=jQuery.merge(done,ret);r=ret=[context];t=" "+t.substr(1,t.length);}else{var re2=quickID;var m=re2.exec(t);if(m){m=[0,m[2],m[3],m[1]];}else{re2=quickClass;m=re2.exec(t);}m[2]=m[2].replace(/\\/g,"");var elem=ret[ret.length-1];if(m[1]=="#"&&elem&&elem.getElementById&&!jQuery.isXMLDoc(elem)){var oid=elem.getElementById(m[2]);if((jQuery.browser.msie||jQuery.browser.opera)&&oid&&typeof oid.id=="string"&&oid.id!=m[2])oid=jQuery('[@id="'+m[2]+'"]',elem)[0];ret=r=oid&&(!m[3]||jQuery.nodeName(oid,m[3]))?[oid]:[];}else{for(var i=0;ret[i];i++){var tag=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];if(tag=="*"&&ret[i].nodeName.toLowerCase()=="object")tag="param";r=jQuery.merge(r,ret[i].getElementsByTagName(tag));}if(m[1]==".")r=jQuery.classFilter(r,m[2]);if(m[1]=="#"){var tmp=[];for(var i=0;r[i];i++)if(r[i].getAttribute("id")==m[2]){tmp=[r[i]];break;}r=tmp;}ret=r;}t=t.replace(re2,"");}}if(t){var val=jQuery.filter(t,r);ret=r=val.r;t=jQuery.trim(val.t);}}if(t)ret=[];if(ret&&context==ret[0])ret.shift();done=jQuery.merge(done,ret);return done;},classFilter:function(r,m,not){m=" "+m+" ";var tmp=[];for(var i=0;r[i];i++){var pass=(" "+r[i].className+" ").indexOf(m)>=0;if(!not&&pass||not&&!pass)tmp.push(r[i]);}return tmp;},filter:function(t,r,not){var last;while(t&&t!=last){last=t;var p=jQuery.parse,m;for(var i=0;p[i];i++){m=p[i].exec(t);if(m){t=t.substring(m[0].length);m[2]=m[2].replace(/\\/g,"");break;}}if(!m)break;if(m[1]==":"&&m[2]=="not")r=isSimple.test(m[3])?jQuery.filter(m[3],r,true).r:jQuery(r).not(m[3]);else if(m[1]==".")r=jQuery.classFilter(r,m[2],not);else if(m[1]=="["){var tmp=[],type=m[3];for(var i=0,rl=r.length;i<rl;i++){var a=r[i],z=a[jQuery.props[m[2]]||m[2]];if(z==null||/href|src|selected/.test(m[2]))z=jQuery.attr(a,m[2])||'';if((type==""&&!!z||type=="="&&z==m[5]||type=="!="&&z!=m[5]||type=="^="&&z&&!z.indexOf(m[5])||type=="$="&&z.substr(z.length-m[5].length)==m[5]||(type=="*="||type=="~=")&&z.indexOf(m[5])>=0)^not)tmp.push(a);}r=tmp;}else if(m[1]==":"&&m[2]=="nth-child"){var merge={},tmp=[],test=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(m[3]=="even"&&"2n"||m[3]=="odd"&&"2n+1"||!/\D/.test(m[3])&&"0n+"+m[3]||m[3]),first=(test[1]+(test[2]||1))-0,last=test[3]-0;for(var i=0,rl=r.length;i<rl;i++){var node=r[i],parentNode=node.parentNode,id=jQuery.data(parentNode);if(!merge[id]){var c=1;for(var n=parentNode.firstChild;n;n=n.nextSibling)if(n.nodeType==1)n.nodeIndex=c++;merge[id]=true;}var add=false;if(first==0){if(node.nodeIndex==last)add=true;}else if((node.nodeIndex-last)%first==0&&(node.nodeIndex-last)/first>=0)add=true;if(add^not)tmp.push(node);}r=tmp;}else{var fn=jQuery.expr[m[1]];if(typeof fn=="object")fn=fn[m[2]];if(typeof fn=="string")fn=eval("false||function(a,i){return "+fn+";}");r=jQuery.grep(r,function(elem,i){return fn(elem,i,m,r);},not);}}return{r:r,t:t};},dir:function(elem,dir){var matched=[],cur=elem[dir];while(cur&&cur!=document){if(cur.nodeType==1)matched.push(cur);cur=cur[dir];}return matched;},nth:function(cur,result,dir,elem){result=result||1;var num=0;for(;cur;cur=cur[dir])if(cur.nodeType==1&&++num==result)break;return cur;},sibling:function(n,elem){var r=[];for(;n;n=n.nextSibling){if(n.nodeType==1&&n!=elem)r.push(n);}return r;}});jQuery.event={add:function(elem,types,handler,data){if(elem.nodeType==3||elem.nodeType==8)return;if(jQuery.browser.msie&&elem.setInterval)elem=window;if(!handler.guid)handler.guid=this.guid++;if(data!=undefined){var fn=handler;handler=this.proxy(fn,function(){return fn.apply(this,arguments);});handler.data=data;}var events=jQuery.data(elem,"events")||jQuery.data(elem,"events",{}),handle=jQuery.data(elem,"handle")||jQuery.data(elem,"handle",function(){if(typeof jQuery!="undefined"&&!jQuery.event.triggered)return jQuery.event.handle.apply(arguments.callee.elem,arguments);});handle.elem=elem;jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];handler.type=parts[1];var handlers=events[type];if(!handlers){handlers=events[type]={};if(!jQuery.event.special[type]||jQuery.event.special[type].setup.call(elem)===false){if(elem.addEventListener)elem.addEventListener(type,handle,false);else if(elem.attachEvent)elem.attachEvent("on"+type,handle);}}handlers[handler.guid]=handler;jQuery.event.global[type]=true;});elem=null;},guid:1,global:{},remove:function(elem,types,handler){if(elem.nodeType==3||elem.nodeType==8)return;var events=jQuery.data(elem,"events"),ret,index;if(events){if(types==undefined||(typeof types=="string"&&types.charAt(0)=="."))for(var type in events)this.remove(elem,type+(types||""));else{if(types.type){handler=types.handler;types=types.type;}jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];if(events[type]){if(handler)delete events[type][handler.guid];else
-for(handler in events[type])if(!parts[1]||events[type][handler].type==parts[1])delete events[type][handler];for(ret in events[type])break;if(!ret){if(!jQuery.event.special[type]||jQuery.event.special[type].teardown.call(elem)===false){if(elem.removeEventListener)elem.removeEventListener(type,jQuery.data(elem,"handle"),false);else if(elem.detachEvent)elem.detachEvent("on"+type,jQuery.data(elem,"handle"));}ret=null;delete events[type];}}});}for(ret in events)break;if(!ret){var handle=jQuery.data(elem,"handle");if(handle)handle.elem=null;jQuery.removeData(elem,"events");jQuery.removeData(elem,"handle");}}},trigger:function(type,data,elem,donative,extra){data=jQuery.makeArray(data);if(type.indexOf("!")>=0){type=type.slice(0,-1);var exclusive=true;}if(!elem){if(this.global[type])jQuery("*").add([window,document]).trigger(type,data);}else{if(elem.nodeType==3||elem.nodeType==8)return undefined;var val,ret,fn=jQuery.isFunction(elem[type]||null),event=!data[0]||!data[0].preventDefault;if(event){data.unshift({type:type,target:elem,preventDefault:function(){},stopPropagation:function(){},timeStamp:now()});data[0][expando]=true;}data[0].type=type;if(exclusive)data[0].exclusive=true;var handle=jQuery.data(elem,"handle");if(handle)val=handle.apply(elem,data);if((!fn||(jQuery.nodeName(elem,'a')&&type=="click"))&&elem["on"+type]&&elem["on"+type].apply(elem,data)===false)val=false;if(event)data.shift();if(extra&&jQuery.isFunction(extra)){ret=extra.apply(elem,val==null?data:data.concat(val));if(ret!==undefined)val=ret;}if(fn&&donative!==false&&val!==false&&!(jQuery.nodeName(elem,'a')&&type=="click")){this.triggered=true;try{elem[type]();}catch(e){}}this.triggered=false;}return val;},handle:function(event){var val,ret,namespace,all,handlers;event=arguments[0]=jQuery.event.fix(event||window.event);namespace=event.type.split(".");event.type=namespace[0];namespace=namespace[1];all=!namespace&&!event.exclusive;handlers=(jQuery.data(this,"events")||{})[event.type];for(var j in handlers){var handler=handlers[j];if(all||handler.type==namespace){event.handler=handler;event.data=handler.data;ret=handler.apply(this,arguments);if(val!==false)val=ret;if(ret===false){event.preventDefault();event.stopPropagation();}}}return val;},fix:function(event){if(event[expando]==true)return event;var originalEvent=event;event={originalEvent:originalEvent};var props="altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");for(var i=props.length;i;i--)event[props[i]]=originalEvent[props[i]];event[expando]=true;event.preventDefault=function(){if(originalEvent.preventDefault)originalEvent.preventDefault();originalEvent.returnValue=false;};event.stopPropagation=function(){if(originalEvent.stopPropagation)originalEvent.stopPropagation();originalEvent.cancelBubble=true;};event.timeStamp=event.timeStamp||now();if(!event.target)event.target=event.srcElement||document;if(event.target.nodeType==3)event.target=event.target.parentNode;if(!event.relatedTarget&&event.fromElement)event.relatedTarget=event.fromElement==event.target?event.toElement:event.fromElement;if(event.pageX==null&&event.clientX!=null){var doc=document.documentElement,body=document.body;event.pageX=event.clientX+(doc&&doc.scrollLeft||body&&body.scrollLeft||0)-(doc.clientLeft||0);event.pageY=event.clientY+(doc&&doc.scrollTop||body&&body.scrollTop||0)-(doc.clientTop||0);}if(!event.which&&((event.charCode||event.charCode===0)?event.charCode:event.keyCode))event.which=event.charCode||event.keyCode;if(!event.metaKey&&event.ctrlKey)event.metaKey=event.ctrlKey;if(!event.which&&event.button)event.which=(event.button&1?1:(event.button&2?3:(event.button&4?2:0)));return event;},proxy:function(fn,proxy){proxy.guid=fn.guid=fn.guid||proxy.guid||this.guid++;return proxy;},special:{ready:{setup:function(){bindReady();return;},teardown:function(){return;}},mouseenter:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseover",jQuery.event.special.mouseenter.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseover",jQuery.event.special.mouseenter.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseenter";return jQuery.event.handle.apply(this,arguments);}},mouseleave:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseout",jQuery.event.special.mouseleave.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseout",jQuery.event.special.mouseleave.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseleave";return jQuery.event.handle.apply(this,arguments);}}}};jQuery.fn.extend({bind:function(type,data,fn){return type=="unload"?this.one(type,data,fn):this.each(function(){jQuery.event.add(this,type,fn||data,fn&&data);});},one:function(type,data,fn){var one=jQuery.event.proxy(fn||data,function(event){jQuery(this).unbind(event,one);return(fn||data).apply(this,arguments);});return this.each(function(){jQuery.event.add(this,type,one,fn&&data);});},unbind:function(type,fn){return this.each(function(){jQuery.event.remove(this,type,fn);});},trigger:function(type,data,fn){return this.each(function(){jQuery.event.trigger(type,data,this,true,fn);});},triggerHandler:function(type,data,fn){return this[0]&&jQuery.event.trigger(type,data,this[0],false,fn);},toggle:function(fn){var args=arguments,i=1;while(i<args.length)jQuery.event.proxy(fn,args[i++]);return this.click(jQuery.event.proxy(fn,function(event){this.lastToggle=(this.lastToggle||0)%i;event.preventDefault();return args[this.lastToggle++].apply(this,arguments)||false;}));},hover:function(fnOver,fnOut){return this.bind('mouseenter',fnOver).bind('mouseleave',fnOut);},ready:function(fn){bindReady();if(jQuery.isReady)fn.call(document,jQuery);else
-jQuery.readyList.push(function(){return fn.call(this,jQuery);});return this;}});jQuery.extend({isReady:false,readyList:[],ready:function(){if(!jQuery.isReady){jQuery.isReady=true;if(jQuery.readyList){jQuery.each(jQuery.readyList,function(){this.call(document);});jQuery.readyList=null;}jQuery(document).triggerHandler("ready");}}});var readyBound=false;function bindReady(){if(readyBound)return;readyBound=true;if(document.addEventListener&&!jQuery.browser.opera)document.addEventListener("DOMContentLoaded",jQuery.ready,false);if(jQuery.browser.msie&&window==top)(function(){if(jQuery.isReady)return;try{document.documentElement.doScroll("left");}catch(error){setTimeout(arguments.callee,0);return;}jQuery.ready();})();if(jQuery.browser.opera)document.addEventListener("DOMContentLoaded",function(){if(jQuery.isReady)return;for(var i=0;i<document.styleSheets.length;i++)if(document.styleSheets[i].disabled){setTimeout(arguments.callee,0);return;}jQuery.ready();},false);if(jQuery.browser.safari){var numStyles;(function(){if(jQuery.isReady)return;if(document.readyState!="loaded"&&document.readyState!="complete"){setTimeout(arguments.callee,0);return;}if(numStyles===undefined)numStyles=jQuery("style, link[rel=stylesheet]").length;if(document.styleSheets.length!=numStyles){setTimeout(arguments.callee,0);return;}jQuery.ready();})();}jQuery.event.add(window,"load",jQuery.ready);}jQuery.each(("blur,focus,load,resize,scroll,unload,click,dblclick,"+"mousedown,mouseup,mousemove,mouseover,mouseout,change,select,"+"submit,keydown,keypress,keyup,error").split(","),function(i,name){jQuery.fn[name]=function(fn){return fn?this.bind(name,fn):this.trigger(name);};});var withinElement=function(event,elem){var parent=event.relatedTarget;while(parent&&parent!=elem)try{parent=parent.parentNode;}catch(error){parent=elem;}return parent==elem;};jQuery(window).bind("unload",function(){jQuery("*").add(document).unbind();});jQuery.fn.extend({_load:jQuery.fn.load,load:function(url,params,callback){if(typeof url!='string')return this._load(url);var off=url.indexOf(" ");if(off>=0){var selector=url.slice(off,url.length);url=url.slice(0,off);}callback=callback||function(){};var type="GET";if(params)if(jQuery.isFunction(params)){callback=params;params=null;}else{params=jQuery.param(params);type="POST";}var self=this;jQuery.ajax({url:url,type:type,dataType:"html",data:params,complete:function(res,status){if(status=="success"||status=="notmodified")self.html(selector?jQuery("<div/>").append(res.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(selector):res.responseText);self.each(callback,[res.responseText,status,res]);}});return this;},serialize:function(){return jQuery.param(this.serializeArray());},serializeArray:function(){return this.map(function(){return jQuery.nodeName(this,"form")?jQuery.makeArray(this.elements):this;}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type));}).map(function(i,elem){var val=jQuery(this).val();return val==null?null:val.constructor==Array?jQuery.map(val,function(val,i){return{name:elem.name,value:val};}):{name:elem.name,value:val};}).get();}});jQuery.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(i,o){jQuery.fn[o]=function(f){return this.bind(o,f);};});var jsc=now();jQuery.extend({get:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data=null;}return jQuery.ajax({type:"GET",url:url,data:data,success:callback,dataType:type});},getScript:function(url,callback){return jQuery.get(url,null,callback,"script");},getJSON:function(url,data,callback){return jQuery.get(url,data,callback,"json");},post:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data={};}return jQuery.ajax({type:"POST",url:url,data:data,success:callback,dataType:type});},ajaxSetup:function(settings){jQuery.extend(jQuery.ajaxSettings,settings);},ajaxSettings:{url:location.href,global:true,type:"GET",timeout:0,contentType:"application/x-www-form-urlencoded",processData:true,async:true,data:null,username:null,password:null,accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(s){s=jQuery.extend(true,s,jQuery.extend(true,{},jQuery.ajaxSettings,s));var jsonp,jsre=/=\?(&|$)/g,status,data,type=s.type.toUpperCase();if(s.data&&s.processData&&typeof s.data!="string")s.data=jQuery.param(s.data);if(s.dataType=="jsonp"){if(type=="GET"){if(!s.url.match(jsre))s.url+=(s.url.match(/\?/)?"&":"?")+(s.jsonp||"callback")+"=?";}else if(!s.data||!s.data.match(jsre))s.data=(s.data?s.data+"&":"")+(s.jsonp||"callback")+"=?";s.dataType="json";}if(s.dataType=="json"&&(s.data&&s.data.match(jsre)||s.url.match(jsre))){jsonp="jsonp"+jsc++;if(s.data)s.data=(s.data+"").replace(jsre,"="+jsonp+"$1");s.url=s.url.replace(jsre,"="+jsonp+"$1");s.dataType="script";window[jsonp]=function(tmp){data=tmp;success();complete();window[jsonp]=undefined;try{delete window[jsonp];}catch(e){}if(head)head.removeChild(script);};}if(s.dataType=="script"&&s.cache==null)s.cache=false;if(s.cache===false&&type=="GET"){var ts=now();var ret=s.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+ts+"$2");s.url=ret+((ret==s.url)?(s.url.match(/\?/)?"&":"?")+"_="+ts:"");}if(s.data&&type=="GET"){s.url+=(s.url.match(/\?/)?"&":"?")+s.data;s.data=null;}if(s.global&&!jQuery.active++)jQuery.event.trigger("ajaxStart");var remote=/^(?:\w+:)?\/\/([^\/?#]+)/;if(s.dataType=="script"&&type=="GET"&&remote.test(s.url)&&remote.exec(s.url)[1]!=location.host){var head=document.getElementsByTagName("head")[0];var script=document.createElement("script");script.src=s.url;if(s.scriptCharset)script.charset=s.scriptCharset;if(!jsonp){var done=false;script.onload=script.onreadystatechange=function(){if(!done&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){done=true;success();complete();head.removeChild(script);}};}head.appendChild(script);return undefined;}var requestDone=false;var xhr=window.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest();if(s.username)xhr.open(type,s.url,s.async,s.username,s.password);else
-xhr.open(type,s.url,s.async);try{if(s.data)xhr.setRequestHeader("Content-Type",s.contentType);if(s.ifModified)xhr.setRequestHeader("If-Modified-Since",jQuery.lastModified[s.url]||"Thu, 01 Jan 1970 00:00:00 GMT");xhr.setRequestHeader("X-Requested-With","XMLHttpRequest");xhr.setRequestHeader("Accept",s.dataType&&s.accepts[s.dataType]?s.accepts[s.dataType]+", */*":s.accepts._default);}catch(e){}if(s.beforeSend&&s.beforeSend(xhr,s)===false){s.global&&jQuery.active--;xhr.abort();return false;}if(s.global)jQuery.event.trigger("ajaxSend",[xhr,s]);var onreadystatechange=function(isTimeout){if(!requestDone&&xhr&&(xhr.readyState==4||isTimeout=="timeout")){requestDone=true;if(ival){clearInterval(ival);ival=null;}status=isTimeout=="timeout"&&"timeout"||!jQuery.httpSuccess(xhr)&&"error"||s.ifModified&&jQuery.httpNotModified(xhr,s.url)&&"notmodified"||"success";if(status=="success"){try{data=jQuery.httpData(xhr,s.dataType,s.dataFilter);}catch(e){status="parsererror";}}if(status=="success"){var modRes;try{modRes=xhr.getResponseHeader("Last-Modified");}catch(e){}if(s.ifModified&&modRes)jQuery.lastModified[s.url]=modRes;if(!jsonp)success();}else
-jQuery.handleError(s,xhr,status);complete();if(s.async)xhr=null;}};if(s.async){var ival=setInterval(onreadystatechange,13);if(s.timeout>0)setTimeout(function(){if(xhr){xhr.abort();if(!requestDone)onreadystatechange("timeout");}},s.timeout);}try{xhr.send(s.data);}catch(e){jQuery.handleError(s,xhr,null,e);}if(!s.async)onreadystatechange();function success(){if(s.success)s.success(data,status);if(s.global)jQuery.event.trigger("ajaxSuccess",[xhr,s]);}function complete(){if(s.complete)s.complete(xhr,status);if(s.global)jQuery.event.trigger("ajaxComplete",[xhr,s]);if(s.global&&!--jQuery.active)jQuery.event.trigger("ajaxStop");}return xhr;},handleError:function(s,xhr,status,e){if(s.error)s.error(xhr,status,e);if(s.global)jQuery.event.trigger("ajaxError",[xhr,s,e]);},active:0,httpSuccess:function(xhr){try{return!xhr.status&&location.protocol=="file:"||(xhr.status>=200&&xhr.status<300)||xhr.status==304||xhr.status==1223||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpNotModified:function(xhr,url){try{var xhrRes=xhr.getResponseHeader("Last-Modified");return xhr.status==304||xhrRes==jQuery.lastModified[url]||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpData:function(xhr,type,filter){var ct=xhr.getResponseHeader("content-type"),xml=type=="xml"||!type&&ct&&ct.indexOf("xml")>=0,data=xml?xhr.responseXML:xhr.responseText;if(xml&&data.documentElement.tagName=="parsererror")throw"parsererror";if(filter)data=filter(data,type);if(type=="script")jQuery.globalEval(data);if(type=="json")data=eval("("+data+")");return data;},param:function(a){var s=[];if(a.constructor==Array||a.jquery)jQuery.each(a,function(){s.push(encodeURIComponent(this.name)+"="+encodeURIComponent(this.value));});else
-for(var j in a)if(a[j]&&a[j].constructor==Array)jQuery.each(a[j],function(){s.push(encodeURIComponent(j)+"="+encodeURIComponent(this));});else
-s.push(encodeURIComponent(j)+"="+encodeURIComponent(jQuery.isFunction(a[j])?a[j]():a[j]));return s.join("&").replace(/%20/g,"+");}});jQuery.fn.extend({show:function(speed,callback){return speed?this.animate({height:"show",width:"show",opacity:"show"},speed,callback):this.filter(":hidden").each(function(){this.style.display=this.oldblock||"";if(jQuery.css(this,"display")=="none"){var elem=jQuery("<"+this.tagName+" />").appendTo("body");this.style.display=elem.css("display");if(this.style.display=="none")this.style.display="block";elem.remove();}}).end();},hide:function(speed,callback){return speed?this.animate({height:"hide",width:"hide",opacity:"hide"},speed,callback):this.filter(":visible").each(function(){this.oldblock=this.oldblock||jQuery.css(this,"display");this.style.display="none";}).end();},_toggle:jQuery.fn.toggle,toggle:function(fn,fn2){return jQuery.isFunction(fn)&&jQuery.isFunction(fn2)?this._toggle.apply(this,arguments):fn?this.animate({height:"toggle",width:"toggle",opacity:"toggle"},fn,fn2):this.each(function(){jQuery(this)[jQuery(this).is(":hidden")?"show":"hide"]();});},slideDown:function(speed,callback){return this.animate({height:"show"},speed,callback);},slideUp:function(speed,callback){return this.animate({height:"hide"},speed,callback);},slideToggle:function(speed,callback){return this.animate({height:"toggle"},speed,callback);},fadeIn:function(speed,callback){return this.animate({opacity:"show"},speed,callback);},fadeOut:function(speed,callback){return this.animate({opacity:"hide"},speed,callback);},fadeTo:function(speed,to,callback){return this.animate({opacity:to},speed,callback);},animate:function(prop,speed,easing,callback){var optall=jQuery.speed(speed,easing,callback);return this[optall.queue===false?"each":"queue"](function(){if(this.nodeType!=1)return false;var opt=jQuery.extend({},optall),p,hidden=jQuery(this).is(":hidden"),self=this;for(p in prop){if(prop[p]=="hide"&&hidden||prop[p]=="show"&&!hidden)return opt.complete.call(this);if(p=="height"||p=="width"){opt.display=jQuery.css(this,"display");opt.overflow=this.style.overflow;}}if(opt.overflow!=null)this.style.overflow="hidden";opt.curAnim=jQuery.extend({},prop);jQuery.each(prop,function(name,val){var e=new jQuery.fx(self,opt,name);if(/toggle|show|hide/.test(val))e[val=="toggle"?hidden?"show":"hide":val](prop);else{var parts=val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),start=e.cur(true)||0;if(parts){var end=parseFloat(parts[2]),unit=parts[3]||"px";if(unit!="px"){self.style[name]=(end||1)+unit;start=((end||1)/e.cur(true))*start;self.style[name]=start+unit;}if(parts[1])end=((parts[1]=="-="?-1:1)*end)+start;e.custom(start,end,unit);}else
-e.custom(start,val,"");}});return true;});},queue:function(type,fn){if(jQuery.isFunction(type)||(type&&type.constructor==Array)){fn=type;type="fx";}if(!type||(typeof type=="string"&&!fn))return queue(this[0],type);return this.each(function(){if(fn.constructor==Array)queue(this,type,fn);else{queue(this,type).push(fn);if(queue(this,type).length==1)fn.call(this);}});},stop:function(clearQueue,gotoEnd){var timers=jQuery.timers;if(clearQueue)this.queue([]);this.each(function(){for(var i=timers.length-1;i>=0;i--)if(timers[i].elem==this){if(gotoEnd)timers[i](true);timers.splice(i,1);}});if(!gotoEnd)this.dequeue();return this;}});var queue=function(elem,type,array){if(elem){type=type||"fx";var q=jQuery.data(elem,type+"queue");if(!q||array)q=jQuery.data(elem,type+"queue",jQuery.makeArray(array));}return q;};jQuery.fn.dequeue=function(type){type=type||"fx";return this.each(function(){var q=queue(this,type);q.shift();if(q.length)q[0].call(this);});};jQuery.extend({speed:function(speed,easing,fn){var opt=speed&&speed.constructor==Object?speed:{complete:fn||!fn&&easing||jQuery.isFunction(speed)&&speed,duration:speed,easing:fn&&easing||easing&&easing.constructor!=Function&&easing};opt.duration=(opt.duration&&opt.duration.constructor==Number?opt.duration:jQuery.fx.speeds[opt.duration])||jQuery.fx.speeds.def;opt.old=opt.complete;opt.complete=function(){if(opt.queue!==false)jQuery(this).dequeue();if(jQuery.isFunction(opt.old))opt.old.call(this);};return opt;},easing:{linear:function(p,n,firstNum,diff){return firstNum+diff*p;},swing:function(p,n,firstNum,diff){return((-Math.cos(p*Math.PI)/2)+0.5)*diff+firstNum;}},timers:[],timerId:null,fx:function(elem,options,prop){this.options=options;this.elem=elem;this.prop=prop;if(!options.orig)options.orig={};}});jQuery.fx.prototype={update:function(){if(this.options.step)this.options.step.call(this.elem,this.now,this);(jQuery.fx.step[this.prop]||jQuery.fx.step._default)(this);if(this.prop=="height"||this.prop=="width")this.elem.style.display="block";},cur:function(force){if(this.elem[this.prop]!=null&&this.elem.style[this.prop]==null)return this.elem[this.prop];var r=parseFloat(jQuery.css(this.elem,this.prop,force));return r&&r>-10000?r:parseFloat(jQuery.curCSS(this.elem,this.prop))||0;},custom:function(from,to,unit){this.startTime=now();this.start=from;this.end=to;this.unit=unit||this.unit||"px";this.now=this.start;this.pos=this.state=0;this.update();var self=this;function t(gotoEnd){return self.step(gotoEnd);}t.elem=this.elem;jQuery.timers.push(t);if(jQuery.timerId==null){jQuery.timerId=setInterval(function(){var timers=jQuery.timers;for(var i=0;i<timers.length;i++)if(!timers[i]())timers.splice(i--,1);if(!timers.length){clearInterval(jQuery.timerId);jQuery.timerId=null;}},13);}},show:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.show=true;this.custom(0,this.cur());if(this.prop=="width"||this.prop=="height")this.elem.style[this.prop]="1px";jQuery(this.elem).show();},hide:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0);},step:function(gotoEnd){var t=now();if(gotoEnd||t>this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var done=true;for(var i in this.options.curAnim)if(this.options.curAnim[i]!==true)done=false;if(done){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(jQuery.css(this.elem,"display")=="none")this.elem.style.display="block";}if(this.options.hide)this.elem.style.display="none";if(this.options.hide||this.options.show)for(var p in this.options.curAnim)jQuery.attr(this.elem.style,p,this.options.orig[p]);}if(done)this.options.complete.call(this.elem);return false;}else{var n=t-this.startTime;this.state=n/this.options.duration;this.pos=jQuery.easing[this.options.easing||(jQuery.easing.swing?"swing":"linear")](this.state,n,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update();}return true;}};jQuery.extend(jQuery.fx,{speeds:{slow:600,fast:200,def:400},step:{scrollLeft:function(fx){fx.elem.scrollLeft=fx.now;},scrollTop:function(fx){fx.elem.scrollTop=fx.now;},opacity:function(fx){jQuery.attr(fx.elem.style,"opacity",fx.now);},_default:function(fx){fx.elem.style[fx.prop]=fx.now+fx.unit;}}});jQuery.fn.offset=function(){var left=0,top=0,elem=this[0],results;if(elem)with(jQuery.browser){var parent=elem.parentNode,offsetChild=elem,offsetParent=elem.offsetParent,doc=elem.ownerDocument,safari2=safari&&parseInt(version)<522&&!/adobeair/i.test(userAgent),css=jQuery.curCSS,fixed=css(elem,"position")=="fixed";if(elem.getBoundingClientRect){var box=elem.getBoundingClientRect();add(box.left+Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),box.top+Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));add(-doc.documentElement.clientLeft,-doc.documentElement.clientTop);}else{add(elem.offsetLeft,elem.offsetTop);while(offsetParent){add(offsetParent.offsetLeft,offsetParent.offsetTop);if(mozilla&&!/^t(able|d|h)$/i.test(offsetParent.tagName)||safari&&!safari2)border(offsetParent);if(!fixed&&css(offsetParent,"position")=="fixed")fixed=true;offsetChild=/^body$/i.test(offsetParent.tagName)?offsetChild:offsetParent;offsetParent=offsetParent.offsetParent;}while(parent&&parent.tagName&&!/^body|html$/i.test(parent.tagName)){if(!/^inline|table.*$/i.test(css(parent,"display")))add(-parent.scrollLeft,-parent.scrollTop);if(mozilla&&css(parent,"overflow")!="visible")border(parent);parent=parent.parentNode;}if((safari2&&(fixed||css(offsetChild,"position")=="absolute"))||(mozilla&&css(offsetChild,"position")!="absolute"))add(-doc.body.offsetLeft,-doc.body.offsetTop);if(fixed)add(Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));}results={top:top,left:left};}function border(elem){add(jQuery.curCSS(elem,"borderLeftWidth",true),jQuery.curCSS(elem,"borderTopWidth",true));}function add(l,t){left+=parseInt(l,10)||0;top+=parseInt(t,10)||0;}return results;};jQuery.fn.extend({position:function(){var left=0,top=0,results;if(this[0]){var offsetParent=this.offsetParent(),offset=this.offset(),parentOffset=/^body|html$/i.test(offsetParent[0].tagName)?{top:0,left:0}:offsetParent.offset();offset.top-=num(this,'marginTop');offset.left-=num(this,'marginLeft');parentOffset.top+=num(offsetParent,'borderTopWidth');parentOffset.left+=num(offsetParent,'borderLeftWidth');results={top:offset.top-parentOffset.top,left:offset.left-parentOffset.left};}return results;},offsetParent:function(){var offsetParent=this[0].offsetParent;while(offsetParent&&(!/^body|html$/i.test(offsetParent.tagName)&&jQuery.css(offsetParent,'position')=='static'))offsetParent=offsetParent.offsetParent;return jQuery(offsetParent);}});jQuery.each(['Left','Top'],function(i,name){var method='scroll'+name;jQuery.fn[method]=function(val){if(!this[0])return;return val!=undefined?this.each(function(){this==window||this==document?window.scrollTo(!i?val:jQuery(window).scrollLeft(),i?val:jQuery(window).scrollTop()):this[method]=val;}):this[0]==window||this[0]==document?self[i?'pageYOffset':'pageXOffset']||jQuery.boxModel&&document.documentElement[method]||document.body[method]:this[0][method];};});jQuery.each(["Height","Width"],function(i,name){var tl=i?"Left":"Top",br=i?"Right":"Bottom";jQuery.fn["inner"+name]=function(){return this[name.toLowerCase()]()+num(this,"padding"+tl)+num(this,"padding"+br);};jQuery.fn["outer"+name]=function(margin){return this["inner"+name]()+num(this,"border"+tl+"Width")+num(this,"border"+br+"Width")+(margin?num(this,"margin"+tl)+num(this,"margin"+br):0);};});})();
\ No newline at end of file
diff --git a/content/info/how-to-mirror.md b/content/mirrors.md
similarity index 92%
rename from content/info/how-to-mirror.md
rename to content/mirrors.md
index 5a410f1..19d72d7 100644
--- a/content/info/how-to-mirror.md
+++ b/content/mirrors.md
@@ -1,4 +1,4 @@
-Title: How to become a mirror!
+Title: Apache Mirrors
license: https://www.apache.org/licenses/LICENSE-2.0
diff --git a/content/security/committers.md b/content/security/committers.md
index e1d7d1f..87e051c 100644
--- a/content/security/committers.md
+++ b/content/security/committers.md
@@ -20,7 +20,7 @@
Projects with known, published vulnerabilities should provide information
about those vulnerabilities on pages such as the
-[httpd security pages](http://httpd.apache.org/security_report.html). Provide a clear link on the project's home page to the
+[httpd security pages](https://httpd.apache.org/security_report.html). Provide a clear link on the project's home page to the
security information.
Do not enter details of security vulnerabilities in a project's public bug
@@ -29,7 +29,7 @@
<h2 id="lists">Project-specific security mailing lists<a class="headerlink" href="#lists" title="Permanent link">¶</a></h2>
-Projects may wish to create a project-specific security mailing list.
+Projects may wish to create a [project-specific security mailing list](projects.md).
These take the name in the form `security@project.apache.org`, like
`security@tomcat.apache.org`.
@@ -99,7 +99,7 @@
11. The project team documents the details of the vulnerability and the fix on the
internal portal. The portal generates draft announcement texts. For
an example of an announcement see [Tomcat's announcement of
-CVE-2008-2370](http://markmail.org/message/w7mdjdxeqius7d6l). The
+CVE-2008-2370](https://markmail.org/message/w7mdjdxeqius7d6l). The
level of detail to include in the report is a matter of
judgement. Generally, reports should contain enough information to
enable people to assess the risk the vulnerability poses for
@@ -136,7 +136,7 @@
c. the project's security list (or `security@apache.org` if the project does
not have a dedicated security list)
- d. `oss-security@lists.openwall.com` ([subscription not required](http://oss-security.openwall.org/wiki/mailing-lists)).
+ d. `oss-security@lists.openwall.com` ([subscription not required](https://oss-security.openwall.org/wiki/mailing-lists)).
This is the first point that any information regarding the vulnerability is made public.
diff --git a/content/security/projects.md b/content/security/projects.md
index a83dbf7..ec3ed0b 100644
--- a/content/security/projects.md
+++ b/content/security/projects.md
@@ -15,7 +15,7 @@
| [Apache Ant](https://ant.apache.org/security.html) | [Apache Security Team](mailto:security@apache.org) |
| [Apache Camel](https://camel.apache.org/security/) | [Apache Security Team](mailto:security@apache.org) |
| [Apache CloudStack](https://cloudstack.apache.org/security.html) | [Apache Security Team](mailto:security@apache.org) |
-| [Apache Commons](https://commons.apache.org/security.html) | [Apache Security Team](mailto:security@apache.org) |
+| [Apache Commons](https://commons.apache.org/security.html) | [Apache Commons Security Team](mailto:security@commons.apache.org) |
| Apache CouchDB | [Apache CouchDB Security Team](mailto:security@couchdb.apache.org) |
| [Apache Fineract](https://cwiki.apache.org/confluence/display/FINERACT/Apache+Fineract+Security+Report) | [Apache Fineract Security Team](mailto:security@fineract.apache.org) |
| [Apache Geronimo](https://geronimo.apache.org/security-reports.html) | [Apache Geronimo Security Team](mailto:security@geronimo.apache.org) |
@@ -25,10 +25,12 @@
| [Apache HTTP Server](https://httpd.apache.org/security_report.html) | [Apache HTTP Server Security Team](mailto:security@httpd.apache.org) |
| Apache Ignite | [Apache Ignite Security Team](mailto:security@ignite.apache.org) |
| Apache Jackrabbit | [Apache Jackrabbit Security Team](mailto:security@jackrabbit.apache.org) |
+| [Apache JMeter](https://jmeter.apache.org/security.html) | [Apache Security Team](mailto:security@apache.org) |
| [Apache Kafka](https://kafka.apache.org/project-security.html) | [Apache Kafka Security Team](mailto:security@kafka.apache.org) |
| [Apache Libcloud](https://libcloud.apache.org/security.html) | [Apache Libcloud Security Team](mailto:security@libcloud.apache.org) |
| Apache Logging | [Apache Logging Security Team](mailto:security@logging.apache.org) |
| Apache Lucene | [Apache Lucene Security Team](mailto:security@lucene.apache.org) |
+| [Apache Maven](https://maven.apache.org/security.html) | [Apache Security Team](mailto:security@apache.org) |
| Apache Metron | [Apache Metron Security Team](mailto:security@metron.apache.org) |
| [Apache NiFi](https://nifi.apache.org/security.html) | [Apache NiFi Security Team](mailto:security@nifi.apache.org) |
| [Apache OFBiz](https://ofbiz.apache.org/download.html#security) | [Apache OFBiz Security Team](mailto:security@ofbiz.apache.org) |
@@ -52,6 +54,6 @@
| Apache Traffic Server | [Apache Traffic Server Security Team](mailto:security@trafficserver.apache.org) |
| Apache Trafodion | [Apache Trafodion Security Team](mailto:security@trafodion.apache.org) |
| [Apache XML Graphics](https://xmlgraphics.apache.org/security.html) | [Apache Security Team](mailto:security@apache.org) |
-| Apache Zeppelin | [Apache Zeppelin Security Team](mailto:security@zeppelin.apache.org) |
+| [Apache Zeppelin](https://zeppelin.apache.org/security.html) | [Apache Zeppelin Security Team](mailto:security@zeppelin.apache.org) |
| [Apache ZooKeeper](https://zookeeper.apache.org/security.html) | [Apache ZooKeeper Security Team](mailto:security@zookeeper.apache.org) |
diff --git a/theme/apache/templates/base.html b/theme/apache/templates/base.html
index f3c33e7..865539c 100644
--- a/theme/apache/templates/base.html
+++ b/theme/apache/templates/base.html
@@ -213,15 +213,15 @@
<!-- / Navigation -->
<header id="main-header" class="container">
<div class="sideImg">
- <!-- <a class="visible-home" href="https://events.apache.org/"><img class="img-responsive" style="width: 100%;" src="/events/current-event-125x125.png" alt="Apache Events"></a> -->
<a class="visible-home" href="https://events.apache.org/x/current-event.html">
- <img class="img-responsive" style="width: 125px;" src="https://www.apachecon.com/event-images/default-square-light.png" alt="ApacheCon 2021 Coming Soon!" />
+ <img class="img-responsive" style="width: 125px;" src="/events/current-event-125x125.png" alt="Apache Events"/>
+<!-- STALE: <img class="img-responsive" style="width: 125px;" src="https://www.apachecon.com/event-images/default-square-light.png" alt="ApacheCon 2021 Coming Soon!" /> -->
</a>
<a class="hidden-home" href="/"><img class="img-responsive" src="/img/asf-estd-1999-logo.jpg" alt="The Apache Software Foundation"></a>
</div>
<div class="main">
<img class="img-responsive center-block visible-home" src="/img/asf-estd-1999-logo.jpg" alt="Apache 20th Anniversary Logo">
- <h2 class="text-center">Community-led development "The Apache Way"</h2>
+
<ul class="nav navbar-nav navbar-justified">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button">Projects <span class="caret hidden-sm"></span></a>
@@ -298,9 +298,7 @@
</li>
</ul>
</div>
- <div class="sideImg">
- <a href="/foundation/contributing.html"><img class="img-responsive" src="/img/support-apache.jpg" alt="Apache Support Logo" /></a>
- </div>
+
</header>
<main id="maincontent">
{% if page.bodytag is not defined %}<div class="container">{% endif %}
