From bd74ed902c516fff82a6f1f949f59870e64005d2 Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@baculasystems.com>
Date: Mon, 4 Feb 2013 09:55:10 +0100
Subject: [PATCH] Prepare newfeature for virtualfull

---
 docs/manuals/en/main/migration.tex     |  6 +--
 docs/manuals/en/main/newbsfeatures.tex | 55 ++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/docs/manuals/en/main/migration.tex b/docs/manuals/en/main/migration.tex
index 2147ed19..1e81c686 100644
--- a/docs/manuals/en/main/migration.tex
+++ b/docs/manuals/en/main/migration.tex
@@ -609,7 +609,7 @@ Full was actually run.
 
 % \subsection{Manually Specify Jobs to Consolidate}
 % By default Bacula is selecting jobs automatically, however, you may want to
-% choose any point in time for the Virtual backup.
+% choose any point in time to create the Virtual backup.
 %
 % For example, if you have the following Jobs in your catalog:
 % \begin{lstlisting}
@@ -653,8 +653,8 @@ Full was actually run.
 % Bacula will discard the jobid 8.
 %
 % If you know what you are doing and still want to consolidate jobs that have
-% different names, you must use \texttt{alljobid=} keyword instead of
-% \texttt{jobid=}.
+% different names (so probably different clients, filesets, etc...), you must
+% use \texttt{alljobid=} keyword instead of \texttt{jobid=}.
 %
 % \begin{lstlisting}
 % run job=Vbackup alljobid=1-3,6-8 level=VirtualFull
diff --git a/docs/manuals/en/main/newbsfeatures.tex b/docs/manuals/en/main/newbsfeatures.tex
index 354b6380..5382ec05 100644
--- a/docs/manuals/en/main/newbsfeatures.tex
+++ b/docs/manuals/en/main/newbsfeatures.tex
@@ -7,6 +7,61 @@ In addition to the features in this chapter, the Enterprise version
 will include the Community features described in the Community new Features
 chapter.
 
+% \section{Bacula Enterprise 6.x.x}
+% \subsection{VirtualFull Backup Consolidation Enhancements}
+% 
+% By default Bacula is selecting jobs automatically, however, you may want to
+% choose any point in time to create the Virtual backup.
+%
+% For example, if you have the following Jobs in your catalog:
+% \begin{lstlisting}
+% +-------+---------+-------+----------+----------+-----------+
+% | JobId | Name    | Level | JobFiles | JobBytes | JobStatus |
+% +-------+---------+-------+----------+----------+-----------+
+% | 1     | Vbackup | F     | 1754     | 50118554 | T         |
+% | 2     | Vbackup | I     | 1        | 4        | T         |
+% | 3     | Vbackup | I     | 1        | 4        | T         |
+% | 4     | Vbackup | D     | 2        | 8        | T         |
+% | 5     | Vbackup | I     | 1        | 6        | T         |
+% | 6     | Vbackup | I     | 10       | 60       | T         |
+% | 7     | Vbackup | I     | 11       | 65       | T         |
+% | 8     | Save    | F     | 1758     | 50118564 | T         |
+% +-------+---------+-------+----------+----------+-----------+
+% \end{lstlisting}
+%
+% If you want to consolidate only the first 3 jobs and create a virtual backup
+% equivalent to Job 1 + Job 2 + Job 3, you will use \texttt{jobid=3} in the
+% \texttt{run} command, then Bacula will select the previous Full backup, the
+% previous Differential (if any) and all subsequent Incremental jobs.
+% 
+% \begin{lstlisting}
+% run job=Vbackup jobid=3 level=VirtualFull
+% \end{lstlisting}
+%
+% If you want to consolidate a specific job list, you must specify the exact
+% list of jobs to merge in the run command line.  For example, to consolidate
+% the last Differential and all subsequent Incremental, you will use
+% \texttt{jobid=4,5,6,7} or \texttt{jobid=4-7} in the run command line. As one
+% of the Job in the list is a Differential backup, Bacula will set the new job
+% level to Differential. If the list is composed only with Incremental jobs,
+% the new job will have a level set to Incremental.
+% 
+% \begin{lstlisting}
+% run job=Vbackup jobid=4-7 level=VirtualFull
+% \end{lstlisting}
+%
+% When using this feature, Bacula will automatically discard jobs that are not
+% related to the current Job. For example, specifying \texttt{jobid=7,8},
+% Bacula will discard the jobid 8.
+%
+% If you know what you are doing and still want to consolidate jobs that have
+% different names (so probably different clients, filesets, etc...), you must
+% use \texttt{alljobid=} keyword instead of \texttt{jobid=}.
+%
+% \begin{lstlisting}
+% run job=Vbackup alljobid=1-3,6-8 level=VirtualFull
+% \end{lstlisting}
+
 \section{Bacula Enterprise 6.2.0}
 
 \subsection{BWeb Bacula Configuration GUI}
-- 
2.39.5