Pull in stuff from old-Branch-6.0

diff --git a/docs/home-page/en/pages/home.php b/docs/home-page/en/pages/home.php
index f234d0590274a43979f12561c472fd6b0ef59584..c2a64a8d726fdc2846956a20c74936d10c6ed7f0 100644 (file)
--- a/docs/home-page/en/pages/home.php
+++ b/docs/home-page/en/pages/home.php
@@ -22,7 +22,7 @@
      Bacula is by far the most popular Open Source program backup program.
      <br>
      <br>
-<table width="759" border="0" cellspacing="2" cellpadding="0">
+<table width="900" border="0" cellspacing="2" cellpadding="0">
    <tr>
     <td width="25"></td>
     <td><font size="5" color="#739ab9"> <strong>Bacula.org and Bacula Systems: 
@@ -34,7 +34,7 @@
 </table>
 
 <p></p>
-<table width="644" border="0" cellspacing="0" cellpadding="0" height="224">
+<table width="890" border="0" cellspacing="0" cellpadding="0" height="224">
  <tr height="215">
   <td align="center" valign="middle" width="331" height="215">
    <table width="237" border="0" cellspacing="0" cellpadding="0">
@@ -102,12 +102,11 @@
     </tr>
     <tr height="68">
      <td height="68">
-      <p>4 June 2012: <strong><a href="http://www.baculasystems.com/index.php?option=com_flexicontent&view=items&id=131:bacula-enterprise-edition&Itemid=15">
-                     Bacula Enterprise Edition 6.0.4 </a></strong> has been released.</p>
+      <p>December 2012: <strong><a href="http://www.baculasystems.com/index.php?option=com_flexicontent&view=items&id=131:bacula-enterprise-edition&Itemid=15">
+                     Bacula Enterprise Edition 6.0.6 </a></strong> has been released.</p>
       <p><strong>Bacula Adminstration I Training Course: <a href="http://www.baculasystems.com/index.php/component/content/article/211.html">dates announced</a><p>
       <p>See: <a href="http://www.baculasystems.com/index.php/company/recent-news.html">Bacula Systems News</a>
 <!--
-, 
           or <a href="http://www.baculasystems.com/eng/Products/Enterprise-Edition">
           Bacula Enterprise Edition main page</a></p>     
 -->
@@ -115,6 +114,65 @@
     </tr>
    </table>
   </td>
+
+<!-- Louis note: start new columns -->
+  <td rowspan="2" width="25" height="229">
+   <table width="3" border="0" cellspacing="0" cellpadding="0" bgcolor="#739ab9" height="320">
+    <tr height="60">
+     <td height="60"></td>
+    </tr>
+   </table>
+  </td>
+  <td align="center" valign="middle" width="210" height="215">
+   <table width="288" border="0" cellspacing="0" cellpadding="0">
+    <tr>
+     <td>
+      <table width="276" border="0" cellspacing="0" cellpadding="0" bgcolor="#739ab9">
+       <tr>
+        <td valign="top">
+         <table width="264" border="0" cellspacing="0" cellpadding="0" bgcolor="#739ab9">
+          <tr height="50">
+           <td width="5" height="50"></td>
+           <td width="271" height="50">
+            <h4>Windows Binaries</h4>
+           </td>
+          </tr>
+         </table>
+        </td>
+       </tr>
+      </table>
+     </td>
+    </tr>
+    <tr height="10">
+     <td height="10"></td>
+    </tr>
+    <tr height="68">
+     <td height="68">
+
+<p>If you are using the Bacula community version to back up and restore Windows
+machines, it is now possible to purchase the Bacula Enterprise Windows
+binaries <a href="http://www.baculasystems.com/windows-binaries-for-bacula-community-users">
+ here</a>. These binaries allow you to continue
+using Bacula community version as well as the lastest Windows binaries.
+These binaries replace older Bacula community Windows File
+daemons only (the Storage Daemon and Director binaries for Windows are not
+available).  An installer is available for both 32 and 64 bit machines.
+
+<b><a href="http://www.baculasystems.com/windows-binaries-for-bacula-community-users">
+
+Windows binaries for Bacula community users
+
+</a></b>
+</p>
+    <tr height="10">
+     <td height="10"></td>
+    </tr>
+   </table>
+  </td>
+
+
+<!-- Louis note: end now column -->
+
  </tr>
  <tr align="center" height="14">
   <td width="331" height="14">
@@ -131,6 +189,16 @@
     </tr>
    </table>
   </td>
+<!-- Louis note: begin line under the 3rd box  -->
+<td width="210" height="14">
+   <table class="cellcolor" width="209" border="0" cellspacing="0" cellpadding="0" bgcolor="#739ab9" height="3">
+    <tr height="3">
+     <td width="209" height="3"></td>
+    </tr>
+   </table>
+  </td>
+
+<!-- Louis note: end line 3rd box -->
  </tr>
 </table>
 <p></p>

diff --git a/docs/home-page/en/pages/winbin.php b/docs/home-page/en/pages/winbin.php
new file mode 100644 (file)
index 0000000..78cd128
--- /dev/null
+++ b/docs/home-page/en/pages/winbin.php
@@ -0,0 +1,30 @@
+<? require_once("inc/header.php"); ?>
+<table>
+<tr>
+        <td class="contentTopic">
+                Bacula Windows Binaries
+        </td>
+</tr>
+<tr>
+  <td class="content">
+<p>
+As you are probably aware, the community Windows File daemon binaries are no
+longer produced by the Bacula project.  Consequently, as a service to the
+community, Bacula Systems is offering its Windows Enterprise binaries at a
+price that is designed to simply cover the costs to produce and distribute
+those binaries.  These Enterprise Windows binaries are compatible with the
+community Director and Storage daemon.  However, please note, that the Windows
+Storage daemon and Director binaries are not provided.  Included in this
+package is an installer for both 32 and 64 bit machines.  Support is not
+offered by Bacula Systems, but is available through the Community Bugs
+database.
+     </p>
+   <p>
+   <a href="http://www.baculasystems.com/windows-binaries-for-bacula-community-users">
+   http://www.baculasystems.com/windows-binaries-for-bacula-community-users</a>
+   </p>
+  </td>
+</tr>
+</table>
+
+<? require_once("inc/footer.php"); ?>