Update

[bacula/docs] / docs / manual / license.tex

diff --git a/docs/manual/license.tex b/docs/manual/license.tex
index 4b1a2f7a10e8ee8841c67d6e9d0352f7bf471638..e6d37e197413fd87b90e5ca0ed412ae48c32ab60 100644 (file)
--- a/docs/manual/license.tex
+++ b/docs/manual/license.tex
@@ -7,33 +7,37 @@
 \index[general]{Bacula Copyright, Trademark, and Licenses}
 
 There are a number of different licenses that are used in Bacula. 
 \index[general]{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}{\url{http://www.bacula.org}}.

 
 \section{FDL}
 \index[general]{FDL }
 
 
 \section{FDL}
 \index[general]{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}{\url{http://www.bacula.org}}.
+

 % TODO: Point to appendix that has it
 
 
 \section{GPL}
 \index[general]{GPL }
 
 % TODO: Point to appendix that has it
 
 
 \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. 
-
-Most of this code is copyrighted: Copyright \copyright 2000-2006
+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-2007

 Free Software Foundation Europe e.V.
 
 Portions may be copyrighted by other people (ATT, the Free Software
 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 }
 
 \section{LGPL}
 \index[general]{LGPL }


@@ -54,7 +58,7 @@ to the public domain.  E.g.  md5.c, SQLite.
 \index[general]{Trademark }
 
 Bacula\raisebox{.6ex}{\textsuperscript{\textregistered}} is a registered
 \index[general]{Trademark }
 
 Bacula\raisebox{.6ex}{\textsuperscript{\textregistered}} is a registered

-trademark of John Walker. 
+trademark of Kern Sibbald. 

 
 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
 
 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


@@ -70,7 +74,7 @@ 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:
 
 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}
+\elink{http://www.bacula.org/en/FLA-bacula.en.pdf}{\url{http://www.bacula.org/en/FLA-bacula.en.pdf}}

 
 and should be filled out then sent to:
 
 
 and should be filled out then sent to: