Add updated license to doc

diff --git a/docs/manuals/en/main/main.tex b/docs/manuals/en/main/main.tex
index 3148b0508bafe1d13745dd90f361bc2c21034380..e9d8b8da07cd13bcc892230951b9f0a4f23c9c0b 100644 (file)
--- a/docs/manuals/en/main/main.tex
+++ b/docs/manuals/en/main/main.tex
@@ -128,6 +128,7 @@ lscape,pdfpages,ifthen,setspace,colortbl,diagbox}
 %\appendix
 \begin{appendices}
 \begin{small}
+\include{license}
 \include{projects}
 \include{thanks}
 \include{bugs}

diff --git a/docs/manuals/licences/license.tex b/docs/manuals/licences/license.tex
index 27134620aa54c723816a4a427024ee63071af763..8341503dc4c7b70dc2a36a388bdd8cc701a061cc 100644 (file)
--- a/docs/manuals/licences/license.tex
+++ b/docs/manuals/licences/license.tex
@@ -7,31 +7,41 @@ There are a number of different licenses that are used in Bacula.
 If you have a printed copy of this manual, the details of each of
 the licenses referred to in this chapter can be found in the
 online version of the manual at
-\elink{http://www.bacula.org}{http://www.bacula.org}.
+\elink{http://www.baculasystems.com}{http://www.baculasystems.com}.
+
+\section{Bacula Systems}
+This manual and the associated code is the Enterprise version of
+Bacula.  Some of it may be marked as copyright Free Software
+Foundation Europe e.V. but due to the dual copyright, for these
+purposes it is copyright Bacula Systems SA with All
+Rights Reserved. In addition, there
+are parts which are copyright Bacula Systems SA, and parts which
+contain Bacula Systems' trademarks.
+
+\smallskip
+All source code listed under Copyright Bacula Systems SA as well
+as all code falling under the dual license (see above) is
+available only to users with a valid Bacula Systems subscription
+agreement, and may not be redistributed without explicit written
+permission from Bacula Systems SA.
+
+\smallskip
+Portions may be copyrighted by other people.  These files are
+released under different licenses which are compatible with the
+Bacula AGPLv3 license.
+
+\section{Trademarks}
+\index[general]{Trademarks}
+The name Bacula Systems(R) and associated logos as well as other
+trademarks are trademarks of Bacula Systems SA. Absent a written
+agreement or other express permission, Bacula Systems SA does not
+allow third parties to use its trademarks.  Absent such a written
+trademark license from Bacula Systems, a third party does not
+have the right to distribute anything (code, binaries,
+...) containing Bacula Systems trademarks.
 
-\section{FDL}
-\index[general]{FDL}
-
-The GNU Free Documentation License (FDL) is used for this manual,
-which is a free and open license. This means that you may freely
-reproduce it and even make changes to it. However, rather than
-distribute your own version of this manual, we would much prefer
-if you would send any corrections or changes to the Bacula project.
-
-The most recent version of the manual can always be found online
-at \elink{http://www.bacula.org}{http://www.bacula.org}.
-
-\section{GPL}
-\index[general]{GPL}
-
-The vast bulk of the source code is released under the
-\ilink{GNU Affero General Public License version 3.}{GplChapter}.
-
-Most of this code is copyrighted: Copyright \copyright 2000-\the\year{}
-Free Software Foundation Europe e.V.
-
-Portions may be copyrighted by other people.  These files are released
-under different licenses which are compatible with the Bacula AGPLv3 license.
+Bacula\raisebox{.3ex}{\textsuperscript{\textregistered}} is a registered
+trademark of Kern Sibbald.
 
 \section{LGPL}
 \index[general]{LGPL}
@@ -45,23 +55,18 @@ programs to interface to Bacula.
 \index[general]{Domain!Public}
 \index[general]{Public Domain}
 
-Some of the Bacula code, or code that Bacula references, has been released
-to the public domain.  E.g.  md5.c, SQLite.
-
-\section{Trademark}
-\index[general]{Trademark}
-
-Bacula\raisebox{.3ex}{\textsuperscript{\textregistered}} is a registered
-trademark of Kern Sibbald.
+Some of the Bacula code, or code that Bacula references, has been
+released to the public domain.  E.g.  md5.c, SQLite.
 
 \section{Fiduciary License Agreement}
 \index[general]{Fiduciary License Agreement}
-Developers who have contributed significant changes to the Bacula code
-should have signed a Fiduciary License Agreement (FLA), which
-guarantees them the right to use the code they have developed, and also
-ensures that the Free Software Foundation Europe (and thus the Bacula
-project) has the rights to the code.  This Fiduciary License Agreement
-is found on the Bacula web site at:
+Developers who have contributed significant changes to the Bacula
+code should have signed a Fiduciary License Agreement (FLA),
+which guarantees them the right to use the code they have
+developed, and also ensures that the Free Software Foundation
+Europe (and thus the Bacula project and Bacula Systems) has the
+rights to the code.  This Fiduciary License Agreement is found on
+the Bacula web site at:
 
 \elink{http://www.bacula.org/en/FLA-bacula.en.pdf}{http://www.bacula.org/en/FLA-bacula.en.pdf}