svn commit: r704155 - in /incubator/jspwiki/trunk: NOTICE README

[ja...@apache.org]

Author: jalkanen
Date: Mon Oct 13 09:29:12 2008
New Revision: 704155

URL: http://svn.apache.org/viewvc?rev=704155&view=rev
Log:
JSPWIKI-341: Updated to reflect latest 2.8 status.

Modified:
    incubator/jspwiki/trunk/NOTICE
    incubator/jspwiki/trunk/README

Modified: incubator/jspwiki/trunk/NOTICE
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/NOTICE?rev=704155&r1=704154&r2=704155&view=diff
==============================================================================
--- incubator/jspwiki/trunk/NOTICE (original)
+++ incubator/jspwiki/trunk/NOTICE Mon Oct 13 09:29:12 2008
@@ -50,3 +50,5 @@
 Slimbox, adapted for JSPWiki, original by Christophe Bleys. (see http://www.digitalia.be/software/slimbox) 
 
 Servlet-api Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
+
+search_highlight.js  Copyright (c) 2002  Stuart Langridge

Modified: incubator/jspwiki/trunk/README
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/README?rev=704155&r1=704154&r2=704155&view=diff
==============================================================================
--- incubator/jspwiki/trunk/README (original)
+++ incubator/jspwiki/trunk/README Mon Oct 13 09:29:12 2008
@@ -133,15 +133,15 @@
 recommend the VersioningFileProvider.
 
 All JSPWiki documentation is in the web; please see
-http://doc.jspwiki.org/2.6/wiki/WindowsInstall
+http://doc.jspwiki.org/2.8/wiki/WindowsInstall
 
 Upgrading from previous versions
 --------------------------------
 
-Please read ReleaseNotes.
+Please read ReleaseNotes and the UPGRADING document.
 
 All JSPWiki documentation is in the web; please see
-http://doc.jspwiki.org/2.6/
+http://doc.jspwiki.org/2.8/
 
 
 Configuring JSPWiki
@@ -155,7 +155,7 @@
 
 Also, there is a far more detailed documentation in the web:
 
-http://doc.jspwiki.org/2.6/
+http://doc.jspwiki.org/2.8/
 
 
 Where to go next aka. where is the rest of the documentation?
@@ -163,19 +163,9 @@
 
 The rest of the documentation is at
 
-http://doc.jspwiki.org/2.6/
+http://doc.jspwiki.org/2.8/
 
 
-Acknowledgements
-----------------
-
-This product includes software developed by the Apache Software Foundation 
-(http://www.apache.org/).  See doc/LICENCE.Apache for more information.
-
-This product includes software developed by the OpenSymphony Group
-(http://www.opensymphony.org/).  See doc/LICENSE.OpenSymphony for more
-information. 
-
 
 Contact
 -------
@@ -185,45 +175,3 @@
 
 The mailing list should also be your primary place to ask support questions.
 There are many wise and knowledgeable people on that list.
-
-
-LICENSES
-========
-
-The various Jakarta libraries are licensed under the Apache Public
-License.  See http://www.apache.org/LICENSE.txt
-
-The search_highlight.js script is licensed under the X11 (MIT)
-License:
-
-COPYRIGHT AND PERMISSION NOTICE
-
-Copyright (c) 2002  Stuart Langridge
-
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY
-SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
-