From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 31 Dec 2011 09:32:38 +0000 (+0100)
Subject: Fix pruning documentation according to bug #1715
X-Git-Tag: Release-5.2.13~53
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fb5e78880b1aa19eec9fd5338fd1c865ea361fdf;p=bacula%2Fdocs

Fix pruning documentation according to bug #1715
---

diff --git a/docs/manuals/en/main/dirdconf.tex b/docs/manuals/en/main/dirdconf.tex
index 9f9739c0..0c989f17 100644
--- a/docs/manuals/en/main/dirdconf.tex
+++ b/docs/manuals/en/main/dirdconf.tex
@@ -1043,30 +1043,31 @@ use. The speed parameter should be specified in k/s, kb/s, m/s or mb/s.
 \item [Prune Jobs = \lt{}yes\vb{}no\gt{}]
 \index[dir]{Prune Jobs}
 \index[dir]{Directive!Prune Jobs}
-   Normally, pruning of Jobs from the Catalog is specified on a Pool by
-   Pool basis in the Pool resource with the {\bf AutoPrune} directive.
+   Normally, pruning of Jobs from the Catalog is specified on a Client by
+   Client basis in the Client resource with the {\bf AutoPrune} directive.
    If this directive is specified (not normally) and the value is {\bf
-   yes}, it will override the value specified in the Pool resource.  The
+   yes}, it will override the value specified in the Client resource.  The
    default is {\bf no}.
 
 
 \item [Prune Files = \lt{}yes\vb{}no\gt{}]
 \index[dir]{Prune Files}
 \index[dir]{Directive!Prune Files}
-   Normally, pruning of Files from the Catalog is specified on a Pool by
-   Pool basis in the Pool resource with the {\bf AutoPrune} directive.
+   Normally, pruning of Files from the Catalog is specified on a Client by
+   Client basis in the Client resource with the {\bf AutoPrune} directive.
    If this directive is specified (not normally) and the value is {\bf
-   yes}, it will override the value specified in the Pool resource.  The
+   yes}, it will override the value specified in the Client resource.  The
    default is {\bf no}.
 
 \item [Prune Volumes = \lt{}yes\vb{}no\gt{}]
 \index[dir]{Prune Volumes}
 \index[dir]{Directive!Prune Volumes}
-   Normally, pruning of Volumes from the Catalog is specified on a Pool
-   by Pool basis in the Pool resource with the {\bf AutoPrune}
-   directive.  If this directive is specified (not normally) and the value
-   is {\bf yes}, it will override the value specified in the Pool
-   resource.  The default is {\bf no}.
+   Normally, pruning of Volumes from the Catalog is specified on a Pool by
+   Pool basis in the Pool resource with the {\bf AutoPrune} directive.
+   Note, this is different from File and Job pruning which is done on a
+   Client by Client basis.  If this directive is specified (not normally)
+   and the value is {\bf yes}, it will override the value specified in the
+   Pool resource.  The default is {\bf no}.
 
 \item [RunScript \{\lt{}body-of-runscript\gt{}\}]
    \index[dir]{RunScript}