diff --git a/manuals/en/main/dirdconf.tex b/manuals/en/main/dirdconf.tex index 6cd053b..a47b181 100644 --- a/manuals/en/main/dirdconf.tex +++ b/manuals/en/main/dirdconf.tex @@ -799,6 +799,13 @@ \section{Job Resource} verified (most often a {\bf VolumeToCatalog}) so that the tape just written is re-read. +\item [Catalog = {\textless}Catalog-resource-name{\textgreater}] \hfill \\ +\index[dir]{Catalog} +\index[dir]{Directive!Catalog} +This specifies the name of the catalog resource to be used for this Job. +When a catalog is defined in a Job it will override the definition in +the client. (This keyword was introduced in Bareos 13.4.0) + \item [JobDefs = {\textless}JobDefs-Resource-Name{\textgreater}] \hfill \\ \index[dir]{JobDefs} \index[dir]{Directive!JobDefs} @@ -882,7 +889,8 @@ \section{Job Resource} the Storage daemon for backup, or receives them when restoring. For additional details, see the \ilink{Client Resource section}{ClientResource2} of this chapter. -This directive is required. +This directive is required (For versions before 13.3.0 for all Jobtypes +and for versions after that for all Jobtypes but Copy and Migrate). \item [FileSet = {\textless}FileSet-resource-name{\textgreater}] \hfill \\ \index[dir]{FileSet} @@ -892,7 +900,9 @@ \section{Job Resource} be backed up, and what options to use (e.g. compression, ...). Only a single FileSet resource may be specified in any one Job. For additional details, see the \ilink{FileSet Resource section}{FileSetResource} of -this chapter. This directive is required. +this chapter. +This directive is required (For versions before 13.3.0 for all Jobtypes +and for versions after that for all Jobtypes but Copy and Migrate). \item [Base = {\textless}job-resource-name, ...{\textgreater}] \hfill \\ \index[dir]{Base} @@ -2296,7 +2306,7 @@ \section{Client Resource} \index[dir]{Catalog} \index[dir]{Directive!Catalog} This specifies the name of the catalog resource to be used for this Client. -This directive is required. +If none is specified the first defined catalog is used. \item [Username = {\textless}Client-Username{\textgreater}] \hfill \\ \index[dir]{Username} @@ -2954,6 +2964,14 @@ \section{Pool Resource} entries in the catalog, you will not be able to use the Console {\bf restore} command nor any other command that references File entries. +\item [Catalog = {\textless}Catalog-resource-name{\textgreater}] \hfill \\ +\index[dir]{Catalog} +\index[dir]{Directive!Catalog} +This specifies the name of the catalog resource to be used for this Pool. +When a catalog is defined in a Pool it will override the definition in +the client (and the Catalog definition in a Job since 13.4.0). e.g. +this catalog setting takes precedence over any other definition. + \label{PoolAutoPrune} \item [AutoPrune = {\textless}yes{\textbar}no{\textgreater}] \hfill \\ \index[dir]{AutoPrune}