ADoc for new changes from Kjetil that were just iintegrated

diff --git a/docs/manuals/en/concepts/bootstrap.tex b/docs/manuals/en/concepts/bootstrap.tex
index b69cdfbf7a525bcecebcda85814ea2369e0b2228..a5923f20ffa1c0255f04c327f6d21ecb4c18fd41 100644 (file)
--- a/docs/manuals/en/concepts/bootstrap.tex
+++ b/docs/manuals/en/concepts/bootstrap.tex
@@ -148,6 +148,11 @@ matched against the Volume records are:
    To restore a particular file, this value (or a range of FileIndexes) is
    required.
 
+\item [FileRegex]
+   \index[general]{FileRegex }
+   The value is a regular expression.  When specified, only matching
+   filenames will be restored.
+
 \item [Slot]
    \index[general]{Slot }
    The value specifies the autochanger slot. There may  be only a single {\bf

diff --git a/docs/manuals/en/concepts/newfeatures.tex b/docs/manuals/en/concepts/newfeatures.tex
index e9cc2e1d9d0594336d4a49b27ff138d39bde82b2..4c8a1ad7cf6e7603d54b61d3ac7c7a799e5ccceb 100644 (file)
--- a/docs/manuals/en/concepts/newfeatures.tex
+++ b/docs/manuals/en/concepts/newfeatures.tex
@@ -542,8 +542,34 @@ catalog.
 \section{Miscellaneous}
 \index[general]{Misc New Features}
 
-\subsection{Virtual Tape Emulation}
+\subsection{Allow Mixed Priority = \lt{}yes|no\g{}}
+   This directive is only implemented in version 2.5 and later.  When
+   set to {\bf yes} (default {\bf no}), this job may run even if lower
+   priority jobs are already running.  This means a high priority job
+   will not have to wait for other jobs to finish before starting.
+   The scheduler will only mix priorities when all running jobs have
+   this set to true.
+
+   Note that only higher priority jobs will start early.  Suppose the
+   director will allow two concurrent jobs, and that two jobs with
+   priority 10 are running, with two more in the queue.  If a job with
+   priority 5 is added to the queue, it will be run as soon as one of
+   the running jobs finishes.  However, new priority 10 jobs will not
+   be run until the priority 5 job has finished.
+
+\subsection{Bootstrap File Directive -- FileRegex}
+  {\bf FileRegex} is a new command that can be added to the bootstrap
+  (.bsr) file.  The value is a regular expression.  When specified, only
+  matching filenames will be restored.
+
+  During a restore, if all File records are pruned from the catalog
+  for a Job, normally Bacula can restore only all files saved. That
+  is there is no way using the catalog to select individual files.
+  With this new command, Bacula will ask if you want to specify a Regex
+  expression for extracting only a part of the full backup.
+
 
+\subsection{Virtual Tape Emulation}
 We now have a Virtual Tape emulator that allows us to run though 99.9\% of
 the tape code but actually reading and writing to a disk file. Used with the
 \textbf{disk-changer} script, you can now emulate an autochanger with 10 drives
@@ -1395,4 +1421,3 @@ should return:
 \end{description}
 
 
-

diff --git a/docs/manuals/en/install/dirdconf.tex b/docs/manuals/en/install/dirdconf.tex
index 41e79f74c4c84f12b4df00791274e3b9d4df4353..4c88d7a949a3d920e93122c291daa4c661ff5d2d 100644 (file)
--- a/docs/manuals/en/install/dirdconf.tex
+++ b/docs/manuals/en/install/dirdconf.tex
@@ -1647,7 +1647,8 @@ RunScript {
    The priority only affects waiting jobs that are queued to run, not jobs
    that are already running.  If one or more jobs of priority 2 are already
    running, and a new job is scheduled with priority 1, the currently
-   running priority 2 jobs must complete before the priority 1 job is run.
+   running priority 2 jobs must complete before the priority 1 job is
+   run, unless Allow Mixed Priority is set.
 
    The default priority is 10.  
 
@@ -1685,6 +1686,25 @@ avoid it by starting any higher priority jobs a few seconds before lower
 priority ones.  This insures that Bacula will examine the jobs in the
 correct order, and that your priority scheme will be respected.
 
+\label{AllowMixedPriority}
+\item [Allow Mixed Priority = \lt{}yes|no\g{}]
+\index[dir]{Allow Mixed Priority}
+\index[dir]{Directive|Allow Mixed Priority}
+
+   This directive is only implemented in version 2.5 and later.  When
+   set to {\bf yes} (default {\bf no}), this job may run even if lower
+   priority jobs are already running.  This means a high priority job
+   will not have to wait for other jobs to finish before starting.
+   The scheduler will only mix priorities when all running jobs have
+   this set to true.
+
+   Note that only higher priority jobs will start early.  Suppose the
+   director will allow two concurrent jobs, and that two jobs with
+   priority 10 are running, with two more in the queue.  If a job with
+   priority 5 is added to the queue, it will be run as soon as one of
+   the running jobs finishes.  However, new priority 10 jobs will not
+   be run until the priority 5 job has finished.
+
 \label{WritePartAfterJob}
 \item [Write Part After Job = \lt{}yes|no\gt{}]
 \index[dir]{Write Part After Job}