Merge branch 'master' of ssh://bacula.git.sourceforge.net/gitroot/bacula/docs

diff --git a/docs/home-page/en/pages/testimonial.php b/docs/home-page/en/pages/testimonial.php
index a3f62216bbc24eb34d50e80c9719de8af403753c..7c563e29c4eb089cf0b96d15d0e78353e6b39b5b 100644 (file)
--- a/docs/home-page/en/pages/testimonial.php
+++ b/docs/home-page/en/pages/testimonial.php
@@ -20,7 +20,7 @@ $org_type_lst = array(
 
 $version_lst = array(
        'empty'   => "SELECT ONE",
-       '206'   => "3.0.x",
+       '207'   => "3.0.x",
        '200'   => "1.36.x",
        '201'   => "1.38.x",
        '202'   => "2.0.x",
@@ -884,7 +884,7 @@ Best regards.
 ";
 
         
-        mail('testimonial@rt.baculasystems.com', $subject, $message, "From: $name <$email>");
+        mail('testimonial@baculasystems.com', $subject, $message, "From: $name <$email>");
 
         echo "The email has been sent for approval.<br/>";
 }

diff --git a/docs/manuals/en/main/fileset.tex b/docs/manuals/en/main/fileset.tex
index 357621d51e4017019761452aabcd7f5a029b4537..536a6cb3566a9e291355f4b662126bd9f65fdade 100644 (file)
--- a/docs/manuals/en/main/fileset.tex
+++ b/docs/manuals/en/main/fileset.tex
@@ -607,7 +607,7 @@ Change: 2005-11-06 12:36:48.000000000 +0100
 \index[dir]{checkfilechanges}
 \index[dir]{Directive!checkfilechanges}
    On versions 2.0.4 or greater, 
-   if enabled, the Client will checks size, age of each file after 
+   if enabled, the Client will check size, age of each file after 
    their backup to see if they have changed during backup. If time 
    or size mismatch, an error will raise.