cleanup

manuals/en/main/director-resource-client-definitions.tex

@@ -17,8 +17,7 @@
 }
 
 \defDirective{Dir}{Client}{Auto Prune}{}{}{%
-\label{AutoPrune}
-If AutoPrune is set to  {\bf yes} (default is no), Bareos
+If AutoPrune is set to  {\bf yes}, Bareos
 will  automatically apply the File retention period and the Job  retention
 period for the Client at the end of the Job.  If you leave the default {\bf AutoPrune = no},
 pruning will not be done, and your Catalog will grow in size each time you

manuals/en/main/director-resource-pool-definitions.tex

@@ -14,7 +14,6 @@
 }
 
 \defDirective{Dir}{Pool}{Auto Prune}{}{}{%
-\label{PoolAutoPrune}%
 If AutoPrune is set to {\bf yes}, Bareos  will automatically
 apply the Volume Retention period when new
 Volume is needed and no appendable Volumes exist in the Pool.  Volume
@@ -94,7 +93,6 @@
 }
 
 \defDirective{Dir}{Pool}{Label Format}{}{}{%
-\label{Label}%
 This directive specifies the format of the labels contained in this
 pool.  The format directive is used as a sort of template to create new
 Volume names during automatic Volume labeling.
@@ -133,7 +131,6 @@
 after the equal sign) in double quotes.
 }
 
