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

Commit

Permalink
Fixes a problem in a NDMP example
Browse files Browse the repository at this point in the history
^ is not displayed correctly when used in a path environment.
Replaced \path|^| by \textasciicircum.
  • Loading branch information
joergsteffens committed Aug 1, 2016
1 parent 083a65e commit 8b894ec
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
8 changes: 8 additions & 0 deletions manuals/en/main/bareos.sty
Expand Up @@ -15,6 +15,14 @@
%\def\idir{../../images/conv/} %% images directory
\def\idir{images/}


%% NOTE:
%
% ^, cirum, caret:
% \path|^| does not work with tex4ht,
% therefore use \textasciicircum instead.
% However, ^ works inside verbatim and lst environments.

\newcommand{\bareosFd}{Bareos File Daemon\xspace}
\newcommand{\bareosSd}{Bareos Storage Daemon\xspace}
\newcommand{\bareosDir}{Bareos Director\xspace}
Expand Down
4 changes: 2 additions & 2 deletions manuals/en/main/ndmp.tex
Expand Up @@ -699,7 +699,7 @@ \subsection{Restore files to different path}
The restore location is determined by the \linkResourceDirective{Dir}{Job}{Where} setting of the restore job.
In NDMP, this parameter works in a special manner, the prefix can be either \bquote{relative} to the filesystem or \bquote{absolute}.
If a prefix is set in form of a directory (like \directory{/bareos-restores}), it will be a relative prefix and will be added between the filesystem and the filename. This is needed to make sure that the data is restored in a different directory, but into the same filesystem.
If the prefix is set with a leading caret (\path|^|), it will be an absolute prefix and will be put at the front of the restore path. This is needed if the restored data should be stored into a different filesystem.
If the prefix is set with a leading caret (\textasciicircum), it will be an absolute prefix and will be put at the front of the restore path. This is needed if the restored data should be stored into a different filesystem.

Example:

Expand All @@ -708,7 +708,7 @@ \subsection{Restore files to different path}
original file name & where & restored file \\
\hline
\path|/ifs/home/admin/.zshrc| & \path|/bareos-restores| & \path|/ifs/home/bareos-restores/admin/.zshrc| \\
\path|/ifs/home/admin/.zshrc| & \path|^/ifs/data/bareos-restores| & \path|/ifs/data/bareos-restores/admin/.zshrc| \\
\path|/ifs/home/admin/.zshrc| & \textasciicircum\path|/ifs/data/bareos-restores| & \path|/ifs/data/bareos-restores/admin/.zshrc| \\
\hline
\end{tabular}

Expand Down

0 comments on commit 8b894ec

Please sign in to comment.