You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by fl...@apache.org on 2011/08/21 20:32:46 UTC
svn commit: r1160030 - in /incubator/jspwiki/trunk: ChangeLog README
Author: florianh
Date: Sun Aug 21 18:32:46 2011
New Revision: 1160030
URL: http://svn.apache.org/viewvc?rev=1160030&view=rev
Log:
JSPWIKI-701 (Website must display disclaimer text)
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/README
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1160030&r1=1160029&r2=1160030&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Aug 21 18:32:46 2011
@@ -1,3 +1,8 @@
+2011-08-21 Florian Holeczek <fl...@apache.org>
+
+ * fixed JSPWIKI-701 (Website must display disclaimer text)
+ * no version bump
+
2011-08-07 Harry Metske <me...@apache.org>
* 3.0.0-svn-231
Modified: incubator/jspwiki/trunk/README
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/README?rev=1160030&r1=1160029&r2=1160030&view=diff
==============================================================================
--- incubator/jspwiki/trunk/README (original)
+++ incubator/jspwiki/trunk/README Sun Aug 21 18:32:46 2011
@@ -31,6 +31,19 @@ as well as very detailed access control
The license file can be found in LICENSE.
+
+ DISCLAIMER
+
+ Apache JSPWiki is an effort undergoing incubation at The Apache Software
+ Foundation (ASF), sponsored by the Apache Incubator.
+ Incubation is required of all newly accepted projects until a further
+ review indicates that the infrastructure, communications, and decision
+ making process have stabilized in a manner consistent with other successful
+ ASF projects. While incubation status is not necessarily a reflection of
+ the completeness or stability of the code, it does indicate that the
+ project has yet to be fully endorsed by the ASF.
+
+
Pre-requirements
----------------
@@ -76,10 +89,10 @@ engine. Just do the following:
container)
2) After you've installed the engine and checked that it works, you just
- make a subdirectory under $TOMCAT_HOME/webapps/.
- For example, if you want your application to be called 'wiki', just create a directory
- called 'wiki', then extract all files from the war file into that
- directory, preserving the directory structure.
+ make a subdirectory under $TOMCAT_HOME/webapps/.
+ For example, if you want your application to be called 'wiki', just create
+ a directory called 'wiki', then extract all files from the war file into
+ that directory, preserving the directory structure.
3) Point your browser at http://<myhost>/JSPWiki/Install.jsp
(Or, if you renamed it in the previous phase, use something like