Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 74E7E200CC7 for ; Sat, 1 Jul 2017 18:46:54 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 73C95160BDF; Sat, 1 Jul 2017 16:46:54 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B9C4E160C05 for ; Sat, 1 Jul 2017 18:46:53 +0200 (CEST) Received: (qmail 73073 invoked by uid 500); 1 Jul 2017 16:46:52 -0000 Mailing-List: contact commits-help@jspwiki.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jspwiki.apache.org Delivered-To: mailing list commits@jspwiki.apache.org Received: (qmail 73040 invoked by uid 99); 1 Jul 2017 16:46:52 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Jul 2017 16:46:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1A2B4F21AB; Sat, 1 Jul 2017 16:46:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: juanpablo@apache.org To: commits@jspwiki.apache.org Date: Sat, 01 Jul 2017 16:46:59 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [09/11] jspwiki-site git commit: bringing in content from https://jspwiki-wiki.apache.org/Wiki.jsp?page=Main archived-at: Sat, 01 Jul 2017 16:46:54 -0000 bringing in content from https://jspwiki-wiki.apache.org/Wiki.jsp?page=Main Project: http://git-wip-us.apache.org/repos/asf/jspwiki-site/repo Commit: http://git-wip-us.apache.org/repos/asf/jspwiki-site/commit/32875055 Tree: http://git-wip-us.apache.org/repos/asf/jspwiki-site/tree/32875055 Diff: http://git-wip-us.apache.org/repos/asf/jspwiki-site/diff/32875055 Branch: refs/heads/jbake Commit: 32875055c6cfb8b70859c4cadd36f83bbac265aa Parents: 3e3b48c Author: Juan Pablo Santos Rodriguez Authored: Mon Jun 26 20:45:00 2017 +0200 Committer: Juan Pablo Santos Rodriguez Committed: Mon Jun 26 20:51:39 2017 +0200 ---------------------------------------------------------------------- src/main/jbake/content/index.md | 39 +++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/32875055/src/main/jbake/content/index.md ---------------------------------------------------------------------- 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 @@ status=published ~~~~~~ ## 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 @@ Some of its features include: * **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