Add Mikael Kermorgant to contributors

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

diff --git a/docs/manuals/en/main/license.tex b/docs/manuals/en/main/license.tex
index d82ef61e1546eddf1fc601c763dc830281d44122..e99f778337823646939bb8e1dca8753a5c627719 100644 (file)
--- a/docs/manuals/en/main/license.tex
+++ b/docs/manuals/en/main/license.tex
@@ -12,11 +12,13 @@ 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}.
 
-\section{FDL}
-\index[general]{FDL }
+\section{CC-BY-SA}
+\index[general]{CC-BY-SA}
 
-The GNU Free Documentation License (FDL) is used for this manual,
-which is a free and open license. This means that you may freely   
+The \ilink{Creative Commons Attribution-ShareAlike 4.0 International
+License (CC-BY-SA)}{CCbySAChapter} is used for this manual,
+which is a free and open license. Though there are certain
+restrictions that come with this license you may in general 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.
@@ -28,13 +30,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{Affero GNU 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-2014
 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 }
@@ -103,3 +105,41 @@ OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR
 DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR
 A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH
 HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
+
+\section{Authors}
+The following people below have contributed to making this document what it
+is today:
+
+Alexandre Baron <balexfr at users dot sourceforge dot net>
+Arno Lehmann <arnol at users dot sourceforge dot net>
+Bastian Friedrich <bastian dot friedrich at collax dot com>
+Christopher S Hull <csh at raidersolutions dot com>
+Dan Langille
+Davide Franco <dfranco at dflc dot ch>
+Dirk H Bartley <dbartley at schupan dot com>
+Eric Bollengier <eric.bollengier at baculasystems dot com>
+Frank Sweetser
+James Harper bendigoit dot com dot au>
+Jeremy C Reed <jeremy-c-reed at users dot sourceforge dot net>
+Jose Herrera <herrerajs at yahoo dot com>
+Jo Simoens
+Juan Luis Francis <indpnday at users dot sourceforge dot net>
+Karl Cunningham <karlec at users dot sourceforge dot net>
+Kern Sibbald <kern at sibbald dot com>
+Landon Fuller <landonf at opendarwin dot org>
+Lucas Di Pentima
+Ludovic Strappazon
+Meno Abels
+Mikael Kermorgant <mikael dot kermorgant at gmail dot com>"
+Nicolas Boichat
+Peter Buschman
+Philippe Chauvat <philippe dot chauvat at baculasystems dot com>
+Philipp Storz
+Richard Mortimer <richm at oldelvet dot org dot uk>
+Robert Nelson <robertn at the-nelsons dot org>
+Scott Barninger
+Sebastien Guilbaud
+Thomas Glatthor
+Thomas Mueller <thomas at chaschperli dot ch>
+Thorsten Engel <thorsten dot engel at matrix-computer dot com>
+Victor Hugo dos Santos <victorhugops at users dot sourceforge dot net