Put up (second time) the new FLA and correct links

diff --git a/docs/home-page/en/LICENSE b/docs/home-page/en/LICENSE
index c1ec1a3897421814f5e48dee953a1157f14fef95..3154d226aa8f961e406b48f4831b280eab474695 100644 (file)
--- a/docs/home-page/en/LICENSE
+++ b/docs/home-page/en/LICENSE
@@ -1,7 +1,7 @@
 
 History:
 The original Bacula code was Copyright Kern Sibbald and John Walker.
-After November 2004, it became Copyright Kern Sibbald, and finally,
+After November 2004, it became Copyright Kern Sibbald, 
 the copyright was transferred to the Free Software Foundation Europe
 on 15 November 2006.
 
@@ -76,7 +76,7 @@ Code falling under the above conditions will be marked as follows:
 
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.

diff --git a/docs/home-page/en/inc/header.php b/docs/home-page/en/inc/header.php
index 1603d375ae9ce5b3d5d70c381cc0794583e6ccdb..cd33f6edcfa5956f71890bbbeb77e81e406808e7 100644 (file)
--- a/docs/home-page/en/inc/header.php
+++ b/docs/home-page/en/inc/header.php
@@ -122,16 +122,16 @@
            <li class="menuItem"> <a href="<? echo $spath ?>/?page=news"> News </a></li>
            <li class="menuItem"> <a href="<? echo $spath ?>/?page=screenshot"> Screenshots </a></li>
            <li class="menuItem"> <a href="<? echo $spath ?>/?page=home"> Bacula Home </a></li>
-           <li class="menuItem"> <a href="dev-manual/What_is_Bacula.html"> What is Bacula? </a> </li>
-           <li class="menuItem"> <a href="dev-manual/Current_State_Bacula.html"> Current State of Bacula </a> </li>
+           <li class="menuItem"> <a href="dev-manual/main/main/What_is_Bacula.html"> What is Bacula? </a> </li>
+           <li class="menuItem"> <a href="dev-manual/main/main/Current_State_Bacula.html"> Current State of Bacula </a> </li>
            <li class="menuItem"> <a href="<? echo $spath ?>/?page=testimonial"> Testimonials</a> </li>
            <li class="menuItem"> <a href="http://sourceforge.net/projects/bacula"> SF Project Page </a> </li>
-           <li class="menuItem"> <a href="dev-manual/System_Requirements.html"> Requirements </a> </li>
-           <li class="menuItem"> <a href="dev-manual/Supported_Operating_Systems.html"> Operating&nbsp;Systems </a> </li>
-           <li class="menuItem"> <a href="dev-manual/Supported_Tape_Drives.html"> Tapedrives </a> </li>
-           <li class="menuItem"> <a href="dev-manual/Supported_Autochangers.html"> Autochangers </a> </li>
-           <li class="menuItem"> <a href="dev-manual/Bacula_Copyri_Tradem_Licens.html"> License </a> </li>
-           <li class="menuItem"> <a href="<? echo $spath ?>/?page=fsfe"> FSFE License </a></li>
+           <li class="menuItem"> <a href="dev-manual/main/main/System_Requirements.html"> Requirements </a> </li>
+           <li class="menuItem"> <a href="dev-manual/main/main/Supported_Operating_Systems.html"> Operating&nbsp;Systems </a> </li>
+           <li class="menuItem"> <a href="dev-manual/main/main/Supported_Tape_Drives.html"> Tapedrives </a> </li>
+           <li class="menuItem"> <a href="dev-manual/main/main/Supported_Autochangers.html"> Autochangers </a> </li>
+           <li class="menuItem"> <a href="dev-manual/main/main/Bacula_Copyright_Trademark_.html"> License </a> </li>
+           <li class="menuItem"> <a href="<? echo $spath ?>/?page=fla"> FLA License </a></li>
            <li class="menuItem"> <a href="<? echo $spath ?>/?page=ermine"> Ermine </a></li>
            </ul>
         </div>

diff --git a/docs/home-page/en/pages/fla.php b/docs/home-page/en/pages/fla.php
new file mode 100644 (file)
index 0000000..e64b812
--- /dev/null
+++ b/docs/home-page/en/pages/fla.php
@@ -0,0 +1,63 @@
+<? require_once("inc/header.php"); ?>
+<table>
+  <tr>
+   <td class="contentTopic">
+   The Free Software License
+   </td>
+   </tr>
+
+   
+   <tr>
+     <td class="content">
+
+   The Bacula developers have assigned their copyrights to 
+   Kern Sibbald in a fiduciary relationship that permits Kern to
+   safeguard the Bacula software against abuse.
+   <p>
+   If you contribute more than a few lines of code or documentation to the
+   Bacula project, we ask you to complete the copyright Fiduciary License
+   Agreement (link provided below).  This is the same agreement that all
+   other developers have signed to transfer their copyrights to Kern.
+   <p>
+   Filling it out is really quite simple.  Please make two copies,
+   then put your name and mailing address on the first page and
+   date it.
+   <p>
+   On the third page after &quot;the author&quot; put your name and the
+   other information requested. This is simply to uniquely identify
+   you.  
+   <p>
+   If you are employed and you do Bacula work while at work
+   or your employer has the rights to your work (often the case),
+   please put your employer's information here.
+   <p>
+   On the fourth page, you can simply put &quot;All code and documentation
+   contributed to the Bacula.org project&quot; or if you wish to be more
+   specific please do so.
+   <p>
+   Finally, send the two filled out, signed copies to me. It is far better
+   to send them by post, but if this is really not possible, please scan
+   them and send them to me by email.<br><p>
+
+   Kern Sibbald<br>
+   Cotes-de-Montmoiret 9<br>
+   1012 Lausanne<br>
+   Switzerland<br>
+   email: kern at sibbald dot com<br>
+   <p>
+   Thanks for taking the time to complete and send the FLA in.
+   <p>
+   <ul>
+   <li> <a href="FLA-bacula.en.pdf" >PDF of the Fiduciary License Agreement</a>
+    </li>
+   </ul>
+   </td>
+   <td class="content">
+   <ul>
+   </ul>
+   </td>
+   </tr>
+   
+</table>
+ <p>
+<? require_once("inc/footer.php"); ?>