From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 6 May 2014 06:46:14 +0000 (+0200)
Subject: Update LICENSE and LICENSE-FAQ
X-Git-Tag: Release-7.0.3~7
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2a82419fd23209b7b6126ac590bff745d19affd5;p=bacula%2Fbacula

Update LICENSE and LICENSE-FAQ
---

diff --git a/bacula/LICENSE b/bacula/LICENSE
index e2512f8655..ae5618b8dc 100644
--- a/bacula/LICENSE
+++ b/bacula/LICENSE
@@ -1,3 +1,6 @@
+
+             Last revision: 06 May 2014
+
 Bacula is licensed under the GNU Affero General Public License, version
 3.0 as published by the Free Software Foundation, Inc. ("AGPLv3").
 
@@ -50,13 +53,6 @@ AGPLv3 are as follows:
    the AGPLv3 in all respects for all of the code used other than for the
    Microsoft VSS code.
 
-3. As a special exception to the AGPLv3, the copyright holders 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 follow the AGPLv3 in all
-   respects for all of the code used other than for the Microsoft VSS code.
-
-
 ######################################################################
 The entire AGPL is below, in the manuals distributed with the Bacula
 documentation and can also be found online on the GNU web site at
diff --git a/bacula/LICENSE-FAQ b/bacula/LICENSE-FAQ
index 1e0767e6d8..f9026b2773 100644
--- a/bacula/LICENSE-FAQ
+++ b/bacula/LICENSE-FAQ
@@ -10,6 +10,15 @@ on 24 July 2010.
 Trademark:
 The name Bacula is a registered trademark of Kern Sibbald.
 
+"Fair use" of the trademark is permitted following standard customs
+that any prominent use (e.g.  cover of a book) or the first use of
+the name Bacula will include a trademark symbol.  If you fork the
+Bacula project and make any significant changes to the functionality
+of Bacula, to avoid confusion between your fork and Bacula, you must
+give your fork another name.  You are not required to remove all
+references to Bacula in the source code or "fair uses" in the
+documentation.
+
 ===================================
 
 What follows is information from the authors of the code: