Commit changes for Spanish site

diff --git a/docs/home-page/de/inc/header.php b/docs/home-page/de/inc/header.php
index 2a62cf4c639e70ab003e295d1abd3d05f1c0d3aa..c9890794ead2ffb7deffc06a3aff43fd98a141f7 100644 (file)
--- a/docs/home-page/de/inc/header.php
+++ b/docs/home-page/de/inc/header.php
@@ -74,7 +74,7 @@
            <img alt="Fran&ccedil;ais" src="/images/french-flag.jpg">
          </a>&nbsp;&nbsp;&nbsp;
          <a href='..//es'>
-           <img alt="Espa&ntilde;ol" src="../images/spanish-flag.gif">
+           <img alt="Espa&ntilde;ol" src="../images/spanish-flag.jpg">
          </a>
        </td>
        <FORM method=GET  target="_blank" action=http://www.google.de/search>

diff --git a/docs/home-page/en/inc/header.php b/docs/home-page/en/inc/header.php
index 466c1aed68d6bb604050a398c4b6bfdcb74ea89b..5bdf5aac1ec7cc5a4bda16320c4e19939f6657e9 100644 (file)
--- a/docs/home-page/en/inc/header.php
+++ b/docs/home-page/en/inc/header.php
@@ -74,7 +74,7 @@
            <img alt="Deutsch" src="../images/german-flag.jpg">
          </a>&nbsp;&nbsp;&nbsp;
          <a href='..//es'>
-           <img alt="Espa&ntilde;ol" src="../images/spanish-flag.gif">
+           <img alt="Espa&ntilde;ol" src="../images/spanish-flag.jpg">
          </a>
 
 

diff --git a/docs/home-page/fr/inc/header.php b/docs/home-page/fr/inc/header.php
index c56ae6d62b52874ab18f8d2a5561297783bd7d27..c005367ceae83c2d734cd32b19bef911028c4002 100644 (file)
--- a/docs/home-page/fr/inc/header.php
+++ b/docs/home-page/fr/inc/header.php
@@ -77,7 +77,7 @@
               <img alt="Deutsch" src="../images/german-flag.jpg">
               </a>&nbsp;&nbsp;&nbsp;
             <a href='..//es'>
-              <img alt="Espa&ntilde;ol" src="../images/spanish-flag.gif">
+              <img alt="Espa&ntilde;ol" src="../images/spanish-flag.jpg">
             </a>
           </td>
           <FORM method=GET  target="_blank" action=http://www.google.com/search>

diff --git a/docs/home-page/images/de-flag.gif b/docs/home-page/images/de-flag.gif
new file mode 100644 (file)
index 0000000..a0c83de
Binary files /dev/null and b/docs/home-page/images/de-flag.gif differ

diff --git a/docs/home-page/images/fr_lang.gif b/docs/home-page/images/fr_lang.gif
new file mode 100644 (file)
index 0000000..434f456
Binary files /dev/null and b/docs/home-page/images/fr_lang.gif differ

diff --git a/docs/home-page/images/gb_flag.gif b/docs/home-page/images/gb_flag.gif
new file mode 100644 (file)
index 0000000..7584fef
Binary files /dev/null and b/docs/home-page/images/gb_flag.gif differ

diff --git a/docs/home-page/images/spanish-flag.gif b/docs/home-page/images/spanish-flag.gif
new file mode 100644 (file)
index 0000000..66fdf87
Binary files /dev/null and b/docs/home-page/images/spanish-flag.gif differ

diff --git a/docs/home-page/images/spanish-flag.jpg b/docs/home-page/images/spanish-flag.jpg
new file mode 100644 (file)
index 0000000..fd88ae6
Binary files /dev/null and b/docs/home-page/images/spanish-flag.jpg differ

diff --git a/docs/home-page/presentations/Presentacion_Bacula.pdf b/docs/home-page/presentations/Presentacion_Bacula.pdf
new file mode 100644 (file)
index 0000000..60cf9f5
Binary files /dev/null and b/docs/home-page/presentations/Presentacion_Bacula.pdf differ

diff --git a/docs/manuals/en/concepts/newfeatures.tex b/docs/manuals/en/concepts/newfeatures.tex
index 47772cfe98e723119654b62bbf3e376cced1a58d..254712c2f64044b513c4ee9351e8f5b9129068c3 100644 (file)
--- a/docs/manuals/en/concepts/newfeatures.tex
+++ b/docs/manuals/en/concepts/newfeatures.tex
@@ -1161,6 +1161,16 @@ In your Director's {\bf Messages} resource.
   !$%&'()*+,-/:;<>?[]^`{|}~
 \end{verbatim}
 
+\subsection{Deleting Volumes}
+The delete volume bconsole command has been modified to
+require an asterisk (*) in front of a MediaId otherwise the
+value you enter is a taken to be a Volume name. This is so that
+users may delete numeric Volume names. The previous Bacula versions
+assumed that all input that started with a number was a MediaId.
+
+This new behavior is indicated in the prompt if you read it
+carefully.
+
 \section{Bare Metal Recovery}
 The old bare metal recovery project is essentially dead. One
 of the main features of it was that it would build a recovery

diff --git a/docs/manuals/en/install/dirdconf.tex b/docs/manuals/en/install/dirdconf.tex
index 46ab3393178e8e40b503c05c1350c48c31873fd0..1c972fc062cfba816a5cf68cf00031a0903fb84a 100644 (file)
--- a/docs/manuals/en/install/dirdconf.tex
+++ b/docs/manuals/en/install/dirdconf.tex
@@ -977,7 +977,8 @@ during working hours. We can see it like \texttt{Max Start Delay + Max Run
    a drive with a valid Volume already mounted in preference to a drive
    that is not ready.  This means that all jobs will attempt to append
    to the same Volume (providing the Volume is appropriate -- right Pool, 
-   ... for that job). If no drive with a suitable Volume is available, it
+   ... for that job), unless you are using multiple pools.
+   If no drive with a suitable Volume is available, it
    will select the first available drive.  Note, any Volume that has
    been requested to be mounted, will be considered valid as a mounted
    volume by another job.  This if multiple jobs start at the same time
@@ -993,6 +994,17 @@ during working hours. We can see it like \texttt{Max Start Delay + Max Run
    This means that the job will prefer to use an unused drive rather
    than use a drive that is already in use.
 
+   Despite the above, we recommend against setting this directive to
+   {\bf no} since
+   it tends to add a lot of swapping of Volumes between the different
+   drives and can easily lead to deadlock situations in the Storage
+   daemon. We will accept bug reports against it, but we cannot guarantee
+   that we will be able to fix the problem in a reasonable time.
+
+   A better alternative for using multiple drives is to use multiple
+   pools so that Bacula will be forced to mount Volumes from those Pools
+   on different drives.
+
 \item [Prune Jobs = \lt{}yes|no\gt{}]
 \index[dir]{Prune Jobs}
 \index[dir]{Directive!Prune Jobs}

diff --git a/docs/send b/docs/send
index a0765087beea66e6d47bec112b19f2056115086c..8d9aaf9646edb1125c87e7d21b9a922db3615ca4 100755 (executable)
--- a/docs/send
+++ b/docs/send
@@ -12,3 +12,5 @@ for i in catalog concepts console developers install problems utility; do \
   scp -r -P 2020 $i/ bacula.org:/var/www/bacula/manuals/${lang}/$i/; \
   scp -P 2020 $i.pdf bacula.org:/var/www/bacula/manuals/${lang}/$i/; \
 done
+
+#  rsync --stats -c -r . bacula.org:/var/www/bacula/manuals/en/catalog/catalog