From 8a55767e09753bde4e7643c01638264f3f0d671e Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 11 Feb 2010 15:55:04 +0100
Subject: [PATCH] Fix vertical bar display reported in bug #1496

---
 docs/manuals/en/main/dirdconf.tex | 2 +-
 docs/manuals/en/main/fileset.tex  | 4 ++--
 docs/manuals/en/main/install.tex  | 8 +++++++-
 docs/manuals/en/main/mysql.tex    | 2 +-
 docs/manuals/en/main/sqlite.tex   | 8 ++++++--
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/docs/manuals/en/main/dirdconf.tex b/docs/manuals/en/main/dirdconf.tex
index d0dfa40c..0f270da1 100644
--- a/docs/manuals/en/main/dirdconf.tex
+++ b/docs/manuals/en/main/dirdconf.tex
@@ -799,7 +799,7 @@ For a {\bf Verify} Job, the Level may be one of the  following:
    your catalog database.
 
    If the {\bf bootstrap-file-specification} begins with a vertical bar
-   (|), Bacula will use the specification as the name of a program to which
+   (\verb+|+), Bacula will use the specification as the name of a program to which
    it will pipe the bootstrap record.  It could for example be a shell
    script that emails you the bootstrap record.
 
diff --git a/docs/manuals/en/main/fileset.tex b/docs/manuals/en/main/fileset.tex
index 536a6cb3..1ad2a042 100644
--- a/docs/manuals/en/main/fileset.tex
+++ b/docs/manuals/en/main/fileset.tex
@@ -972,8 +972,8 @@ df -l | grep "^/dev/hd[ab]" | grep -v ".*/tmp" \
 \end{verbatim}
 \normalsize
 
-   If the vertical bar (|) in front of my\_partitions is preceded by a
-   backslash as in \textbackslash{}|, the program will be executed on the
+   If the vertical bar (\verb+|+) in front of my\_partitions is preceded by a
+   backslash as in \textbackslash{}\verb+|+, the program will be executed on the
    Client's machine instead of on the Director's machine.
    Please note that if the filename is given within quotes, you
    will need to use two slashes.  An example, provided by John Donagher,
diff --git a/docs/manuals/en/main/install.tex b/docs/manuals/en/main/install.tex
index 8184e0d2..ae98e1eb 100644
--- a/docs/manuals/en/main/install.tex
+++ b/docs/manuals/en/main/install.tex
@@ -1015,7 +1015,9 @@ $ nm /usr/local/lib/libpq.a | grep mutex
    Bacula or if you want to use File Daemon PKI data encryption.
    Normally, the {\bf path} specification is not necessary since
    the configuration searches for the OpenSSL libraries in standard system
-   locations. Enabling OpenSSL in Bacula permits secure communications
+   locations. However, you must ensure that all the libraries are
+   loaded including {\bf libssl-dev} or the equivalent on your
+   system. Enabling OpenSSL in Bacula permits secure communications
    between the daemons and/or data encryption in the File daemon.
    For more information on using TLS, please see the
    \ilink{Bacula TLS -- Communications Encryption}{CommEncryption} chapter
@@ -1023,6 +1025,10 @@ $ nm /usr/local/lib/libpq.a | grep mutex
    For more information on using PKI data encryption, please see the
    \ilink{Bacula PKI -- Data Encryption}{DataEncryption}
    chapter of this manual.
+              
+   If you get errors linking, you need to load the development libraries,
+   or you need to disable SSL by setting without-openssl.
+
 
 \item [ {-}{\-}with-python=\lt{}path\gt{}]
    \index[general]{{-}{\-}with-python}
diff --git a/docs/manuals/en/main/mysql.tex b/docs/manuals/en/main/mysql.tex
index fb937269..1a14d973 100644
--- a/docs/manuals/en/main/mysql.tex
+++ b/docs/manuals/en/main/mysql.tex
@@ -81,7 +81,7 @@ MySQL client library is used, and hence you should add the {\bf
 Note, the above command requires GNU tar. If you do not  have GNU tar, a
 command such as:
 
-{\bf zcat mysql-filename | tar xvf - }  
+{\bf zcat mysql-filename \verb+|+ tar xvf - }  
 
 will probably accomplish the same thing. 
 
diff --git a/docs/manuals/en/main/sqlite.tex b/docs/manuals/en/main/sqlite.tex
index a5ef8790..4ff66213 100644
--- a/docs/manuals/en/main/sqlite.tex
+++ b/docs/manuals/en/main/sqlite.tex
@@ -33,12 +33,16 @@ Installing and Configuring is quite easy.
 \item Download the Bacula dependency packages  
 \item Detar it with something like:
 
-   {\bf tar xvfz depkgs.tar.gz}  
+\begin{verbatim}
+   tar xvfz depkgs.tar.gz
+\end{verbatim}
 
    Note, the above command requires GNU tar. If you do not  have GNU tar, a
    command such as:
 
-   {\bf zcat depkgs.tar.gz | tar xvf -}
+\begin{verbatim}
+   zcat depkgs.tar.gz | tar xvf -
+\end{verbatim}
 
    will probably accomplish the same thing. 
 
-- 
2.39.5