From 4dba7e4ca58ece1995e73b7ad56b0ef4d1698a8c Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 9 Jul 2009 16:44:19 +0000
Subject: [PATCH] Update home page

---
 docs/home-page/en/pages/home.php            |  3 +-
 docs/home-page/es/pages/home.php            |  6 +-
 docs/home-page/fr/pages/home.php            |  4 +-
 docs/manuals/en/install/fileset.tex         | 64 +++++++++++++++++++++
 docs/manuals/en/install/install.kilepr      |  4 +-
 docs/manuals/fr/concepts/license.tex        |  2 +-
 docs/manuals/fr/developers/generaldevel.tex |  2 +-
 7 files changed, 77 insertions(+), 8 deletions(-)

diff --git a/docs/home-page/en/pages/home.php b/docs/home-page/en/pages/home.php
index 0443b122..75a54e6d 100644
--- a/docs/home-page/en/pages/home.php
+++ b/docs/home-page/en/pages/home.php
@@ -105,7 +105,8 @@
     </tr>
     <tr height="68">
      <td height="68">
-      <p>3 May 2009: <strong>Bacula Enterprise Edition 1.0</strong> will be released shortly.</p>
+      <p>7 July 2009: <strong><a href="http://www.baculasystems.com/eng/Products/Enterprise-Edition">
+                     Bacula Enterprise Edition 2.6</a></strong> has been released.</p>
       <p>10 June 2009: <strong>Foundation Training Course: <a href="http://www.baculasystems.com/eng/About-us/Recent-news/Foundation-Course-Dates-Announced">dates announced</a><p>
       <p>See: <a href="http://www.baculasystems.com/eng/About-us/Recent-news">Bacula Systems News</a>
 <!--
diff --git a/docs/home-page/es/pages/home.php b/docs/home-page/es/pages/home.php
index f86966e6..75a54e6d 100644
--- a/docs/home-page/es/pages/home.php
+++ b/docs/home-page/es/pages/home.php
@@ -66,7 +66,7 @@
      <td height="68">
       <p>30 April 2009: <strong>Bacula 3.0.1</strong> has been released.</p>
       <p></p>
-      <p>See: <a href="http://www.bacula.org/es/?page=news">News</a></p>
+      <p>See: <a href="http://www.bacula.org/en/?page=news">News</a></p>
      </td>
     </tr>
    </table>
@@ -105,7 +105,9 @@
     </tr>
     <tr height="68">
      <td height="68">
-      <p>3 May 2009: <strong>Bacula Enterprise Edition 1.0</strong> will be released shortly.</p>
+      <p>7 July 2009: <strong><a href="http://www.baculasystems.com/eng/Products/Enterprise-Edition">
+                     Bacula Enterprise Edition 2.6</a></strong> has been released.</p>
+      <p>10 June 2009: <strong>Foundation Training Course: <a href="http://www.baculasystems.com/eng/About-us/Recent-news/Foundation-Course-Dates-Announced">dates announced</a><p>
       <p>See: <a href="http://www.baculasystems.com/eng/About-us/Recent-news">Bacula Systems News</a>
 <!--
 , 
diff --git a/docs/home-page/fr/pages/home.php b/docs/home-page/fr/pages/home.php
index 6ee751cf..65596589 100644
--- a/docs/home-page/fr/pages/home.php
+++ b/docs/home-page/fr/pages/home.php
@@ -112,7 +112,9 @@
     </tr>
     <tr height="68">
      <td height="68">
-      <p>3 Mai 2009: <strong>Bacula Enterprise Edition 1.0</strong> va &ecirc;tre disponible bient&ocirc;t.</p>
+      <p>7 juillet 2009: <strong><a href="http://www.baculasystems.com/eng/Products/Enterprise-Edition">
+                     Bacula Enterprise Edition 2.6</a></strong> has been released.</p>
+      <p>10 juin 2009: <strong>Foundation Training Course: <a href="http://www.baculasystems.com/eng/About-us/Recent-news/Foundation-Course-Dates-Announced">dates announced</a><p>
       <p>Voir: <a href="http://www.baculasystems.com/eng/About-us/Recent-news">Bacula Systems News</a>
 <!--
 , 
