Tweak MaxRunTime doc

[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 f7eda97bd12aa72a7fea7f92e0c0aab0bb52d179..7b5ea5dcea081d7c87e2daece32d836c267a0415 100644 (file)
--- a/docs/manuals/en/main/dirdconf.tex
+++ b/docs/manuals/en/main/dirdconf.tex
@@ -830,7 +830,7 @@ JobDefs {
 
 \item [FileSet = \lt{}FileSet-resource-name\gt{}]
 \index[dir]{FileSet}
-\index[dir]{FileSet}
+\index[dir]{Directive!FileSet}
    The FileSet directive specifies the FileSet that will be used in the
    current Job.  The FileSet specifies which directories (or files) are to
    be backed up, and what options to use (e.g.  compression, ...).  Only a
@@ -838,6 +838,13 @@ JobDefs {
    details, see the \ilink{FileSet Resource section}{FileSetResource} of
    this chapter.  This directive is required.
 
+\item [Base = \lt{}job-resource-name, ...\gt{}]
+\index[dir]{Base}
+\index[dir]{Directive!Base}
+The Base directive permits to specify the list of jobs that will be used during
+Full backup as base. This directive is optional. See the \ilink{Base Job
+chapter}{basejobs} for more information.
+
 \item [Messages = \lt{}messages-resource-name\gt{}]
 \index[dir]{Messages}
 \index[dir]{Directive!Messages}
@@ -924,7 +931,12 @@ JobDefs {
 \index[dir]{Directive!Max Run Time}
    The time specifies the maximum allowed time that a job may run, counted
    from when the job starts, ({\bf not} necessarily the same as when the
-   job was scheduled).
+   job was scheduled). 
+
+   By default, the the watchdog thread will kill any Job that has run more
+   than 6 days.  The maximum watchdog timeout is independent of MaxRunTime
+   and cannot be changed.
+
 
 \item [Incremental|Differential Max Wait Time = \lt{}time\gt{}]
 \index[dir]{Incremental Wait Run Time}
@@ -1132,6 +1144,7 @@ Console          &       &          & Console command\\
     %c = Client's name
     %d = Director's name
     %e = Job Exit Status
+    %h = Client address
     %i = JobId
     %j = Unique Job id
     %l = Job Level
@@ -1143,7 +1156,8 @@ Console          &       &          & Console command\\
 \end{verbatim}
 \normalsize
 
-The Job Exit Status code \%e edits the following values:
+Some character substitutions are not available in all situations. The Job Exit
+Status code \%e edits the following values:
 
 \index[dir]{Exit Status}
 \begin{itemize}
@@ -2325,7 +2339,7 @@ console run command.  This directive is required.
 
 The speed parameter specifies the maximum allowed bandwidth that a job may use
 when started for this Client. The speed parameter should be specified in
-k/s, kb/s, m/s or mb/s.
+k/s, KB/s, m/s or MB/s.
 
 \item [Priority = \lt{}number\gt{}]
    \index[dir]{Priority}