-%\xdirective{dir}{}{Label Type}{ANSI{\textbar}IBM{\textbar}Bareos}{required}{Bareos}{}{
 \defDirective{Dir}{Pool}{Label Type}{ANSI{\textbar}IBM{\textbar}Bareos}{}{%
 This directive is implemented in the
 Director Pool resource and in the SD Device
@@ -213,7 +210,6 @@
 }
 
 \defDirective{Dir}{Pool}{Maximum Volumes}{}{}{%
-\label{MaxVolumes}%
 This directive specifies the maximum number of volumes (tapes or files)
 contained in the pool.  This directive is optional, if omitted or set to
 zero, any number of volumes will be permitted.  In general, this
@@ -261,7 +257,6 @@
 }
 
 \defDirective{Dir}{Pool}{Purge Oldest Volume}{}{}{%
-\label{PurgeOldest}%
 This directive instructs the Director to search for the oldest used
 Volume in the Pool when another Volume is requested by the Storage
 daemon and none are available.  The catalog is then {\bf purged}
@@ -290,7 +285,6 @@
 }
 
 \defDirective{Dir}{Pool}{Recycle}{}{}{%
-\label{PoolRecycle}%
 This directive specifies whether or not Purged Volumes may be recycled.
 If it is set to {\bf yes} (default) and Bareos needs a volume but finds
 none that are appendable, it will search for and recycle (reuse) Purged
@@ -317,7 +311,6 @@
 }
 
 \defDirective{Dir}{Pool}{Recycle Current Volume}{}{}{%
-\label{RecycleCurrent}%
 If Bareos needs a new Volume, this directive instructs Bareos to Prune
 the volume respecting the Job and File retention periods.  If all Jobs
 are pruned (i.e.  the volume is Purged), then the Volume is recycled and
@@ -338,7 +331,6 @@
 }
 
 \defDirective{Dir}{Pool}{Recycle Oldest Volume}{}{}{%
-\label{RecycleOldest}%
 This directive instructs the Director to search for the oldest used
 Volume in the Pool when another Volume is requested by the Storage
 daemon and none are available.  The catalog is then {\bf pruned}
@@ -360,7 +352,6 @@
 }
 
 \defDirective{Dir}{Pool}{Recycle Pool}{}{}{%
-\label{PoolRecyclePool}%
 This directive defines to which pool
 the Volume will be placed (moved) when it is recycled. Without
 this directive, a Volume will remain in the same pool when it is
@@ -378,7 +369,6 @@
 }
 
 \defDirective{Dir}{Pool}{Scratch Pool}{}{}{%
-\label{PoolScratchPool}%
 This directive permits to specify a dedicate \textsl{Scratch} for the
 current pool. This pool will replace the special pool named \textsl{Scrach}
 for volume selection. For more information about \textsl{Scratch} see
@@ -407,7 +397,6 @@
 }
 
 \defDirective{Dir}{Pool}{Volume Retention}{}{}{%
-\label{VolRetention}%
 The Volume Retention directive defines the length of time that
 Bareos will keep records associated with the Volume in
 the Catalog database after the End time of each Job written to the

manuals/en/main/disk.tex

@@ -235,33 +235,34 @@ \subsection{Restricting the Number of Volumes and Recycling}
    \linkResourceDirective{Dir}{Client}{Job Retention}  record in the Client
    resource.
 \item The
-   \ilink{ AutoPrune = yes}{AutoPrune} record in the Client resource
+   \linkResourceDirective{Dir}{Client}{Auto Prune} = yes record in the Client resource
    to permit  application of the above two retention periods.
 \item The
    \linkResourceDirective{Dir}{Pool}{Volume Retention} record in the Pool
    resource.
 \item The
-   \ilink{ AutoPrune = yes}{PoolAutoPrune} record in the Pool
+   \linkResourceDirective{Dir}{Pool}{Auto Prune} = yes record in the Pool
    resource to permit  application of the Volume retention period.
 \item The
-   \ilink{ Recycle = yes}{PoolRecycle} record in the Pool resource
+   \linkResourceDirective{Dir}{Pool}{Recycle} = yes record in the Pool resource
    to permit  automatic recycling of Volumes whose Volume retention period has
    expired.
 \item The
-   \ilink{ Recycle Oldest Volume = yes}{RecycleOldest} record in the
+   \linkResourceDirective{Dir}{Pool}{Recycle Oldest Volume} = yes record in the
    Pool resource tells Bareos  to Prune the oldest volume in the Pool, and if all
    files  were pruned to recycle this volume and use it.
 \item The
-   \ilink{ Recycle Current Volume = yes}{RecycleCurrent} record in
+   \linkResourceDirective{Dir}{Pool}{Recycle Current Volume} = yes record in
    the Pool resource tells Bareos  to Prune the currently mounted volume in the
    Pool, and if all files  were pruned to recycle this volume and use it.
 \item The
-   \ilink{ Purge Oldest Volume = yes}{PurgeOldest} record in the
+   \linkResourceDirective{Dir}{Pool}{Purge Oldest Volume} = yes record in the
    Pool resource  permits a forced recycling of the oldest Volume when a new one
-   is  needed.  {\bf N.B. This record ignores retention periods! We highly
-   recommend  not to use this record, but instead use Recycle Oldest Volume}
+   is  needed.\\
+   \warning{This record ignores retention periods! We highly
+   recommend  not to use this record, but instead use \linkResourceDirective{Dir}{Pool}{Recycle Oldest Volume}.}
 \item The
-   \ilink{ Maximum Volumes = nnn}{MaxVolumes} record in the Pool
+   \linkResourceDirective{Dir}{Pool}{Maximum Volumes} = nnn record in the Pool
    resource to limit  the number of Volumes that can be created.
 \end{enumerate}
 

manuals/en/main/recycling.tex

@@ -675,9 +675,8 @@ \subsection{Manually Recycling Volumes}
 \index[general]{Recycle!Manual}
 
 
-Although automatic recycling of Volumes is implemented in version 1.20 and
-later (see the
-\ilink{Automatic Recycling of Volumes}{RecyclingChapter} chapter of
+Although automatic recycling of Volumes is implemented (see the
+\nameref{RecyclingChapter} chapter of
 this manual), you may want to manually force reuse (recycling) of a Volume.
 
 Assuming that you want to keep the Volume name, but you simply want to write