From 2e630a75b28405e5dbff18ba1d690a39527f8dac Mon Sep 17 00:00:00 2001 From: Joerg Steffens Date: Fri, 24 Oct 2014 17:03:10 +0200 Subject: [PATCH] tweak: cleanup some links --- manuals/en/main/accuratemode.tex | 2 +- manuals/en/main/autochangers.tex | 2 +- manuals/en/main/bootstrap.tex | 2 +- manuals/en/main/critical.tex | 10 ++++------ manuals/en/main/dirdconf.tex | 6 ++---- manuals/en/main/director-resource-job-definitions.tex | 11 +---------- manuals/en/main/disk.tex | 2 +- manuals/en/main/restore.tex | 4 ++-- manuals/en/main/storedconf.tex | 2 +- 9 files changed, 14 insertions(+), 27 deletions(-) diff --git a/manuals/en/main/accuratemode.tex b/manuals/en/main/accuratemode.tex index 922a95d..d4a6770 100644 --- a/manuals/en/main/accuratemode.tex +++ b/manuals/en/main/accuratemode.tex @@ -1,4 +1,4 @@ \label{accuratemode} \TODO{to be written} -See \ilink{director fileset configuration about accurate mode}{dir-resource-accurate}. +See \linkResourceDirective{Dir}{Job}{Accurate}. diff --git a/manuals/en/main/autochangers.tex b/manuals/en/main/autochangers.tex index 8ad7b6b..81ca061 100644 --- a/manuals/en/main/autochangers.tex +++ b/manuals/en/main/autochangers.tex @@ -243,7 +243,7 @@ \section{Multiple Devices} As a default, Bareos jobs will prefer to write to a Volume that is already mounted. If you have a multiple drive autochanger and you want Bareos to write to more than one Volume in the same Pool at the same -time, you will need to set \ilink{Prefer Mounted Volumes} {PreferMountedVolumes} +time, you will need to set \linkResourceDirective{Dir}{Job}{Prefer Mounted Volumes} in the Directors Job resource to {\bf no}. This will cause the Storage daemon to maximize the use of drives. diff --git a/manuals/en/main/bootstrap.tex b/manuals/en/main/bootstrap.tex index b338b77..1f4d72d 100644 --- a/manuals/en/main/bootstrap.tex +++ b/manuals/en/main/bootstrap.tex @@ -15,7 +15,7 @@ \chapter{The Bootstrap File} for you during the \ilink{restore command}{_ConsoleChapter} in the Console program, or by using a -\ilink{ Write Bootstrap}{writebootstrap} record in your Backup +\linkResourceDirective{Dir}{Job}{Write Bootstrap} record in your Backup Jobs, and thus you will never need to know the details of this file. The {\bf bootstrap} file contains ASCII information that permits precise diff --git a/manuals/en/main/critical.tex b/manuals/en/main/critical.tex index 7dde1d1..61cdc6a 100644 --- a/manuals/en/main/critical.tex +++ b/manuals/en/main/critical.tex @@ -45,12 +45,10 @@ \section{Critical Items} (Linux, Solaris, HP, MacOS, FreeBSD, Win32, ...), restore files from each system type. The \ilink{Restoring Files}{RestoreChapter} chapter shows you how. -\item Write a bootstrap file to a separate system for each backup job. The - Write Bootstrap directive is described in the - \ilink{Director Configuration}{writebootstrap} chapter of the - manual, and more details are available in the - \ilink{Bootstrap File}{BootstrapChapter} chapter. Also, the default - bareos-dir.conf comes with a Write Bootstrap directive defined. This allows +\item Write a bootstrap file to a separate system for each backup job. + See \linkResourceDirective{Dir}{Job}{Write Bootstrap} directive and more details are available in the + \nameref{BootstrapChapter} chapter. Also, the default + \file{bareos-dir.conf} comes with a Write Bootstrap directive defined. This allows you to recover the state of your system as of the last backup. \item Backup your catalog. An example of this is found in the default bareos-dir.conf file. The backup script is installed by default and diff --git a/manuals/en/main/dirdconf.tex b/manuals/en/main/dirdconf.tex index 2d1aa05..add16fb 100644 --- a/manuals/en/main/dirdconf.tex +++ b/manuals/en/main/dirdconf.tex @@ -790,10 +790,8 @@ \section{Counter Resource} \index[general]{Counter Resource} The Counter Resource defines a counter variable that can be accessed by -variable expansion used for creating Volume labels with the {\bf LabelFormat} -directive. See the -\ilink{LabelFormat}{Label} directive in this chapter for more -details. +variable expansion used for creating Volume labels with the \linkResourceDirective{Dir}{Pool}{Label Format} +directive. \input{autogenerated/director-resource-counter-table.tex} diff --git a/manuals/en/main/director-resource-job-definitions.tex b/manuals/en/main/director-resource-job-definitions.tex index 04fe764..a1ee17e 100644 --- a/manuals/en/main/director-resource-job-definitions.tex +++ b/manuals/en/main/director-resource-job-definitions.tex @@ -1,5 +1,4 @@ \defDirective{Dir}{Job}{Accurate}{}{}{% -\label{dir-resource-accurate}% In accurate mode, the File daemon knowns exactly which files were present after the last backup. So it is able to handle deleted or renamed files. @@ -21,7 +20,6 @@ } \defDirective{Dir}{Job}{Add Prefix}{}{}{% -\label{confaddprefix} This directive applies only to a Restore job and specifies a prefix to the directory name of all files being restored. This will use \ilink{File Relocation}{filerelocation} feature. @@ -62,7 +60,6 @@ } \defDirective{Dir}{Job}{Allow Mixed Priority}{}{}{% -\label{AllowMixedPriority}% 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 @@ -253,7 +250,6 @@ } \defDirective{Dir}{Job}{Level}{}{}{% -\label{Level} The Level directive specifies the default Job level to be run. Each different Job Type (Backup, Restore, Verify, ...) has a different set of Levels that can be specified. The Level is normally overridden by a different @@ -607,7 +603,6 @@ } \defDirective{Dir}{Job}{Prefer Mounted Volumes}{}{}{% -\label{PreferMountedVolumes} If the Prefer Mounted Volumes directive is set to {\bf yes}, the Storage daemon is requested to select either an Autochanger or a drive with a valid Volume already mounted in preference to a drive @@ -653,7 +648,6 @@ } \defDirective{Dir}{Job}{Priority}{}{}{% -\label{Priority} This directive permits you to control the order in which your jobs will be run by specifying a positive non-zero number. The higher the number, the lower the job priority. Assuming you are not running concurrent jobs, @@ -666,13 +660,11 @@ running priority 2 jobs must complete before the priority 1 job is run, unless Allow Mixed Priority is set. -The default priority is 10. - If you want to run concurrent jobs you should keep these points in mind: \begin{itemize} -\item See \ilink{Running Concurrent Jobs}{ConcurrentJobs} on how to setup +\item See \nameref{ConcurrentJobs} on how to setup concurrent jobs. \item Bareos concurrently runs jobs of only one priority at a time. It @@ -1422,7 +1414,6 @@ } \defDirective{Dir}{Job}{Write Bootstrap}{}{}{% -\label{writebootstrap}% The {\bf writebootstrap} directive specifies a file name where Bareos will write a {\bf bootstrap} file for each Backup job run. This directive applies only to Backup Jobs. If the Backup job is a Full diff --git a/manuals/en/main/disk.tex b/manuals/en/main/disk.tex index bd13e74..9901ff1 100644 --- a/manuals/en/main/disk.tex +++ b/manuals/en/main/disk.tex @@ -210,7 +210,7 @@ \subsection{Automatic Volume Labeling} \normalsize You can find more details of the {\bf Label Format} Pool record in -\ilink{Label Format}{Label} description of the Pool resource +\linkResourceDirective{Dir}{Pool}{Label Format} description of the Pool resource records. \label{Recycling1} diff --git a/manuals/en/main/restore.tex b/manuals/en/main/restore.tex index 01c6e5e..87bd551 100644 --- a/manuals/en/main/restore.tex +++ b/manuals/en/main/restore.tex @@ -596,7 +596,7 @@ \section{Command Line Arguments} \end{itemize} \section{Using File Relocation} -\index[general]{Using File Relocation} +\index[general]{File Relocation!using} \label{filerelocation} \label{restorefilerelocation} @@ -627,7 +627,7 @@ \subsection*{Introduction} the \ilink{restore section}{restorefilerelocation} of this manual; you can modify your restore job before running it; or you can add options to your restore job in as described in -\ilink{bareos-dir.conf}{confaddprefix}. +\linkResourceDirective{Dir}{Job}{Strip Prefix} and \linkResourceDirective{Dir}{Job}{Add Prefix}. \begin{verbatim} Parameters to modify: diff --git a/manuals/en/main/storedconf.tex b/manuals/en/main/storedconf.tex index df9b32d..96df4fc 100644 --- a/manuals/en/main/storedconf.tex +++ b/manuals/en/main/storedconf.tex @@ -826,7 +826,7 @@ \section{Device Resource} \index[sd]{Directive!Label Media} If {\bf Yes}, permits this device to automatically label blank media without an explicit operator command. It does so by using an internal -algorithm as defined on the \ilink{Label Format}{Label} record in each +algorithm as defined on the \linkResourceDirective{Dir}{Pool}{Label Format} record in each Pool resource. If this is {\bf No} as by default, Bareos will label tapes only by specific operator command ({\bf label} in the Console) or when the tape has been recycled. The automatic labeling feature is most