Merge pull request #90 from apache/merge-feature-pages
Merge feature pages
diff --git a/.htaccess b/.htaccess
index 39c4ce5..0c8b288 100644
--- a/.htaccess
+++ b/.htaccess
@@ -11,4 +11,5 @@
RedirectMatch ^/shiro-guice(.*) /static/current/shiro-guice/$1
RedirectMatch ^/shiro-web(.*) /static/current/shiro-web/$1
RedirectMatch ^/spring.html /spring-framework.html
-RedirectMatch ^/features-overview.html /features.html
\ No newline at end of file
+RedirectMatch ^/features-overview.html /features.html
+RedirectMatch ^/contribute.html /how-to-contribute.html
diff --git a/contribute.md b/contribute.md
deleted file mode 100644
index 3e8ea4f..0000000
--- a/contribute.md
+++ /dev/null
@@ -1,18 +0,0 @@
-<a name="Contribute-ContributingtoApacheShiro"></a>
-#Contributing to Apache Shiro
-
-Apache Shiro is a non-profit project and relies on your help and contributions in order to evolve and improve.
-
-At the Shiro project we make it easy for anyone to join our great community and lend a hand. We welcome any help you can offer inlcuding help with documentation, identifying bugs, providing answers on the user mailing list, and providing helpful code improvements.
-
-Below are helpful links on how you can contribute to the Apache Shiro project.
-
-* [How to Contribute](how-to-contribute.html) - A starting point for contributing to the Shiro project
-
-* [Shiro Issue Tracker](https://issues.apache.org/jira/issues/?jql=project%20%3D%20SHIRO%20AND%20status%20%3D%20Open%20ORDER%20BY%20priority%20DESC) - Once you're ready to contribute, this is a good place to see what needs to get done
-
-* [Donate to ASF](http://www.apache.org/foundation/sponsorship.html) - Shiro is a project under the Apache Software Foundation, a non-profit that relies on donations and community support
-
-* [Developer Resources](developer-resources.html) - Helpful information for anyone providing project help as a committer or contributor
-
-<input type="hidden" id="ghEditPage" value="contribute.md"></input>
diff --git a/navigation.md b/navigation.md
index c7774e4..8defa9d 100644
--- a/navigation.md
+++ b/navigation.md
@@ -17,7 +17,7 @@
* [Articles](articles.html)
* [API](http://shiro.apache.org/static/current/apidocs)
-* [Contribute](contribute.html)
+* [Contribute](how-to-contribute.html)
* [How to Contribute](how-to-contribute.html)
* [Donate to ASF](http://www.apache.org/foundation/sponsorship.html)
diff --git a/sitemap.xml b/sitemap.xml
index f8b1bfb..b4a9c8f 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -73,9 +73,6 @@
<loc>https://shiro.apache.org/configuration.html</loc>
</url>
<url>
- <loc>https://shiro.apache.org/contribute.html</loc>
- </url>
- <url>
<loc>https://shiro.apache.org/core.html</loc>
</url>
<url>
