Skip to content
This repository has been archived by the owner on Mar 19, 2021. It is now read-only.

Commit

Permalink
use automatically created templates
Browse files Browse the repository at this point in the history
use the automatically created templates to describe Director resources
client, director, job, pool, schedule and storage
  • Loading branch information
joergsteffens committed Oct 24, 2014
1 parent f7abee0 commit f304677
Show file tree
Hide file tree
Showing 11 changed files with 2,653 additions and 2,652 deletions.
2 changes: 1 addition & 1 deletion manuals/en/main/autochangers.tex
Expand Up @@ -909,7 +909,7 @@ \section{Tapespeed and blocksizes}
If Bareos cannot read the volume label, this security mechanism does not work and you might
label tapes already labeled accidentially.

To solve this problem, the block size handling was changed in Bareos \sinceVersion{sd}{Maximum Block Size}{14.2} in the following way:
To solve this problem, the block size handling was changed in Bareos \sinceVersion{sd}{Maximum Blocksize}{14.2.0} in the following way:
\begin{itemize}
\item The tape label block is always written in the standard 63k (64512) Blocksize.
\item The following blocks are then written in the block size configured in the {\bf maximum block size} directive.
Expand Down
38 changes: 23 additions & 15 deletions manuals/en/main/bareos.sty
Expand Up @@ -53,7 +53,9 @@
\csdef{dtPint32}{\dtUInt}
\csdef{dtRes}{\ilink{resource-name}{DataTypeRes}}
\csdef{dtPort}{\dtNetPort}
\csdef{dtScheduleRunCommand}{{job-overrides{\gt} {\lt}date-time-specification}}
\csdef{dtSize}{\ilink{size}{DataTypeSize}}
\csdef{dtSpeed}{\ilink{speed}{DataTypeSpeed}}
\csdef{dtString}{\ilink{string}{DataTypeString}}
\csdef{dtStringList}{\ilink{string-list}{DataTypeStringList}}
\csdef{dtTime}{\ilink{time}{DataTypeTime}}
Expand Down Expand Up @@ -94,6 +96,9 @@
\newcommand{\at}{\makeatletter @\makeatother}
\newcommand{\lt}{\textless}
\newcommand{\gt}{\textgreater}
\newcommand{\pipe}{\textbar\ }
% these characters must be quoted in Bareos config files: &<>()@^|
\newcommand{\configCharsToQuote}{\parameter{&<>()@^}\textbar\ }

%
% specific types of text
Expand All @@ -111,8 +116,10 @@
\newcommand{\variable}[1]{\path|#1|}
% to also link to a directive, use \linkResourceDirective}{Dir|Sd|Fd}{Resource}{Directive Name}
\newcommand{\configdirective}[1]{\textbf{#1}}
\newcommand{\configline}[1]{\path|#1|}
\newcommand{\host}[1]{\path|#1|}
\newcommand{\email}[1]{\url{#1}}
\newcommand{\bnfvar}[1]{\lt#1\gt}

%%
\newcommand{\debug}[1]{\marginpar{#1}}
Expand All @@ -131,8 +138,10 @@
#2
}

% 1: daemon (dir|sd|fd), 2: item, 3: version,
\newcommand{\sinceVersion}[3]{%
% 1: daemon (dir|sd|fd),
% 2: item,
% 3: version
\edef\pv{#3}%
\ifcsvoid{pv}{}{%
Version $>=$ #3%
Expand Down Expand Up @@ -281,20 +290,20 @@ Version $>=$ #3%
% 2: Resource
% 3: Directive Name
%
\ifthenelse{\equal{#1}{Dir}}{
\def\daemon{dir}
}{
\ifthenelse{\equal{#1}{Sd}}{
\def\daemon{sd}
}{
\ifthenelse{\equal{#1}{Fd}}{
\def\daemon{fd}
}{
\ifthenelse{\equal{#1}{Dir}}{%
\def\daemon{dir}%
}{%
\ifthenelse{\equal{#1}{Sd}}{%
\def\daemon{sd}%
}{%
\ifthenelse{\equal{#1}{Fd}}{%
\def\daemon{fd}%
}{%
% hopefully, no translatation needed. Take original parameter
\def\daemon{#1}
}
}
}
\def\daemon{#1}%
}%
}%
}%
\index[\daemon]{Directive!#3}%
\hyperlink{directive#1#2#3}{#3}%
}
Expand Down Expand Up @@ -415,7 +424,6 @@ Version $>=$ #3%
}{}



\newfloat{floatCommandOut}{h}{lop}
\floatname{floatCommandOut}{Command}

Expand Down
5 changes: 5 additions & 0 deletions manuals/en/main/configure.tex
Expand Up @@ -255,6 +255,11 @@ \subsection{Data Types}
A 32 bit positive integer value.
\item [speed]
\index[general]{Data Type!speed}
\label{DataTypeSpeed}
The speed parameter can be specified as k/s, kb/s, m/s or mb/s.
\item [string]
\index[general]{Data Type!string}
\label{DataTypeString}
Expand Down

0 comments on commit f304677

Please sign in to comment.