From de9f799a39645e581c7e9c8f54082a4ebf77aa09 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 28 May 2010 07:28:19 -0400
Subject: [PATCH] Clarify the use of GPLv2 and exclude skins from this license; the default skin is now licensed under a CC license

---
 skins/default/README |   22 ++++++++++++++++++++++
 README               |   15 ++++++++++-----
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/README b/README
index 634c794..d2a2342 100644
--- a/README
+++ b/README
@@ -20,24 +20,29 @@
 which are pure XHTML and CSS 2.
 
 This project includes other open-source classes/libraries from PEAR
-(http://pear.php.net), an IMAP library derrived from IlohaMail
+(http://pear.php.net), an IMAP library derived from IlohaMail
 the TinyMCE rich text editor, Googiespell library for spell checking
 or the HTML sanitizer by Frederic Motte.
 
-The current development skin uses icons designed by Stephen Horlander and Kevin 
+The current default skin uses icons designed by Stephen Horlander and Kevin 
 Gerich for Mozilla.org.
 
 
 Installation:
 -------------
-For detailed instructions on how to install RoundCube webmail on your server,
+For detailed instructions on how to install Roundcube webmail on your server,
 please refer to the INSTALL document in the same directory as this document.
 
 
 Licensing:
 ----------
-This product is distributed under the GPL. Please read through the file
-LICENSE for more information about our license.
+This product is distributed under the GNU General Public License Version 2.
+Please read through the file LICENSE for more information about our license.
+
+Even if skins might contain some programming work, they are not considered
+as a linked part of the application and therefore skins DO NOT fall under
+the provisions of the GPL license. See the README file located in the skins
+folder for details on the skin license.
 
 
 Contribution:
diff --git a/skins/default/README b/skins/default/README
new file mode 100644
index 0000000..9ba2128
--- /dev/null
+++ b/skins/default/README
@@ -0,0 +1,22 @@
+ROUNDCUBE WEBMAIL DEFAULT SKIN
+==============================
+
+This skin package contains the current development theme of the Roundcube
+Webmail software. It can be used, modified and redistributed according to
+the terms described in the LICENSE section.
+
+For information about building or modifiying Roundcube skins please visit
+http://trac.roundcube.net/wiki/Doc_Skins
+
+The theme uses icons originally designed by Stephen Horlander and Kevin Gerich
+for Mozilla.org. In case of redistribution giving credit to these artwork
+creators is mandatory.
+
+
+LICENSE
+-------
+The contents of this folder are subject to the Creative Commons
+Attribution-Noncommercial License. It is allowed to copy, distribute,
+transmit and to adapt the work for noncommercial purposes.
+See http://creativecommons.org/licenses/by-nc/3.0/ for details.
+

--
Gitblit v1.9.1