From 9b90791a4153a6bfff28c2f286a81cb036b932e5 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 23 Jan 2009 15:16:04 +0000
Subject: [PATCH] Update

---
 docs/home-page/de/inc/header.php         |   2 +-
 docs/home-page/en/inc/header.php         |   2 +-
 docs/home-page/en/pages/professional.php | 158 +++++++++++++++--------
 docs/home-page/fr/inc/header.php         |   4 +-
 docs/home-page/fr/pages/professional.php |  35 ++++-
 docs/manuals/en/concepts/restore.tex     |  24 ++--
 6 files changed, 158 insertions(+), 67 deletions(-)

diff --git a/docs/home-page/de/inc/header.php b/docs/home-page/de/inc/header.php
index a73f1f09..a14ebc93 100644
--- a/docs/home-page/de/inc/header.php
+++ b/docs/home-page/de/inc/header.php
@@ -168,7 +168,7 @@
         <div class="menuHead"> Projekte </div>
         <div class="menuItem">
            <ul class="menuitem">
-           <li class="menuItem"> <a href="<? echo $spath ?>/?page=projects"> Projekte </a> </li>
+           <li class="menuItem"> <a href="http://bacula.svn.sourceforge.net/viewvc/bacula/trunk/bacula/projects?view=markup"> Projekte </a> </li>
            </ul>
         </div>
 
diff --git a/docs/home-page/en/inc/header.php b/docs/home-page/en/inc/header.php
index cf1828b2..4ebd80fd 100644
--- a/docs/home-page/en/inc/header.php
+++ b/docs/home-page/en/inc/header.php
@@ -170,7 +170,7 @@
         <div class="menuHead"> Projects </div>
         <div class="menuItem">
            <ul class="menuitem">
-           <li class="menuItem"> <a href="<? echo $spath ?>/?page=projects"> Projects </a> </li>
+           <li class="menuItem"> <a href="http://bacula.svn.sourceforge.net/viewvc/bacula/trunk/bacula/projects?view=markup"> Projects </a> </li>
   <!--
            <li class="menuItem"> <a href="<? echo $spath ?>/?page=vote"> Project Vote </a> </li>
   -->
diff --git a/docs/home-page/en/pages/professional.php b/docs/home-page/en/pages/professional.php
index c4c49394..b8f7befe 100644
--- a/docs/home-page/en/pages/professional.php
+++ b/docs/home-page/en/pages/professional.php
@@ -52,6 +52,109 @@
 </tr>
 
 
