update manual

diff --git a/docs/manuals/en/main.tex b/docs/manuals/en/main.tex
index 245c6ccf043c9b54e832ec6fba153fd2072e09ab..7791f5f834c2ff655da6bd92d5dc532af7f287d5 100644 (file)
--- a/docs/manuals/en/main.tex
+++ b/docs/manuals/en/main.tex
@@ -77,57 +77,62 @@
 \markboth{Bacula Version \version}{Bacula Version \version}
 \pagenumbering{arabic}
 
-\part{Concepts and Overview}
-\include{concepts/general}
-\include{concepts/newfeatures}
-\include{concepts/pluginAPI}
-\include{concepts/state}
-\include{concepts/requirements}
-\include{concepts/supportedoses}
-\include{concepts/supporteddrives}
-\include{concepts/tutorial}
-\include{concepts/restore}
-\include{concepts/recycling}
-\include{concepts/disk}
-\include{concepts/pools}
-\include{concepts/migration}
-\include{concepts/strategies}
-\include{concepts/autochangers}
-\include{concepts/supportedchangers}
-\include{concepts/spooling}
-\include{concepts/statistics}
-\include{concepts/ansi-labels}
-\include{concepts/win32}
-\include{concepts/rescue}
-\include{concepts/tls}
-\include{concepts/dataencryption}
-\include{concepts/verify}
-\include{concepts/bootstrap}
-
-\part{Installation and Configuration}
-\include{install/quickstart}
-\include{install/installation}
-\include{install/critical}
-\include{install/configure}
-\include{install/dirdconf}
-\include{install/filedconf}
-\include{install/storedconf}
-\include{install/messagesres}
-\include{install/consoleconf}
-\include{install/monitorconf}
-\include{install/security}
+\part{Bacula Main Reference}
+\include{main/general} 
+\include{main/newfeatures} 
+\include{main/state} 
+\include{main/requirements} 
+\include{main/supportedoses} 
+\include{main/supporteddrives} 
+\include{main/quickstart} 
+\include{main/install} 
+\include{main/critical} 
+\include{main/tutorial} 
+\include{main/configure} 
+\include{main/dirdconf} 
+\include{main/filedconf} 
+\include{main/storedconf} 
+\include{main/messagesres} 
+\include{main/consoleconf} 
+\include{main/monitorconf} 
+\include{main/restore} 
+\include{main/recycling} 
+\include{main/disk} 
+\include{main/pools} 
+\include{main/migration} 
+\include{main/strategies} 
+\include{main/autochangers} 
+\include{main/supportedchangers}
+\include{main/spooling}
+\include{main/statistics}
+\include{main/ansi-labels}
+\include{main/win32}
+\include{main/rescue}
+\include{main/tls}
+\include{main/dataencryption}
+\include{main/verify}
+\include{main/mysql}
+\include{main/postgresql}
+\include{main/sqlite}
+\include{main/catmaintenance}
+\include{main/tapetesting}
+\include{main/security}
+\include{main/bootstrap}
 
 \part{Console and Operators}
+\setcounter{chapter}{0}
 \include{console/bconsole} 
 \include{console/gui}
 
 \part{Catalog Database}
+\setcounter{chapter}{0}
 \include{catalog/catmaintenance}
 \include{catalog/mysql}
 \include{catalog/postgresql}
 \include{catalog/sqlite}
 
 \part{Problem and Resolution}
+\setcounter{chapter}{0}
 \include{problems/faq}
 \include{problems/tips}
 \include{problems/tapetesting}
@@ -135,11 +140,13 @@
 \include{problems/kaboom}
 
 \part{Utility Programs}
+\setcounter{chapter}{0}
 \include{utility/progs}
 \include{utility/bimagemgr-chapter}
 \include{utility/rpm-faq}
 
 \part{Miscellaneous}
+\setcounter{chapter}{0}
 \include{misc/python}
 \include{misc/vars}
 \include{misc/stunnel}
@@ -147,13 +154,14 @@
 \include{misc/internaldb}
 
 \part{Annexes}
