Update copyright

diff --git a/docs/developers/imagename_translations b/docs/developers/imagename_translations
index 186c14f01e392209853e7c59860d04c40592ce6c..8cfd734f7fa7d6a891137719bda194ed0838a896 100644 (file)
--- a/docs/developers/imagename_translations
+++ b/docs/developers/imagename_translations
@@ -1,2 +1,2 @@
-img2.png\ 1./smartall.eps
 img1.png\ 1./bacula-logo.eps
+img2.png\ 1./smartall.eps

diff --git a/docs/home-page/fr/pages/documentation.php b/docs/home-page/fr/pages/documentation.php
index 14233c89b0315952613d79af041b02683a543467..e4426bf41b56e0fce52209fb4257b950cfbbdaec 100644 (file)
--- a/docs/home-page/fr/pages/documentation.php
+++ b/docs/home-page/fr/pages/documentation.php
@@ -67,6 +67,9 @@
           <br>(Guide pour les développeurs Bacula)</li>
         <li><a href="/developers.pdf">Guide du développeur
           (PDF - Anglais)</a><br>(Guide pour les développeurs Bacula)</li>
+          <li><a href="<? echo $spath ?>/FLA-bacula.en.pdf">(PDF Anglis -- FLA</a>
+          <br>(Fiduciary License Agreement pour les développeurs Bacula)</li>
+
       </ul>
     </td>
   </tr>

diff --git a/docs/home-page/pages/documentation.php b/docs/home-page/pages/documentation.php
index 7bc105f4b651a0d18fce60bb0aecc7f8fb704223..71310282fe838eb8df5ef60e8f9b8d9c30320f55 100644 (file)
--- a/docs/home-page/pages/documentation.php
+++ b/docs/home-page/pages/documentation.php
@@ -56,6 +56,8 @@
       <br>(Guide for Bacula developers)</li>
       <li> <a href="<? echo $spath ?>/developers.pdf">PDF Developer's Guide</a>
       <br>(Guide for Bacula developers)</li>
+      <li><a href="<? echo $spath ?>/FLA-bacula.en.pdf">PDF FLA</a>
+      <br>(Developer's Fiduciary License Agreement)</li>
       </ul>
      </td>
    </tr>

diff --git a/docs/manual/license.tex b/docs/manual/license.tex
index 8f89703cb27cb2cceb2529616d3cd00d1f55606c..b690c3f38a7b2b665940a2035945673c9c7ea5f9 100644 (file)
--- a/docs/manual/license.tex
+++ b/docs/manual/license.tex
@@ -66,6 +66,33 @@ 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*{Fiduciary License Agreement}
+\index[general]{Fiduciary License Agreement }
+\addcontentsline{toc}{subsection}{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{verbatim}
+     Free Software Foundation Europe
+     Freedom Task Force
+     Sumatrastrasse 25
+     8006 Zürich
+     Switzerland
+\end{verbatim}
+
+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.
+
+
 \subsection*{Disclaimer}
 \index[general]{Disclaimer }
 \addcontentsline{toc}{subsection}{Disclaimer}