+<tr>
+    <td class="content">
+       The following companies are Bacula Systems Partners, and as such,
+       we know them well and Bacula Systems stands behind them and supports
+       them.<br>
+       <br>
+       All email-addresses are extended with a 'NOSPAM'-tag, please remove it before sending an email.<br>
+    </td>
+</tr>
+<tr>
+   <td class="content">
+   <table align="center">
+
+      <tr> <td colspan="3"><img src="/images/spacer.gif" width="50px" height="25px"></td> </tr>
+      <tr> <td colspan="3"><hr></td>
+      <tr> <td colspan="3"><img src="/images/spacer.gif" width="50px" height="25px"></td> </tr>
+      <tr>
+              <td style="font-weight: bold">
+                      dass IT GmbH
+              </td>
+              <td><img src="/images/spacer.gif" width="50px" height="1px"></td>
+              <td>
+                 <a href="mailto:infoNSPAM@dass-it.de">dass IT GmbH</a> -- a Bacula Systems Partner<br>
+                 H&auml;ndelstra&#223;e 25-29<br>
+                 50674 K&ouml;ln<br>
+                 Germany<br>
+                 Tel: +49 221 35 65 666 - 0<br>
+                 Fax: +49 221 35 65 666 - 10<br>
+                 <br>
+                 dass IT provides professional services and
+                 support using mainly open source tools.  Our
+                 focus lies on system management for a large
+                 number of systems (servers and desktops).  We
+                 provide services and solutions mainly for Linux
+                 based IT infrastructures.  
+                 <br> 
+                 <a href="http://www.dass-it.de/">http://www.dass-it.de/</a>
+              </td>
+      </tr>
+
+
+      <tr> <td colspan="3"><img src="/images/spacer.gif" width="50px" height="25px"></td> </tr>
+      <tr> <td colspan="3"><hr></td>
+      <tr> <td colspan="3"><img src="/images/spacer.gif" width="50px" height="25px"></td> </tr>
+      <tr>
+              <td style="font-weight: bold">
+                      IT-Service Lehmann
+              </td>
+              <td><img src="/images/spacer.gif" width="50px" height="1px"></td>
+              <td>
+                 <a href="mailto:infoNOSPAM@its-lehmann.de">Arno Lehmann</a> -- a Bacula Systems Partner<br>
+                  Sandstr. 6<br>
+                  49080 Osnabr&uuml;ck</br>
+                  Germany<br>
+                  +49 (0) 541 5803396<br>
+                  +49 (0) 160 92008971 (mobile)<br>
+                  <br>
+                  Storage, Communication, Backup and Monitoring using 
+                  Open-Source solutions.  Services from
+                  network design to system administration and
+                  user education, with a focus on Small
+                  Businesses looking for cost-effective solutions.
+                  <br>
+                  <a href="http://www.its-lehmann.de">http://www.its-lehmann.de</a>
+               </td>
+              </td>
+      </tr>
+
+      <tr> <td colspan="3"><img src="/images/spacer.gif" width="50px" height="25px"></td> </tr>
+      <tr> <td colspan="3"><hr></td>
+      <tr> <td colspan="3"><img src="/images/spacer.gif" width="50px" height="25px"></td> </tr>
+      <tr>
+              <td style="font-weight: bold">
+                  MigraTech
+              </td>
+              <td><img src="/images/spacer.gif" width="50px" height="1px"></td>
+              <td>
+                  MigraTech -- A Bacula Systems Partner<br>
+                  Philippe Chauvat<br>
+                  7 rue Alfred Kastler<br>
+                  Immeuble Emergence<br>
+                  14000 Caen<br>
+                  France<br>
+
+                  +33 (0) 231 75 14 91<br>
+                  <br>
+                  Migratech is a company that provides services for Free Software.
+                  We propose a broad range of services that go from consulting
+                  to installation of complete systems: sercurity (access, contents,
+                  antivirus, antispam), data sharing, messaging, backup, and
+                  large WiFi networks. For Backup, MigraTech has become a specialist
+                  in Bacula.  Please visit our site (in French) for additional
+                  information.<br>
+                  <br>
+                  <a href="http://www.migratech.fr">http://www.migratech.fr</a><br>
+              </td>
+      </tr>
+   </table>
+   </td>
+
+</tr>
+
+
 <tr>
       <tr> <td colspan="3"><img src="/images/spacer.gif" width="50px" height="25px"></td> </tr>
       <tr> <td colspan="3"><hr></td>
@@ -192,32 +295,6 @@
               </td>
       </tr>
 
-      <tr> <td colspan="3"><img src="/images/spacer.gif" width="50px" height="25px"></td> </tr>
-      <tr> <td colspan="3"><hr></td>
-      <tr> <td colspan="3"><img src="/images/spacer.gif" width="50px" height="25px"></td> </tr>
-      <tr>
-              <td style="font-weight: bold">
-                      dass IT GmbH
-              </td>
-              <td><img src="/images/spacer.gif" width="50px" height="1px"></td>
-              <td>
-                 <a href="mailto:infoNSPAM@dass-it.de">dass IT GmbH</a> -- a Bacula Systems Partner<br>
-                 H&auml;ndelstra&#223;e 25-29<br>
-                 50674 K&ouml;ln<br>
-                 Germany<br>
-                 Tel: +49 221 35 65 666 - 0<br>
-                 Fax: +49 221 35 65 666 - 10<br>
-                 <br>
-                 dass IT provides professional services and
-                 support using mainly open source tools.  Our
-                 focus lies on system management for a large
-                 number of systems (servers and desktops).  We
-                 provide services and solutions mainly for Linux
-                 based IT infrastructures.  
-                 <br> 
-                 <a href="http://www.dass-it.de/">http://www.dass-it.de/</a>
-              </td>
-      </tr>
 
 
       <tr> <td colspan="3"><img src="/images/spacer.gif" width="50px" height="25px"></td> </tr>
@@ -288,32 +365,6 @@
               </td>
       </tr>
 
