Restore win32 dir from Branch-5.2 and update it

[bacula/bacula] / bacula / LICENSE-FAQ

diff --git a/bacula/LICENSE-FAQ b/bacula/LICENSE-FAQ
index a5e25839c67cefaccf1a7ee30636263ea871f234..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.
 
 
@@ -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
@@ -111,7 +112,7 @@ 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).