You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2005/11/04 16:09:08 UTC

svn commit: r330821 - /incubator/roller/trunk/README.txt

Author: snoopdave
Date: Fri Nov  4 07:09:06 2005
New Revision: 330821

URL: http://svn.apache.org/viewcvs?rev=330821&view=rev
Log:
Added additional disclaimers about incubation and LGPL compoenents

Modified:
    incubator/roller/trunk/README.txt

Modified: incubator/roller/trunk/README.txt
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/README.txt?rev=330821&r1=330820&r2=330821&view=diff
==============================================================================
--- incubator/roller/trunk/README.txt (original)
+++ incubator/roller/trunk/README.txt Fri Nov  4 07:09:06 2005
@@ -1,46 +1,48 @@
 
 README.txt
 
+   This release of Roller is not endorsed by the Apache Software Foundation.
+   Roller is in the Apache Incubator and is not an official Apache project.
+
    To install Roller, follow the instructions in the Installation Guide:
-   http://www.rollerweblogger.org/wiki/Wiki.jsp?page=InstallGuide
+   http://rollerweblogger.org/wiki/Wiki.jsp?page=InstallationGuide
 
    To use Roller, follow the instructions in the Users Guide:
-   http://www.rollerweblogger.org/wiki/Wiki.jsp?page=UserGuide
+   http://rollerweblogger.org/wiki/Wiki.jsp?page=UserGuide
           
-CREDITS AND COPYRIGHT NOTICES
+LICENSING TERMS
+  
+   Roller is licensed under the Apache Licence Version 2.0, please see 
+   the included file LICENSE.txt for the full text of the Apache license.
 
-   Roller is Copyright (c) by 
-       David M Johnson
-       Anil Gangolli
-       Allen Gilliland
-       Mindaguas Idzelis 
-       Lance Lanvandowska 
-       Matt Raible 
-       Jaap Van Der Molen 
-       Henri Yandell
-       Sun Microsystems, Inc
-   	   
-   Roller is licensed under the Apache Licence Version 2.0
+   PLEASE NOTE: Roller contains some components that are licensed under the 
+   terms of the LGPL licence.
 
-   Additionally, Roller contains a number of third-party software components
-   and source code from other open source projects with compatible licenses.
+CREDITS AND COPYRIGHT NOTICES
 
-   * Roller includes software developed by the Apache Software Foundation
-     Copyright (c) The Apache Software Foundation. 
-     All rights reserved.
+   Roller is Copyright (c) 2002-2005 by the Roller project members: 
+           David M Johnson
+           Lance Lanvandowska 
+           Matt Raible 
+           Anil Gangolli
+           Henri Yandell
+           Allen Gilliland
+       Past members:  	 
+           Mindaguas Idzelis 
+           Jaap Van Der Molen 
 
-   * Roller includes software developed by The OpenSymphony Group
-     Copyright (c) The OpenSymphony Group. All rights reserved.
+THIRD PARTY COMPONENTS
 
-   * Roller includes the Hibernate persistence library, LGPL license
+   * Roller includes software developed by the Apache Software Foundation
+     Copyright (c) The Apache Software Foundation. All rights reserved.
 
    * Roller includes code from Blojsom
-        Copyright (c) David A. Czarnecki & Mark Lussier.
-        All rights reserved
+        Copyright (c) David A. Czarnecki & Mark Lussier. All rights reserved
         
    * Roller includes JDOM
-        Copyright (c) Brett McLaughlin & Jason Hunter.
-        All rights reserved.
+        Copyright (c) Brett McLaughlin & Jason Hunter. All rights reserved.
+
+   * Roller includes the Hibernate persistence library, LGPL license
 
    * Roller includes the Ekit HTML editor by Howard Kistler, LGPL license
    
@@ -50,8 +52,4 @@
 
    * Roller includes the Radeox Wiki Engine, LGPL license
 
-   * Roller includes Jython
-     Copyright (c) Jython Developers
-
-    
-
+   * Roller includes Jython, Copyright (c) Jython Developers