Add note on safe pruning and cleanup examples

diff --git a/docs/manuals/en/main/recycling.tex b/docs/manuals/en/main/recycling.tex
index f2cdfed56ae86d3f01637bb4911bce36a84b4ec2..444d2c0c633bf2171bc5549fe9ed1437d5aff339 100644 (file)
--- a/docs/manuals/en/main/recycling.tex
+++ b/docs/manuals/en/main/recycling.tex
@@ -37,7 +37,7 @@ records are:
 \item AutoPrune = yes 
 \item VolumeRetention = \lt{}time\gt{} 
 \item Recycle = yes
-\item RecyclePool = \lt{}APool\gt{} (\textit{This require bacula 2.1.4 or greater})
+\item RecyclePool = \lt{}APool\gt{} %(\textit{This require bacula 2.1.4 or greater})
 \end{itemize}
 
 The above three directives are all you need assuming that you fill
@@ -99,18 +99,20 @@ backup, and helps you locate files on past backups when you want to restore
 something.  However, the catalog will grow larger and larger as time goes
 on, and eventually it can become unacceptably large.
 
-Bacula's process for removing entries from the catalog is called Pruning.
-The default is Automatic Pruning, which means that once an entry reaches a
-certain age (e.g.  30 days old) it is removed from the catalog.  Once a job
-has been pruned, you can still restore it from the backup tape, but one
-additional step is required: scanning the volume with bscan.  The
-alternative to Automatic Pruning is Manual Pruning, in which you explicitly
-tell Bacula to erase the catalog entries for a volume.  You'd usually do
-this when you want to reuse a Bacula volume, because there's no point in
-keeping a list of files that USED TO BE on a tape.  Or, if the catalog is
-starting to get too big, you could prune the oldest jobs to save space.
-Manual pruning is done with the \ilink{ prune command}{ManualPruning} in
-the console.  (thanks to Bryce Denney for the above explanation).
+Bacula's process for removing entries from the catalog is called Pruning.  The
+default is Automatic Pruning, which means that once an entry reaches a certain
+age (e.g.  30 days old) it is removed from the catalog. Note that Job records
+that are required for current restore won't be removed automatically, and File
+records are needed for VirtualFull and Accurate backups. Once a job has been
+pruned, you can still restore it from the backup tape, but one additional step
+is required: scanning the volume with bscan.  The alternative to Automatic
+Pruning is Manual Pruning, in which you explicitly tell Bacula to erase the
+catalog entries for a volume.  You'd usually do this when you want to reuse a
+Bacula volume, because there's no point in keeping a list of files that USED TO
+BE on a tape.  Or, if the catalog is starting to get too big, you could prune
+the oldest jobs to save space.  Manual pruning is done with the \ilink{ prune
+  command}{ManualPruning} in the console.  (thanks to Bryce Denney for the
+above explanation).
 
 \section{Pruning Directives}
 \index[general]{Pruning Directives }
@@ -536,10 +538,11 @@ Storage {
 }
 FileSet {
   Name = "File Set"
-  Include = signature=MD5 {
-    fffffffffffffffff
+  Include { 
+    Options { signature=MD5 }
+    File = fffffffffffffffff
   }
-  Exclude = { *.o }
+  Exclude  { File=*.o }
 }
 Pool {
   Name = Daily
@@ -608,11 +611,12 @@ Storage {
   Media Type = File
 }
 FileSet {
-  Name = "Test Files"
-  Include = signature=MD5 {
-    fffffffffffffffff
+  Name = "File Set"
+  Include { 
+    Options { signature=MD5 }
+    File = fffffffffffffffff
   }
-  Exclude = { *.o }
+  Exclude  { File=*.o }
 }
 Pool {
   Name = File