From d7842fb1c2d3f567474f76922f8ed25342acd044 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Thu, 7 Jun 2007 14:47:33 +0000 Subject: [PATCH] Update code copyright info --- docs/home-page/pages/makedonation.php | 1 + docs/manual-fr/license.tex | 86 +++++++++++++++++---------- docs/manual/license.tex | 14 +---- 3 files changed, 59 insertions(+), 42 deletions(-) diff --git a/docs/home-page/pages/makedonation.php b/docs/home-page/pages/makedonation.php index c488bbb2..58025911 100644 --- a/docs/home-page/pages/makedonation.php +++ b/docs/home-page/pages/makedonation.php @@ -6,6 +6,7 @@ + diff --git a/docs/manual-fr/license.tex b/docs/manual-fr/license.tex index 4902752b..688ed4d3 100644 --- a/docs/manual-fr/license.tex +++ b/docs/manual-fr/license.tex @@ -1,74 +1,98 @@ %% %% -\section*{Bacula Copyright, Trademark, and Licenses} -\label{_ChapterStart29} +\chapter{Bacula Copyright, Trademark, and Licenses} +\label{LicenseChapter} \index[general]{Licenses!Bacula Copyright Trademark} \index[general]{Bacula Copyright, Trademark, and Licenses} -\addcontentsline{toc}{section}{Bacula Copyright, Trademark, and Licenses} 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}. -\subsection*{FDL} +\section{FDL} \index[general]{FDL } -\addcontentsline{toc}{subsection}{FDL} -The GNU Free Documentation License (FDL) is used for this manual. +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}. +% TODO: Point to appendix that has it -\subsection*{GPL} + +\section{GPL} \index[general]{GPL } -\addcontentsline{toc}{subsection}{GPL} - -The vast bulk of the source code is released under a modified version of the -\ilink{GNU General Public License version 2.}{_ChapterStart20} The -modifications (actually additions) are described in the source file LICENSE, -and their purpose is not to alter the essential qualities of the GPL but to -permit more freedom in linking certain third party software supposedly non-GPL -compatible, and to clarify -contributors IP and Copyright claims and non-infringment intentions. The -details and governing text are in the file LICENSE in the main source -directory. + +The vast bulk of the source code is released under the +\ilink{GNU General Public License version 2.}{GplChapter}. Most of this code is copyrighted: Copyright \copyright 2000-2006 Free Software Foundation Europe e.V. Portions may be copyrighted by other people (ATT, the Free Software -Foundation, ...). Generally these portions are released under a -non-modified GPL 2 license. +Foundation, ...). These files are released under the GPL license. -\subsection*{LGPL} +\section{LGPL} \index[general]{LGPL } -\addcontentsline{toc}{subsection}{LGPL} Some of the Bacula library source code is released under the -\ilink{GNU Lesser General Public License.}{_ChapterStart49} This +\ilink{GNU Lesser General Public License.}{LesserChapter} This permits third parties to use these parts of our code in their proprietary programs to interface to Bacula. -\subsection*{Public Domain} +\section{Public Domain} \index[general]{Domain!Public } \index[general]{Public Domain } -\addcontentsline{toc}{subsection}{Public Domain} Some of the Bacula code, or code that Bacula references, has been released to the public domain. E.g. md5.c, SQLite. -\subsection*{Trademark} +\section{Trademark} \index[general]{Trademark } -\addcontentsline{toc}{subsection}{Trademark} -Bacula\raisebox{.6ex}{\textsuperscript{\textregistered}}is a registered -trademark of Kern Sibbald and John Walker. +Bacula\raisebox{.6ex}{\textsuperscript{\textregistered}} is a registered +trademark of John Walker. We have trademarked the Bacula name to ensure that any program using the name Bacula will be exactly compatible with the program that we have released. The use of the name Bacula is restricted to software systems that agree exactly with the program presented here. -\subsection*{Disclaimer} +\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: + +\elink{http://www.bacula.org/FLA-bacula.en.pdf}{http://www.bacula.org/FLA-bacula.en.pdf} + +and should be filled out then sent to: + +\begin{quote} + Free Software Foundation Europe \\ + Freedom Task Force \\ + Sumatrastrasse 25 \\ + 8006 Z\"{u}rich \\ + Switzerland \\ +\end{quote} + +Please note that the above address is different from the officially +registered office mentioned in the document. When you send in such a +complete document, please notify me: kern at sibbald dot com. + + +\section{Disclaimer} \index[general]{Disclaimer } -\addcontentsline{toc}{subsection}{Disclaimer} NO WARRANTY diff --git a/docs/manual/license.tex b/docs/manual/license.tex index 17e68fa7..688ed4d3 100644 --- a/docs/manual/license.tex +++ b/docs/manual/license.tex @@ -30,22 +30,14 @@ 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 a modified version of the -\ilink{GNU General Public License version 2.}{GplChapter} The -modifications (actually additions) are described in the source file LICENSE, -and their purpose is not to alter the essential qualities of the GPL but to -permit more freedom in linking certain third party software supposedly non-GPL -compatible, and to clarify -contributors IP and Copyright claims and non-infringment intentions. The -details and governing text are in the file LICENSE in the main source -directory. +The vast bulk of the source code is released under the +\ilink{GNU General Public License version 2.}{GplChapter}. Most of this code is copyrighted: Copyright \copyright 2000-2006 Free Software Foundation Europe e.V. Portions may be copyrighted by other people (ATT, the Free Software -Foundation, ...). Generally these portions are released under a -non-modified GPL 2 license. +Foundation, ...). These files are released under the GPL license. \section{LGPL} \index[general]{LGPL } -- 2.39.5