-\include{concepts/license}
-\include{concepts/fdl}
-\include{concepts/gpl}
-\include{concepts/lesser}
-\include{concepts/projects}
-\include{concepts/thanks}
-\include{concepts/bugs}
+\setcounter{chapter}{0}
+\include{main/license}
+\include{main/fdl}
+\include{main/gpl}
+\include{main/lesser}
+\include{main/projects}
+\include{main/thanks}
+\include{main/bugs}
 
 
 % pull in the index

diff --git a/docs/manuals/en/main/newfeatures.tex b/docs/manuals/en/main/newfeatures.tex
index e1918a09eff550e8627fdc6df8bee37a4a06cb8e..d4362d31b368e9d45a035822f0f6d656991cc5b9 100644 (file)
--- a/docs/manuals/en/main/newfeatures.tex
+++ b/docs/manuals/en/main/newfeatures.tex
@@ -440,7 +440,7 @@ removed from the code.
 \item Fixed several deadlocks or potential race conditions from SD
 \end{itemize}
 
-\chapter{Released Version 3.0.3}
+\chapter{Released Version 3.0.3 and 3.0.3a}
 
 There are no new features. This version simply fixes a number of bugs found in
 version 3.0.2 during the onging development process.

diff --git a/docs/manuals/en/problems/tapetesting.tex b/docs/manuals/en/problems/tapetesting.tex
index 8b1bdee6552ce0e6a7b85202bbc11eced85e7720..710f90e75dbc34bffd06b47de733fa5563e7b4ba 100644 (file)
--- a/docs/manuals/en/problems/tapetesting.tex
+++ b/docs/manuals/en/problems/tapetesting.tex
@@ -353,6 +353,54 @@ See the section above on setting your {\bf Archive device} correctly.
 For FreeBSD users, please see the notes below for doing further testing of
 your tape drive. 
 
+\subsection{Testing tape drive speed}
+\label{sec:btapespeed}
+
+To determine the best configuration of your tape drive, you can run the
+\texttt{speed} command available in the \texttt{btape} program.
+
+This command can have the following arguments:
+\begin{itemize}
+\item[\texttt{file\_size=n}] Specify the Maximum File Size for this test
+  (between 1 and 5GB). This counter is in GB.
+\item[\texttt{nb\_file=n}] Specify the number of file to be written. The amount
+  of data should be greater than your memory ($file\_size*nb\_file$).
+\item[\texttt{skip\_zero}] This flag permits to skip tests with constant
+  data.
+\item[\texttt{skip\_random}] This flag permits to skip tests with random
+  data.
+\item[\texttt{skip\_raw}] This flag permits to skip tests with raw access.
+\item[\texttt{skip\_block}] This flag permits to skip tests with Bacula block
+  access.
+\end{itemize}
+
+\begin{verbatim}
+*speed file_size=3 skip_raw
+btape.c:1078 Test with zero data and bacula block structure.
+btape.c:956 Begin writing 3 files of 3.221 GB with blocks of 129024 bytes.
+++++++++++++++++++++++++++++++++++++++++++
+btape.c:604 Wrote 1 EOF to "Drive-0" (/dev/nst0)
+btape.c:406 Volume bytes=3.221 GB. Write rate = 44.128 MB/s
+...
+btape.c:383 Total Volume bytes=9.664 GB. Total Write rate = 43.531 MB/s
+
+btape.c:1090 Test with random data, should give the minimum throughput.
+btape.c:956 Begin writing 3 files of 3.221 GB with blocks of 129024 bytes.
++++++++++++++++++++++++++++++++++++++++++++
+btape.c:604 Wrote 1 EOF to "Drive-0" (/dev/nst0)
+btape.c:406 Volume bytes=3.221 GB. Write rate = 7.271 MB/s
++++++++++++++++++++++++++++++++++++++++++++
+...
+btape.c:383 Total Volume bytes=9.664 GB. Total Write rate = 7.365 MB/s
+
+\end{verbatim}
+
+When using compression, the random test will give your the minimum throughput
+of your drive . The test using constant string will give you the maximum speed
+of your hardware chain. (cpu, memory, scsi card, cable, drive, tape).
+
+You can change the block size in the Storage Daemon configuration file.
+
 \label{SCSITricks}
 \subsection{Linux SCSI Tricks}
 \index[general]{Tricks!Linux SCSI}