Apply Marc Schiffbauer's patch

diff --git a/docs/manual/tips.tex b/docs/manual/tips.tex
index 59f0152d7d0c266930b4e676114060fb4938417a..08aeb429f15d4f042f4a8ce6620be6e6872b0a93 100644 (file)
--- a/docs/manual/tips.tex
+++ b/docs/manual/tips.tex
@@ -979,36 +979,31 @@ its operation.
 \index[general]{Concurrent Jobs}
 
 Bacula can run multiple concurrent jobs, but the default configuration files
-are not set to do so. Using the {\bf Maximum Concurrent Jobs} directive, you
-have a lot of control over how many jobs can run at the same time, and which
-jobs can run simultaneously. The downside is that it can be a bit tricky to
-set it up for the first time as you need to set the concurrency in at least
-five different places. 
-
-The Director, the File daemon, and the Storage daemon each have a {\bf Maximum
-Concurrent Jobs} directive that determines overall number of concurrent jobs
-the daemon will run. The default is one for the Director and ten for both the
-File daemon and the Storage daemon, so assuming you will not be running more
-than ten concurrent jobs, the only changes that are needed are in the
-Director's conf file (bacula-dir.conf). 
-
-Within the Director's configuration file, {\bf Maximum Concurrent Jobs} can be
-set in the Direct, Job, Client, and Storage resources. Each one must be set
-properly, according to your needs, otherwise your jobs may be run one at a
-time. 
+do not enable it. Using the {\bf Maximum Concurrent Jobs} directive, you
+can configure how many and which jobs can be run simultaneously. 
+The Director's default value for {\bf Maximum Concurrent Jobs} is "1".
+
+To initially setup concurrent jobs you need to define {\bf Maximum Concurrent Jobs} in 
+the Director's configuration file (bacula-dir.conf) in the 
+Director, Job, Client, and Storage resources.
+
+Additionally the File daemon, and the Storage daemon each have their own
+{\bf Maximum Concurrent Jobs} directive that sets the overall maximum
+number of concurrent jobs the daemon will run.  The default for both the
+File daemon and the Storage daemon is "20".
 
 For example, if you want two different jobs to run simultaneously backing up
 the same Client to the same Storage device, they will run concurrently only if
 you have set {\bf Maximum Concurrent Jobs} greater than one in the Director
 resource, the Client resource, and the Storage resource in bacula-dir.conf. 
 
-We recommend that you carefully read the \ilink{Data
-Spooling}{SpoolingChapter} of this manual first, then carefully
-test your multiple concurrent backup including
-restore testing before you put it into production.      
+We recommend that you read the \ilink{Data
+Spooling}{SpoolingChapter} of this manual first, then test your multiple
+concurrent backup including restore testing before you put it into
+production.
 
 Below is a super stripped down bacula-dir.conf file showing you the four
-places where the the file has been modified to allow the same job {\bf
+places where the the file must be modified to allow the same job {\bf
 NightlySave} to run up to four times concurrently. The change to the Job
 resource is not necessary if you want different Jobs to run at the same time,
 which is the normal case.