-      <tr> <td colspan="3"><img src="/images/spacer.gif" width="50px" height="25px"></td> </tr>
-      <tr> <td colspan="3"><hr></td>
-      <tr> <td colspan="3"><img src="/images/spacer.gif" width="50px" height="25px"></td> </tr>
-      <tr>
-              <td style="font-weight: bold">
-                      IT-Service Lehmann
-              </td>
-              <td><img src="/images/spacer.gif" width="50px" height="1px"></td>
-              <td>
-                 <a href="mailto:infoNOSPAM@its-lehmann.de">Arno Lehmann</a> -- a Bacula Systems Partner<br>
-                  Sandstr. 6<br>
-                  49080 Osnabr&uuml;ck</br>
-                  Germany<br>
-                  +49 (0) 541 5803396<br>
-                  +49 (0) 160 92008971 (mobile)<br>
-                  <br>
-                  Storage, Communication, Backup and Monitoring using 
-                  Open-Source solutions.  Services from
-                  network design to system administration and
-                  user education, with a focus on Small
-                  Businesses looking for cost-effective solutions.
-                  <br>
-                  <a href="http://www.its-lehmann.de">http://www.its-lehmann.de</a>
-               </td>
-              </td>
-      </tr>
 
       <tr> <td colspan="3"><img src="/images/spacer.gif" width="50px" height="25px"></td> </tr>
       <tr> <td colspan="3"><hr></td>
@@ -349,6 +400,7 @@
                  Planning and scaling of your hardware installation, Bacula implementation.
               </td>
       </tr>
+
       <tr> <td colspan="3"><img src="/images/spacer.gif" width="50px" height="25px"></td> </tr>
       <tr> <td colspan="3"><hr></td>
       <tr> <td colspan="3"><img src="/images/spacer.gif" width="50px" height="25px"></td> </tr>
@@ -372,6 +424,8 @@
               </td>
       </tr>
 
+
+
       <tr> <td colspan="3"><img src="/images/spacer.gif" width="50px" height="25px"></td> </tr>
       <tr> <td colspan="3"><hr></td>
       <tr> <td colspan="3"><img src="/images/spacer.gif" width="50px" height="25px"></td> </tr>
diff --git a/docs/home-page/fr/inc/header.php b/docs/home-page/fr/inc/header.php
index 6031fefa..001a621a 100644
--- a/docs/home-page/fr/inc/header.php
+++ b/docs/home-page/fr/inc/header.php
@@ -187,10 +187,12 @@
       <div class="menuHead"> Projets </div>
       <div class="menuItem">
         <ul class="menuitem">
-          <li class="menuItem"> <a href="<? echo $spath ?>/?page=projects">
+          <li class="menuItem"> <a href="http://bacula.svn.sourceforge.net/viewvc/bacula/trunk/bacula/projects?view=markup">
             Projets </a> </li>
+<!--
           <li class="menuItem"> <a href="<? echo $spath ?>/?page=vote">
             Vote pour les projets </a> </li>
+ -->
         </ul>
       </div>
   
diff --git a/docs/home-page/fr/pages/professional.php b/docs/home-page/fr/pages/professional.php
index 4703d9f9..706309b1 100644
--- a/docs/home-page/fr/pages/professional.php
+++ b/docs/home-page/fr/pages/professional.php
@@ -321,6 +321,39 @@
               </td>
       </tr>
 
+      <tr> <td colspan="3"><img src="/images/spacer.gif" width="50px" height="25px"></td> </tr>
+      <tr> <td colspan="3"><hr></td>
+      <tr> <td colspan="3"><img src="/images/spacer.gif" width="50px" height="25px"></td> </tr>
+      <tr>
+              <td style="font-weight: bold">
+                  MigraTech
+              </td>
+              <td><img src="/images/spacer.gif" width="50px" height="1px"></td>
+              <td>
+                  MigraTech -- A Bacula Systems Partner<br>
+                  Philippe Chauvat<br>
+                  7 rue Alfred Kastler<br>
+                  Immeuble Emergence<br>
+                  14000 Caen<br>
+                  France<br>
+
+                  +33 (0) 231 75 14 91<br>
+                  <br>
+                  MigraTech est une société de services en logiciels libres. Nous
+                  proposons toute une panoplie de prestations qui vont du conseil à la
+                  mise en œuvre desystèmes complets: Sécurité (accès, contenu,
+                  anti-virus, anti-spam), partage de données, messagerie, sauvegardes,
+                  jusqu'aux réseaux Wifi étendus.
+                  Dans le domaine de la sauvegarde, MigraTech a développé des compétences
+                  spécifiques sur le logiciel Bacula.
+                  Nous vous invitons à consulter notre site internet et à nous contacter
+                  pour tout complément d'information.<br>
+                  <br>
+                  <a href="http://www.migratech.fr">http://www.migratech.fr</a><br>
+              </td>
+      </tr>
+
+
       <tr> <td colspan="3"><img src="/images/spacer.gif" width="50px" height="25px"></td> </tr>
       <tr> <td colspan="3"><hr></td>
       <tr> <td colspan="3"><img src="/images/spacer.gif" width="50px" height="25px"></td> </tr>
