From 3384dd764f388632b006f57097d717acc31a38be Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Fri, 1 Mar 2013 12:37:38 +0100 Subject: [PATCH] Add updated license to doc --- docs/manuals/en/main/main.tex | 1 + docs/manuals/licences/license.tex | 81 ++++++++++++++++--------------- 2 files changed, 44 insertions(+), 38 deletions(-) diff --git a/docs/manuals/en/main/main.tex b/docs/manuals/en/main/main.tex index 3148b050..e9d8b8da 100644 --- 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 27134620..8341503d 100644 --- 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} -- 2.39.5