bringing in content from https://jspwiki-wiki.apache.org/Wiki.jsp?page=Main
diff --git a/src/main/jbake/content/index.md b/src/main/jbake/content/index.md
index 9df530a..114fe8c 100755
--- a/src/main/jbake/content/index.md
+++ b/src/main/jbake/content/index.md
@@ -4,21 +4,26 @@
~~~~~~
## Welcome to Apache JSPWiki
-Apache JSPWiki is a leading open source WikiWiki engine, feature-rich and built around standard JEE components (Java, servlets, JSP).
+[Apache JSPWiki][] is a leading open source [WikiWiki][] engine, feature-rich and built around standard [JEE][] components (Java, servlets, JSP).
Some of its features include:
* WikiMarkup/Structured Text
* File attachments
* Templates support
- * Data storage through your choice of two WikiPage Providers, with the capability to create and plug in new ones
- * Security: fine grained control over authorization and authentication, yet simple to configure
- * Easy plugin interface
+ * Data storage through your choice of two [WikiPage Providers][], with the capability to create and plug in new ones
+ * [Security][]: fine grained control over authorization and authentication, yet simple to configure
+ * Easy [plugin][] and [page filter][] interfaces
* UTF-8 support
* JSP-based
- * Easy-ish installation
+ * Easy-ish [installation][]
* Page locking to prevent editing conflicts
* Support for Multiple Wikis
+ * [Custom User Preferences][]
+
+You can see who is using [JSPWiki today][], and the [WikiMatrix][] page shows you a comparison with other wiki's.
+
+JSPWiki is open-source software that is released under the Apache Public License. [https://jspwiki-wiki.apache.org]() serves as the platform for project collaboration. The JSPWiki community welcomes any help with the project. You don't need to be a software developer to get involved -- there are many other ways to contribute. See the [Getting Involved][] page for more details.
## Project status
@@ -35,6 +40,30 @@
* **01-Feb-2014:** Official [Apache JSPWiki 2.10.0 release][] is out!
+[Apache JSPWiki]: https://jspwiki.apache.org
+
+[WikiWiki]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=WikiWiki
+
+[JEE]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=JEE
+
+[Security]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=Wiki.Admin.Security
+
+[WikiPage Providers]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=WikiPageProviders
+
+[plugin]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=JSPWikiPlugin
+
+[page filter]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=WikiFilters
+
+[installation]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=Getting%20Started
+
+[Custom User Preferences]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CustomUserPreferences
+
+[JSPWiki today]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=JSPWikiSites
+
+[WikiMatrix]: http://www.wikimatrix.org/show/JSPWiki
+
+[Getting Involved]:https://jspwiki-wiki.apache.org/Wiki.jsp?page=Getting%20Involved
+
[Apache JSPWiki 2.10.0 release]: general/downloads.html
[Apache JSPWiki 2.10.1 release]: general/downloads.html
