fix bug 994

[bacula/bacula] / bacula / LICENSE

diff --git a/bacula/LICENSE b/bacula/LICENSE
index 83f25f9a71befc12fa70053d731ef90743ad3f0c..12d4c662a943d3eca6615832b8484790d2a4728c 100644 (file)
--- a/bacula/LICENSE
+++ b/bacula/LICENSE
@@ -13,7 +13,7 @@ License:
 For the most part, Bacula is licensed under the GPL version 2 this
 code is listed under Copyright Free Software Foundation Europe e.V.
 What follows is the addition(s) to the GPL version 2 license, that
-applys to code that is copyrighted by the Free Software Foundation
+applies to code that is copyrighted by the Free Software Foundation
 Europe e.V.
 
 Linking: 
@@ -23,6 +23,21 @@ project's "OpenSSL" library (or with modified versions of it that use
 the same license as the "OpenSSL" library), and distribute the linked
 executables.  You must obey the GNU General Public License in all
 respects for all of the code used other than "OpenSSL".
+
+As a special exception to the GPLv2, the Bacula Project gives
+permission to link the code of its release of the Bacula Win32 File
+daemon with the Microsoft supplied Volume Shadow Copy (VSS) libraries
+and distribute the linked executables.  You must obey the GNU General
+Public License in all respects for all of the code used other than for
+the Microsoft VSS code, where you must obey their license terms.
+
+The Bacula Project gives permission for plugins with GPLv2 compatible
+licenses to be loaded and distributed with the Bacula executables as
+long as the combined work is distributed under the terms listed in the 
+Bacula LICENSE file.  A full list of GPLv2 compatible licenses can be
+found at: http://www.fsf.org/licensing/licenses/.  If you wish to load
+or distribute plugins with different licensing terms please contact
+the Bacula Project at: license@bacula.org
              
 ===================================
 
@@ -36,7 +51,7 @@ with the OpenSSL license, and so with the exception that we have
 made to the GPLv2 above, Bacula can be freely linked and distributed
 with the OpenSSL libraries.
 
-IP rights:
+Intellectual Property rights:
 Recipient understands that although each Contributor grants the
 licenses to its Contributions set forth herein, no assurances are
 provided by any Contributor that the Program does not infringe