X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2FLICENSE;h=029ef03d390b4f493dec6021780fdbab2fa8f1a5;hb=3c2d4428d624993a5a4761363637018092ee127c;hp=acd46e9114bdd44060bf65151308d433a5af4d71;hpb=d54db6839926e0af0385c079c37afe5dfb52fa58;p=bacula%2Fbacula

diff --git a/bacula/LICENSE b/bacula/LICENSE
index acd46e9114..029ef03d39 100644
--- a/bacula/LICENSE
+++ b/bacula/LICENSE
@@ -4,17 +4,19 @@ The name Bacula is a registered trademark.
 ===================================
 
 License:
-For the most part, Bacula is licensed under the GPL version 2 or greater         
-and any code that is Copyright Kern Sibbald and John Walker with the GPL
+For the most part, Bacula is licensed under the GPL version 2         
+and any code that is Copyright Kern Sibbald and John Walker or
+Copyright Kern Sibbald (after November 2004) with the GPL
 indication is so licensed, but with the following four additions:
 
 Linking: 
-Bacula may be linked with any libraries permitted under
-the GPL, or with any non-GPLed libraries, including OpenSSL, that
-are required for its proper functioning, providing the source
-code of those non-GPLed libraries is non-proprietary and freely available.
+Bacula may be linked with any libraries permitted under the GPL,
+or with any non-GPLed libraries, including OpenSSL, that are
+required for its proper functioning, providing the source code of
+those non-GPLed libraries is non-proprietary and freely
+available to the public.
 
-Termination for Patent Action: 
+Termination for IP or Patent Action: 
 In addition to the termination clause specified in the GPL, this
 license shall terminate automatically and you may no longer
 exercise any of the rights granted to you by this license as of
@@ -49,12 +51,12 @@ the copyright license set forth in this Agreement.
 
 Code falling under the above conditions will be marked as follows:
 
-   Copyright (C) 2000-2004 Kern Sibbald and John Walker
+   Copyright (C) 2000-2005 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
    published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -68,13 +70,17 @@ Code falling under the above conditions will be marked as follows:
 
 =====================================
 
-The entire GPL is reproduced in the html manual distributed with this 
-source and can also be found online on the GNU web site as well
+The entire GPL is reproduced in the manuals distributed with the
+Bacula documentation and can also be found online on the GNU web site as well
 as at www.bacula.org.
 
-In addition to the GPL, there are parts of Bacula that are licensed
-under the LGPL so that they may be used in proprietary code to interface
-with Bacula. 
+Certain parts of the Bacula software are licensed by their
+copyright holder(s) undert the GPL with no modifications.  These
+software files are clearly marked as such.
+
+There are parts of Bacula that are licensed under the LGPL so
+that they may be used in proprietary code to interface with
+Bacula.
 
 Finally there are parts of Bacula that are in the public domain.