Fix MaxConsoleConnections

[bacula/docs] / docs / manuals / en / main / dirdconf.tex

diff --git a/docs/manuals/en/main/dirdconf.tex b/docs/manuals/en/main/dirdconf.tex
index 5200e80a7776c6292c29bb4b8d6ab911c3a6bbfb..aa5223fb0e15c637cddc9e25f95890b4bc1973dd 100644 (file)
--- a/docs/manuals/en/main/dirdconf.tex
+++ b/docs/manuals/en/main/dirdconf.tex
@@ -338,10 +338,9 @@ resource.
   where  \lt{}string\gt{} is an identifier which can be used for support purpose.
   This string is displayed using the \texttt{version} command.
 
-\item[MaxConsoleConnections = \lt{}number\gt{}] 
+\item[MaximumConsoleConnections = \lt{}number\gt{}] 
   \index[dir]{MaximumConsoleConnections}
-  \index[dir]{MaxConsoleConnections}
-  \index[dir]{Directive!MaxConsoleConnections}
+  \index[dir]{Directive!MaximumConsoleConnections}
   \index[dir]{Console}
    where \lt{}number\gt{}  is the maximum number of Console Connections that
    could run  concurrently. The default is set to 20, but you may set it to a 
@@ -966,8 +965,13 @@ during working hours. We can see it like \texttt{Max Start Delay + Max Run
    when the job starts, ({\bf not} necessarily the same as when the job was
    scheduled). This directive works as expected since bacula 2.3.18.
 
-\addcontentsline{lof}{figure}{Job time control directives}
-\includegraphics{\idir different_time.eps}
+\begin{figure}[htbp]
+  \centering
+  \includegraphics[width=13cm]{\idir different_time.eps}
+  \caption{Job time control directives}
+  \label{fig:differenttime}
+\end{figure}
+
 
 \item [Max Full Interval = \lt{}time\gt{}]
 \index[dir]{Max Full Interval}
@@ -1653,6 +1657,13 @@ RunScript {
 \item [Allow Duplicate Jobs = \lt{}yes\vb{}no\gt{}]
 \index[general]{Allow Duplicate Jobs}
 
+\begin{figure}[htbp]
+  \centering
+  \includegraphics[width=13cm]{\idir duplicate-real.eps}
+  \caption{Allow Duplicate Jobs usage}
+  \label{fig:allowduplicatejobs}
+\end{figure}
+
 A duplicate job in the sense we use it here means a second or subsequent job
 with the same name starts.  This happens most frequently when the first job
 runs longer than expected because no tapes are available.
@@ -1669,11 +1680,20 @@ runs longer than expected because no tapes are available.
 
 \item [Allow Higher Duplicates = \lt{}yes\vb{}no\gt{}]
 \index[general]{Allow Higher Duplicates}
-  If this directive is set to {\bf yes} (default) the job with a higher
-  priority (lower priority number) will be permitted to run, and
-  the current job will be cancelled.  If the
-  priorities of the two jobs are the same, the outcome is determined by
-  other directives (see below).
+  This directive was implemented in version 5.0.0, but does not work
+  as expected. If used, it should always be set to no.  In later versions
+  of Bacula the directive is disabled (disregarded).
+
+
+\item [Cancel Lower Level Duplicates = \lt{}yes\vb{}no\gt{}]
+\index[general]{Cancel Lower Level Duplicates}
+  If \textbf{Allow Duplicates Jobs} is set to \textbf{no} and this
+  directive is set to \textbf{yes}, Bacula will choose between duplicated
+  jobs the one with the highest level.  For example, it will cancel a
+  previous Incremental to run a Full backup.  It works only for Backup
+  jobs.  The default is \texttt{no}. If the levels of the duplicated
+  jobs are the same, nothing is done and the other
+  Cancel XXX Duplicate directives will be examined.
 
 \item [Cancel Queued Duplicates = \lt{}yes\vb{}no\gt{}]
 \index[general]{Cancel Queued Duplicates}
@@ -1688,6 +1708,13 @@ runs longer than expected because no tapes are available.
   if this directive is set to {\bf yes} any job that is already running
   will be canceled.  The default is {\bf no}.
 
+
+\item[DuplicateJobProximity = \lt{}time-specification\gt{}]
+\index[general]{Duplicate Job Proximity}
+  This directive permits to determine if two jobs are really duplicated.
+  If the first one is running for long time, this is probably not a good
+  idea to cancel it.
+
 \item [Run = \lt{}job-name\gt{}]
    \index[dir]{Run}
    \index[dir]{Directive!Run}