Updates

diff --git a/docs/home-page/de/pages/professional.php b/docs/home-page/de/pages/professional.php
index e349e1e3e72ebc2613e4d11271ca0fcb9abd36dd..38bddb9c769f42349e493425a49763e148c7d4f6 100644 (file)
--- a/docs/home-page/de/pages/professional.php
+++ b/docs/home-page/de/pages/professional.php
@@ -159,7 +159,7 @@
               </td>
               <td><img src="../images/spacer.gif" width="50px" height="1px"></td>
               <td>
-                 <a href="mailto:heitor.fariaNOSPAM@serpro.gov.br">Serpro</a><br>
+                 <a href="mailto:heitorfariaNOSPAM@hotmail.com">Heitor Faria</a><br>
                  Consultoria em Software Libre (Brazil)<br>
                  <br>
                  Tel: +55 71 9196-5270<br>

diff --git a/docs/home-page/fr/pages/professional.php b/docs/home-page/fr/pages/professional.php
index 8d02e38623283a4609b9713e341cfe8c43b33199..3959934a6a14f630b1557876672355c064bc8e92 100644 (file)
--- a/docs/home-page/fr/pages/professional.php
+++ b/docs/home-page/fr/pages/professional.php
@@ -138,7 +138,7 @@
               </td>
               <td><img src="images/spacer.gif" width="50px" height="1px"></td>
               <td>
-                 <a href="mailto:heitor.fariaNOSPAM@serpro.gov.br">Serpro</a><br>
+                 <a href="mailto:heitorfariaNOSPAM@hotmail.com">Heitor Faria</a><br>
                  Consultoria em Software Libre (Brazil)<br>
                  <br>
                  Telephone +55 71 9196-5270<br>

diff --git a/docs/home-page/pages/professional.php b/docs/home-page/pages/professional.php
index b37440954ff8a91f49a77d63f9483069b1c1ebd7..886a0d6ba6bbc83c5d361b25254a37d987dd4c48 100644 (file)
--- a/docs/home-page/pages/professional.php
+++ b/docs/home-page/pages/professional.php
@@ -159,7 +159,7 @@
               </td>
               <td><img src="images/spacer.gif" width="50px" height="1px"></td>
               <td>
-                 <a href="mailto:heitor.fariaNOSPAM@serpro.gov.br">Serpro</a><br>
+                 <a href="mailto:heitorfariaNOSPAM@hotmail.com">Heitor Faria</a><br>
                  Consultoria em Software Libre (Brazil)<br>
                  <br>
                  Telephone +55 71 9196-5270<br>

diff --git a/docs/manual/install.tex b/docs/manual/install.tex
index d0022adb264169985e895da9be18e20a58e75f65..8782a293130f96563f021d9a48001a5997b9fa33 100644 (file)
--- a/docs/manual/install.tex
+++ b/docs/manual/install.tex
@@ -664,17 +664,6 @@ customize your installation.
    {-}{-}datadir} option. You must manually install any po files as
    Bacula does not (yet) automatically do so.
 
-\item [ {-}{-}archivedir=\lt{}path\gt{} ]
-   \index[general]{{-}{-}archivedir}
-   The directory used for disk-based backups.  Default value is /tmp.
-   This parameter sets the default values in the bacula-dir.conf and bacula-sd.conf
-   configuration files.  For example, it sets the Where directive for the
-   default restore job and the Archive Device directive for the FileStorage
-   device.
-
-   This option is designed primarily for use in regression testing.
-   Most users can safely ignore this option.
-
 \item [ {-}{-}disable-ipv6 ]
    \index[general]{{-}{-}disable-ipv6}
 
@@ -1068,6 +1057,17 @@ $ nm /usr/local/lib/libpq.a | grep mutex
    contained in the tcpd-devel package. On Red Hat, the package is named
    tcp\_wrappers.
 
+\item [ {-}{-}with-archivedir=\lt{}path\gt{} ]
+   \index[general]{{-}{-}with-archivedir}
+   The directory used for disk-based backups.  Default value is /tmp.
+   This parameter sets the default values in the bacula-dir.conf and bacula-sd.conf
+   configuration files.  For example, it sets the Where directive for the
+   default restore job and the Archive Device directive for the FileStorage
+   device.
+
+   This option is designed primarily for use in regression testing.
+   Most users can safely ignore this option.
+
 \item [ {-}{-}with-working-dir=\lt{}working-directory-path\gt{} ]
    \index[general]{{-}{-}with-working-dir}
    This option is mandatory and specifies a directory  into which Bacula may