Tweaks from Dan

[bacula/docs] / docs / manuals / en / misc / license.tex

diff --git a/docs/manuals/en/misc/license.tex b/docs/manuals/en/misc/license.tex
index 744cea2ca265a71383d0cea805ce373af337b35c..cf9dcf0a65101168421f9e56684e0de5a96a7cf0 100644 (file)
--- a/docs/manuals/en/misc/license.tex
+++ b/docs/manuals/en/misc/license.tex
@@ -28,13 +28,13 @@ at \elink{http://www.bacula.org}{http://www.bacula.org}.
 \index[general]{GPL }
 
 The vast bulk of the source code is released under the 
-\ilink{GNU General Public License version 2.}{GplChapter}.
+\ilink{GNU Affero General Public License version 3.}{GplChapter}.
 
-Most of this code is copyrighted: Copyright \copyright 2000-2009
+Most of this code is copyrighted: Copyright \copyright 2000-2010
 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 GPLv2 license.
+under different licenses which are compatible with the Bacula AGPLv3 license.
 
 \section{LGPL}
 \index[general]{LGPL }
@@ -57,14 +57,6 @@ to the public domain.  E.g.  md5.c, SQLite.
 Bacula\raisebox{.6ex}{\textsuperscript{\textregistered}} is a registered
 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
-released.  The use of the name Bacula is restricted to software systems
-that agree exactly with the program presented here. If you have made
-modifications to the Bacula source code that alter in any significant
-way the way the program functions, you may not distribute it using the
-Bacula name.
-
 \section{Fiduciary License Agreement}
 \index[general]{Fiduciary License Agreement }
 Developers who have contributed significant changes to the Bacula code