From 8b894ec838dd7660d89f2f81f51ad74dd48e25f5 Mon Sep 17 00:00:00 2001
From: Joerg Steffens <joerg.steffens@bareos.com>
Date: Mon, 1 Aug 2016 15:39:25 +0200
Subject: [PATCH] Fixes a problem in a NDMP example

^ is not displayed correctly when used in a path environment.
Replaced \path|^| by \textasciicircum.
---
 manuals/en/main/bareos.sty | 8 ++++++++
 manuals/en/main/ndmp.tex   | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/manuals/en/main/bareos.sty b/manuals/en/main/bareos.sty
index 5bc336d..038fc51 100644
--- a/manuals/en/main/bareos.sty
+++ b/manuals/en/main/bareos.sty
@@ -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}
diff --git a/manuals/en/main/ndmp.tex b/manuals/en/main/ndmp.tex
index 8f9b624..f7b2f38 100644
--- a/manuals/en/main/ndmp.tex
+++ b/manuals/en/main/ndmp.tex
@@ -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:
 
@@ -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}