Remove incorrecly placed openssl-compat.h

[bacula/bacula] / bacula / LICENSE-FAQ

diff --git a/bacula/LICENSE-FAQ b/bacula/LICENSE-FAQ
index 8d1cb5b0651c22ddb90112a1434fe096d0a7bc67..7911fb465044046c9fbd238519c44c1ecf5284ce 100644 (file)
--- a/bacula/LICENSE-FAQ
+++ b/bacula/LICENSE-FAQ
@@ -3,7 +3,7 @@
 
 Note: This file is not the Bacula Community (bacula.org) license,
 which you will find in the LICENSE file. This is a FAQ about the
-the Bacula AGPLv3 and the other third-party licenses used in certain
+Bacula AGPLv3 and the other third-party licenses used in certain
 source code files of the Bacula software.
 
 
@@ -15,7 +15,7 @@ the copyright was transferred to the Free Software Foundation Europe
 on 15 November 2006. The license was changed from GPLv2 to AGPLv3
 on 24 July 2010. The copyright Fiduciary License Agreement signed 
 with Kern Sibbald and the FSFE 15 November 2006 was terminated as
-of 3 March 2015.  Code subsequent to that date is 
+of 3 March 2015.  Code subsequent to 3 March 2015 is 
 Copyright, Kern Sibbald.
 
 Trademark:
@@ -38,7 +38,7 @@ License:
 To the best of our knowledge, all code used in Bacula, which is
 copyrighted by a third party, has licenses that are compatible
 with the OpenSSL license, and so given the exceptions that we have
-made to the AGPLv3 above, Bacula can be freely linked and distributed
+made to the AGPLv3 (in LICENSE), Bacula can be freely linked and distributed
 with the OpenSSL libraries, and in binary form with the Microsoft
 VSS libraries.
 
@@ -62,7 +62,8 @@ Each Contributor to Bacula represents that to its knowledge it has
 sufficient copyright rights in its Contribution, if any, to grant
 the copyright license set forth in this Agreement.
 
-Other Licenses used in some source files:
+Other Licenses used in some source files. Note, this list changes from
+time to time, so is not exhaustive:
 
 GPLv2 or later license:
  src/tools/bsmtp.c
@@ -79,12 +80,12 @@ GPLv2 or later license:
    *      The Regents of the University of California.  All rights reserved.
 
 Permissive licenses:
- Most Makefile.in, *.in, and script files are copyright LGPLv3 as noted
+ Most Makefile.in, *.in, and script files are copyright BSD 2-Clause as noted
  in each individual file.
 
  src/lib/crc32.c
-   Copyright (C) 2010 Joakim Tjernlund
-   Under LGPLv3 or later
+   Copyright (C) 2010-2015 Joakim Tjernlund
+   Under BSD 2-Clause
 
  src/lib/var.c/h
    **  OSSP var - Variable Expansion
@@ -111,11 +112,11 @@ Permissive licenses:
 
 Bacula can be enabled with data encryption and/or communications
 encryption. If this is the case, you will be including OpenSSL code that
-that contains cryptographic software written by Eric Young
+contains cryptographic software written by Eric Young
 (eay@cryptsoft.com) and also software written by Tim Hudson
 (tjh@cryptsoft.com).
 
-There are parts of Bacula that are licensed under the LGPL so
+There are parts of Bacula that are licensed under the BSD 2-Clause so
 that those files may be used in proprietary code to interface with
 Bacula.