diff --git a/docs/manuals/en/install/fileset.tex b/docs/manuals/en/install/fileset.tex
index 691bf6ee..724bb67e 100644
--- a/docs/manuals/en/install/fileset.tex
+++ b/docs/manuals/en/install/fileset.tex
@@ -1386,6 +1386,70 @@ FileSet {
 \end{verbatim}
 \normalsize
 
+
+The following example shows how to back up only the My Pictures directory inside
+the My Documents directory for all users in C:/Documents and Settings, i.e.
+everything matching the pattern:
+
+C:/Documents and Settings/*/My Documents/My Pictures/*
+
+To understand how this can be achieved, there are two important points to
+remember:
+
+Firstly, Bacula walks over the filesystem depth-first starting from the File =
+lines.  It stops descending when a directory is excluded, so you must include
+all ancestor directories of each directory containing files to be included.
+
+Secondly, each directory and file is compared to the Options clauses in the
+order they appear in the FileSet.  When a match is found, no further clauses
+are compared and the directory or file is either included or excluded.
+
+The FileSet resource definition below implements this by including specifc
+directories and files and excluding everything else.
+
+\footnotesize
+\begin{verbatim}
+FileSet {
+  Name = "AllPictures"
+
+  Include {
+
+    File  = "C:/Documents and Settings"
+
+    Options {
+      signature = SHA1
+      verify = s1
+      IgnoreCase = yes
+
+      # Include all users' directories so we reach the inner ones.  Unlike a
+      # WildDir pattern ending in *, this RegExDir only matches the top-level
+      # directories and not any inner ones.
+      RegExDir = "^C:/Documents and Settings/[^/]+$"
+
+      # Ditto all users' My Documents directories.
+      WildDir = "C:/Documents and Settings/*/My Documents"
+
+      # Ditto all users' My Documents/My Pictures directories.
+      WildDir = "C:/Documents and Settings/*/My Documents/My Pictures"
+
+      # Include the contents of the My Documents/My Pictures directories and
+      # any subdirectories.
+      Wild = "C:/Documents and Settings/*/My Documents/My Pictures/*"
+    }
+
+    Options {
+      Exclude = yes
+      IgnoreCase = yes
+
+      # Exclude everything else, in particular any files at the top level and
+      # any other directories or files in the users' directories.
+      Wild = "C:/Documents and Settings/*"
+    }
+  }
+}
+\end{verbatim}
+\normalsize
+
 \section{Backing up Raw Partitions}
 \index[general]{Backing up!Partitions }
 \index[general]{Backing up Raw Partitions }
diff --git a/docs/manuals/en/install/install.kilepr b/docs/manuals/en/install/install.kilepr
index 8d85c0f5..53929130 100644
--- a/docs/manuals/en/install/install.kilepr
+++ b/docs/manuals/en/install/install.kilepr
@@ -3,7 +3,7 @@ img_extIsRegExp=false
 img_extensions=.eps .jpg .jpeg .png .pdf .ps .fig .gif
 kileprversion=2
 kileversion=2.0
-lastDocument=
+lastDocument=install.tex
 masterDocument=
 name=Install
 pkg_extIsRegExp=false
@@ -89,7 +89,7 @@ order=-1
 
 [item:install.tex]
 archive=true
-column=30
+column=16
 encoding=UTF-8
 highlight=LaTeX
 line=37
diff --git a/docs/manuals/fr/concepts/license.tex b/docs/manuals/fr/concepts/license.tex
index 44c82f98..a773246e 100644
--- a/docs/manuals/fr/concepts/license.tex
+++ b/docs/manuals/fr/concepts/license.tex
@@ -74,7 +74,7 @@ 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}{\url{http://www.bacula.org/FLA-bacula.en.pdf}}
+\elink{http://www.bacula.org/fr/FLA-bacula.en.pdf}{\url{http://www.bacula.org/fr/FLA-bacula.en.pdf}}
 
 and should be filled out then sent to:
 
diff --git a/docs/manuals/fr/developers/generaldevel.tex b/docs/manuals/fr/developers/generaldevel.tex
index 9404e57e..7c153da2 100644
--- a/docs/manuals/fr/developers/generaldevel.tex
+++ b/docs/manuals/fr/developers/generaldevel.tex
@@ -125,7 +125,7 @@ misunderstandings between the employee, the company, and the Bacula
 project.  A good number of companies have already followed this procedure.
 
 The Fiduciary License Agreement is posted on the Bacula web site at:
-\elink{http://www.bacula.org/FLA-bacula.en.pdf}{http://www.bacula.org/FLA-bacula.en.pdf}
+\elink{http://www.bacula.org/fr/FLA-bacula.en.pdf}{http://www.bacula.org/fr/FLA-bacula.en.pdf}
 
 The instructions for filling out this agreement are also at:
 \elink{http://www.bacula.org/?page=fsfe}{http://www.bacula.org/?page=fsfe}
-- 
2.39.5