From c6e64b31b41618f6815aaec5b40239155da2a29f Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 21 Jul 2006 09:11:03 +0000
Subject: [PATCH] Commit changes

---
 docs/home-page/pages/documentation.php | 25 ++++++--
 docs/manual-fr/imagename_translations  | 36 +++++------
 docs/manual-fr/images.tex              | 85 ++++++++++++++++++--------
 docs/manual/kaboom.tex                 |  9 ++-
 docs/manual/restore.tex                |  5 +-
 docs/manual/tapetesting.tex            | 12 +++-
 6 files changed, 115 insertions(+), 57 deletions(-)

diff --git a/docs/home-page/pages/documentation.php b/docs/home-page/pages/documentation.php
index 5620cd0a..6f39e17a 100644
--- a/docs/home-page/pages/documentation.php
+++ b/docs/home-page/pages/documentation.php
@@ -23,7 +23,6 @@
      
    <tr>
      <td class="content">
-       &nbsp;
    <ul>
    <li> <a href="rel-manual/index.html" >HTML User's Manual</a>
     <br>(released version of the User's Manual)<br></li>
@@ -34,7 +33,6 @@
    </ul>
    </td>
    <td class="content">
-       &nbsp;
    <ul>
    <li> <a href="dev-manual/index.html" >HTML Development Manual</a>
     <br>(User's manual for code under development)<br></li>
@@ -46,7 +44,6 @@
    
    <tr>
      <td class="content">
-       &nbsp;
       <ul>
       <li><a href="bacula-web/index.html">Bacula-web Guide</a>
       <br>(Guide for the Bacula-web GUI application)</li>
@@ -54,7 +51,6 @@
      </td>
 
      <td class="content">
-       &nbsp;
       <ul>
       <li><a href="developers/index.html">HTML Developer's Guide</a>
       <br>(Guide for Bacula developers)</li>
@@ -63,6 +59,27 @@
       </ul>
      </td>
    </tr>
+
+   <tr>
+     <td class="content">
+   <ul>
+   <li> <a href="rel-manual-fr/index.html">French HTML User's Manual</a>
+    <br>(released version of the User's Manual in French)<br></li>
+   <li> <a href="<? echo $spath ?>/rel-bacula-fr.pdf">French PDF User's Manual</a>
+    <br>(released version of the User's Manual in French)<br></li>
+   </ul>
+   </td>
+
+   <td class="content">
+   <ul>
+   <li> <a href="rel-manual-fr/Une_breve_documentation.html">Tutorial</a>
+    <br>(start here after installing Bacula in French)
+   </ul>
+   </td>
+
+   </tr>
+
+
 </table>
  <p>
 <? require_once("inc/footer.php"); ?>
diff --git a/docs/manual-fr/imagename_translations b/docs/manual-fr/imagename_translations
index 28e17c15..3f671ca5 100644
--- a/docs/manual-fr/imagename_translations
+++ b/docs/manual-fr/imagename_translations
@@ -1,27 +1,27 @@
-img3.png
./bacula-objects.eps
-img9.png
./bimagemgr2.eps
-img16.png
./win32-service-ok.eps
-img27.png
./properties-security-advanced-owner.eps
-img11.png
./win32-nsis.eps
-img19.png
./idle.eps
-img8.png
./bimagemgr1.eps
+img22.png
./running.eps
+img14.png
./win32-location.eps
 img13.png
./win32-pkg.eps
-img24.png
./access-is-denied.eps
-img6.png
./Conf-Diagram.eps
-img5.png
./Bacula-tray-monitor.eps
-img17.png
./win32-start.eps
+img12.png
./win32-welcome.eps
 img25.png
./view-only.eps
-img21.png
./menu.eps
+img9.png
./bimagemgr2.eps
 img26.png
./properties-security.eps
+img8.png
./bimagemgr1.eps
+img6.png
./Conf-Diagram.eps
+img15.png
./win32-service.eps
 img10.png
./bimagemgr3.eps
+img24.png
./access-is-denied.eps
+img3.png
./bacula-objects.eps
+img21.png
./menu.eps
+img17.png
./win32-start.eps
 img28.png
./confirm.eps
-img15.png
./win32-service.eps
+img19.png
./idle.eps
+img16.png
./win32-service-ok.eps
+img18.png
./win32-finish.eps
+img5.png
./Bacula-tray-monitor.eps
+img20.png
./tray-icon.eps
 img1.png
./bacula-logo.eps
+img27.png
./properties-security-advanced-owner.eps
+img11.png
./win32-nsis.eps
 img2.png
./bacula-applications.eps
 img4.png
./flow.eps
-img22.png
./running.eps
-img12.png
./win32-welcome.eps
-img20.png
./tray-icon.eps
-img14.png
./win32-location.eps
 img23.png
./error.eps
-img18.png
./win32-finish.eps
diff --git a/docs/manual-fr/images.tex b/docs/manual-fr/images.tex
index 7d2ebbba..f63a180e 100644
--- a/docs/manual-fr/images.tex
+++ b/docs/manual-fr/images.tex
@@ -85,12 +85,7 @@
 \newcommand\lthtmlboxmathZ{\@next\next\@currlist{}{\def\next{\voidb@x}}%
  \expandafter\box\next\egroup}%
 \newcommand\lthtmlmathtype[1]{\gdef\lthtmlmathenv{#1}}%
-\newcommand\lthtmllogmath{\dimen0\ht\sizebox \advance\dimen0\dp\sizebox
-  \ifdim\dimen0>.95\vsize
-   \lthtmltypeout{%
-*** image for \lthtmlmathenv\space is too tall at \the\dimen0, reducing to .95 vsize ***}%
-   \ht\sizebox.95\vsize \dp\sizebox\z@ \fi
-  \lthtmltypeout{l2hSize %
+\newcommand\lthtmllogmath{\lthtmltypeout{l2hSize %
 :\lthtmlmathenv:\the\ht\sizebox::\the\dp\sizebox::\the\wd\sizebox.\preveqno}}%
 \newcommand\lthtmlfigureA[1]{\let\@savefreelist\@freelist
        \lthtmlmathtype{#1}\lthtmlvboxmathA}%
@@ -158,127 +153,163 @@
 % !!! IMAGES START HERE !!!
 
 {\newpage\clearpage
-\lthtmlpictureA{tex2html_wrap28769}%
+\lthtmlpictureA{tex2html_wrap28150}%
+\includegraphics{./bacula-logo.eps}%
+\lthtmlpictureZ
+\lthtmlcheckvsize\clearpage}
+
+{\newpage\clearpage
+\lthtmlpictureA{tex2html_wrap28157}%
+\includegraphics{./bacula-applications.eps}%
+\lthtmlpictureZ
+\lthtmlcheckvsize\clearpage}
+
+{\newpage\clearpage
+\lthtmlpictureA{tex2html_wrap28159}%
+\includegraphics{./bacula-objects.eps}%
+\lthtmlpictureZ
+\lthtmlcheckvsize\clearpage}
+
+{\newpage\clearpage
+\lthtmlpictureA{tex2html_wrap28165}%
+\includegraphics{./flow.eps}%
+\lthtmlpictureZ
+\lthtmlcheckvsize\clearpage}
+
+{\newpage\clearpage
+\lthtmlpictureA{tex2html_wrap28366}%
+\includegraphics{./Bacula-tray-monitor.eps}%
+\lthtmlpictureZ
+\lthtmlcheckvsize\clearpage}
+
+{\newpage\clearpage
+\lthtmlpictureA{tex2html_wrap28505}%
+\includegraphics{./Conf-Diagram.eps}%
+\lthtmlpictureZ
+\lthtmlcheckvsize\clearpage}
+
+{\newpage\clearpage
+\lthtmlpictureA{tex2html_wrap28675}%
 \includegraphics{./bimagemgr1.eps}%
 \lthtmlpictureZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlpictureA{tex2html_wrap28770}%
+\lthtmlpictureA{tex2html_wrap28676}%
 \includegraphics{./bimagemgr2.eps}%
 \lthtmlpictureZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlpictureA{tex2html_wrap28771}%
+\lthtmlpictureA{tex2html_wrap28677}%
 \includegraphics{./bimagemgr3.eps}%
 \lthtmlpictureZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlpictureA{tex2html_wrap29200}%
+\lthtmlpictureA{tex2html_wrap29106}%
 \includegraphics{./win32-nsis.eps}%
 \lthtmlpictureZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlpictureA{tex2html_wrap29201}%
+\lthtmlpictureA{tex2html_wrap29107}%
 \includegraphics{./win32-welcome.eps}%
 \lthtmlpictureZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlpictureA{tex2html_wrap29202}%
+\lthtmlpictureA{tex2html_wrap29108}%
 \includegraphics{./win32-pkg.eps}%
 \lthtmlpictureZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlpictureA{tex2html_wrap29203}%
+\lthtmlpictureA{tex2html_wrap29109}%
 \includegraphics{./win32-location.eps}%
 \lthtmlpictureZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlpictureA{tex2html_wrap29204}%
+\lthtmlpictureA{tex2html_wrap29110}%
 \includegraphics{./win32-service.eps}%
 \lthtmlpictureZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlpictureA{tex2html_wrap29205}%
+\lthtmlpictureA{tex2html_wrap29111}%
 \includegraphics{./win32-service-ok.eps}%
 \lthtmlpictureZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlpictureA{tex2html_wrap29206}%
+\lthtmlpictureA{tex2html_wrap29112}%
 \includegraphics{./win32-start.eps}%
 \lthtmlpictureZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlpictureA{tex2html_wrap29207}%
+\lthtmlpictureA{tex2html_wrap29113}%
 \includegraphics{./win32-finish.eps}%
 \lthtmlpictureZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlpictureA{tex2html_wrap29208}%
+\lthtmlpictureA{tex2html_wrap29114}%
 \includegraphics{./idle.eps}%
 \lthtmlpictureZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlpictureA{tex2html_wrap29209}%
+\lthtmlpictureA{tex2html_wrap29115}%
 \includegraphics{./tray-icon.eps}%
 \lthtmlpictureZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlpictureA{tex2html_wrap29210}%
+\lthtmlpictureA{tex2html_wrap29116}%
 \includegraphics{./menu.eps}%
 \lthtmlpictureZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlpictureA{tex2html_wrap29211}%
+\lthtmlpictureA{tex2html_wrap29117}%
 \includegraphics{./running.eps}%
 \lthtmlpictureZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlpictureA{tex2html_wrap29212}%
+\lthtmlpictureA{tex2html_wrap29118}%
 \includegraphics{./error.eps}%
 \lthtmlpictureZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlpictureA{tex2html_wrap29293}%
+\lthtmlpictureA{tex2html_wrap29199}%
 \includegraphics{./access-is-denied.eps}%
 \lthtmlpictureZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlpictureA{tex2html_wrap29294}%
+\lthtmlpictureA{tex2html_wrap29200}%
 \includegraphics{./view-only.eps}%
 \lthtmlpictureZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlpictureA{tex2html_wrap29295}%
+\lthtmlpictureA{tex2html_wrap29201}%
 \includegraphics{./properties-security.eps}%
 \lthtmlpictureZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlpictureA{tex2html_wrap29296}%
+\lthtmlpictureA{tex2html_wrap29202}%
 \includegraphics{./properties-security-advanced-owner.eps}%
 \lthtmlpictureZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlpictureA{tex2html_wrap29297}%
+\lthtmlpictureA{tex2html_wrap29203}%
 \includegraphics{./confirm.eps}%
 \lthtmlpictureZ
 \lthtmlcheckvsize\clearpage}
diff --git a/docs/manual/kaboom.tex b/docs/manual/kaboom.tex
index 2a4245d3..cb6777ad 100644
--- a/docs/manual/kaboom.tex
+++ b/docs/manual/kaboom.tex
@@ -29,13 +29,16 @@ your system:
 
 \begin{enumerate}
 \item You must have an installed copy of {\bf gdb} (the GNU debugger),  and it
-   must be on {\bf Bacula's} path. 
+   must be on {\bf Bacula's} path. On some systems such as Solaris, {\bf
+   gdb} may be replaced by {\dbx}.
 \item The Bacula installed script file {\bf btraceback} must  be in the same
    directory as the daemon which dies, and it must  be marked as executable.  
 \item The script file {\bf btraceback.gdb} must  have the correct  path to it
    specified in the {\bf btraceback} file.  
 \item You must have a {\bf mail} program which is on {\bf Bacula's}  path. 
-   \end{enumerate}
+   By default, this {\bf mail} program is set to {\bf bsmtp}, so it must
+   be correctly configured.
+\end{enumerate}
 
 If all the above conditions are met, the daemon that crashes will produce a
 traceback report and email it to you. If the above conditions are not true,
@@ -52,7 +55,7 @@ mail} program or its path, or change your email address. The key line in the
 \footnotesize
 \begin{verbatim}
 gdb -quiet -batch -x /home/kern/bacula/bin/btraceback.gdb \
-     $1 $2 2>\&1 | mail -s "Bacula traceback" your-address@xxx.com
+     $1 $2 2>\&1 | bsmtp -s "Bacula traceback" your-address@xxx.com
 \end{verbatim}
 \normalsize
 
diff --git a/docs/manual/restore.tex b/docs/manual/restore.tex
index fb676779..c90aab8d 100644
--- a/docs/manual/restore.tex
+++ b/docs/manual/restore.tex
@@ -716,9 +716,8 @@ what it is now after each individual test:
 \item Set "Block Positioning = no" in your Device resource  and try the
    restore. This is a new directive and untested. 
 \item Set "Minimum Block Size = 512" and "Maximum  Block Size = 512" and
-   try the restore.  Again send me the full job report output.  If you are
-   able to determine the block size your drive was previously using, you
-   should try that size if 512 does not work.
+   try the restore.  If you are able to determine the block size your drive
+   was previously using, you should try that size if 512 does not work.
 \item Try editing the restore.bsr file at the Run xxx yes/mod/no prompt 
    before starting the restore job and remove all the VolBlock statements.
    These are what causes Bacula to reposition the tape, and where problems
diff --git a/docs/manual/tapetesting.tex b/docs/manual/tapetesting.tex
index faede97a..8dcb52a4 100644
--- a/docs/manual/tapetesting.tex
+++ b/docs/manual/tapetesting.tex
@@ -449,7 +449,11 @@ mt -f /dev/nst0 defblksize 0
 \end{verbatim}
 \normalsize
 
-or whatever is appropriate on your system.  
+or whatever is appropriate on your system. Note, if you are running a Linux
+system, and the above command does not work, it is most likely because you
+have not loaded the appropriate {\bf mt} package, which is often called
+{\bf mt_st}, but may differ according to your distribution.
+
 \item The second possibility, especially, if Bacula wrote  while the drive was
    in fixed block mode, is to turn  off block positioning in Bacula. This is done
    by  adding: 
@@ -653,6 +657,11 @@ mt -f /dev/nst0 defblksize 0
 \end{verbatim}
 \normalsize
 
+If you are running a Linux
+system, and the above command does not work, it is most likely because you
+have not loaded the appropriate {\bf mt} package, which is often called
+{\bf mt_st}, but may differ according to your distribution.
+
 If you would like to know what options you have set before making any of the
 changes noted above, you can now view them on Linux systems, thanks to a tip
 provided by Willem Riede. Do the following: 
@@ -1205,4 +1214,3 @@ you are sure that your OS parameters are properly configured as
 described earlier in this manual.  If you are running your Storage daemon 
 as root, you should not be getting these system log messages, and if
 you are, something is probably wrong.
-
-- 
2.39.5