@@ -389,7 +422,7 @@
                  <a href="mailto:serviceNOSPAM@muellerit.ch">m&uuml;ller it gmbh</a><br>
                  Hagenholzstrasse 76<br>
                  8050 Z&uuml;rich
-		 Schweiz
+                 Schweiz
                  <br>
                  Telephone +41 (0)43 536 49 75<br>
                  Skype mueller.it.gmbh
diff --git a/docs/manuals/en/concepts/restore.tex b/docs/manuals/en/concepts/restore.tex
index e84b55ba..31736082 100644
--- a/docs/manuals/en/concepts/restore.tex
+++ b/docs/manuals/en/concepts/restore.tex
@@ -632,7 +632,9 @@ For example, many users use OS snapshot features so that file
 \texttt{/.snap/home/eric/mbox}, which can complicate restores.  If you use
 \textbf{where=/tmp}, the file will be restored to
 \texttt{/tmp/.snap/home/eric/mbox} and you will have to move the file to
-\texttt{/home/eric/mbox.bkp} by hand.  In this case, you could use
+\texttt{/home/eric/mbox.bkp} by hand.  
+
+However, case, you could use the
 \textbf{strip\_prefix=/.snap} and \textbf{add\_suffix=.bkp} options and
 Bacula will restore the file to its original location -- that is
 \texttt{/home/eric/mbox}.
@@ -647,9 +649,9 @@ add options to your restore job in as described in
 Parameters to modify:
      1: Level
      2: Storage
-..
+    ...
     10: File Relocation
-..
+    ...
 Select parameter to modify (1-12):
 
 
@@ -664,7 +666,7 @@ Select parameter to modify (1-6):
 \end{verbatim}
 
 
-\subsection{RegexWhere format}
+\subsection{RegexWhere Format}
 
 The format is very close to that used by sed or Perl (\texttt{s/replace this/by
   that/}) operator. A valid regexwhere expression has three fields :
@@ -677,25 +679,25 @@ The format is very close to that used by sed or Perl (\texttt{s/replace this/by
 Each field is delimited by a separator specified by the user as the first
 character of the expression. The separator can be one of the following:
 \begin{verbatim}
-<separator-keyword> = / ! ; % : , ~ # = &
+<separator-keyword> = / ! ; % : , ~ # = &
 \end{verbatim}
 
 You can use several expressions separated by a commas.
 
 \subsection*{Examples}
 
-\begin{tabular}{|c|c|c|l}
+\begin{tabular}{|c|c|c|l|}
 \hline
-Orignal filename & Computed filename  & RegexWhere  & Comments \\
+Orignal filename & New filename & RegexWhere & Comments \\
 \hline
 \hline
-\texttt{c:/system.ini} & \texttt{c:/system.old.ini} & \texttt{/.ini\$/.old.ini/} & use \$ as end of filename\\
+\texttt{c:/system.ini} & \texttt{c:/system.old.ini} & \texttt{/.ini\$/.old.ini/} & \$ matches end of name\\
 \hline
-\texttt{/prod/u01/pdata/} & \texttt{/rect/u01/rdata}  & \texttt{/prod/rect/,/pdata/rdata/} & using two regexp\\
+\texttt{/prod/u01/pdata/} & \texttt{/rect/u01/rdata}  & \texttt{/prod/rect/,/pdata/rdata/} & uses two regexp\\
 \hline
-\texttt{/prod/u01/pdata/} & \texttt{/rect/u01/rdata}  & \texttt{!/prod/!/rect/!,/pdata/rdata/} & using \texttt{!} instead of \texttt{/}\\
+\texttt{/prod/u01/pdata/} & \texttt{/rect/u01/rdata}  & \texttt{!/prod/!/rect/!,/pdata/rdata/} & use \texttt{!} as separator\\
 \hline
-\texttt{C:/WINNT} & \texttt{d:/WINNT}  & \texttt{/c:/d:/i} & using case-insensitive pattern matching \\
+\texttt{C:/WINNT} & \texttt{d:/WINNT}  & \texttt{/c:/d:/i} & case insensitive pattern match \\
 \hline
 
 \end{tabular}
-- 
2.39.2