From: Philippe Chauvat Date: Thu, 11 Oct 2012 08:42:09 +0000 (+0200) Subject: Main should now compile with both tex and pdflatex options X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d7615fdf8179b0b4cec379e3f60d1f709e785033;p=bacula%2Fdocs Main should now compile with both tex and pdflatex options --- diff --git a/docs/configure b/docs/configure index 3b8b81cf..606b79f6 100755 --- a/docs/configure +++ b/docs/configure @@ -2248,7 +2248,7 @@ MCOMMON=./autoconf/Make.common -ac_config_files="$ac_config_files autoconf/Make.common Makefile manuals/update_version manuals/version.tex manuals/bacula.sty manuals/en/console/Makefile manuals/en/main/Makefile manuals/en/developers/Makefile manuals/en/problems/Makefile manuals/en/utility/Makefile manuals/en/misc/Makefile manuals/de/console/Makefile manuals/de/main/Makefile manuals/de/developers/Makefile manuals/de/problems/Makefile manuals/de/utility/Makefile manuals/de/misc/Makefile manuals/fr/console/Makefile manuals/fr/main/Makefile manuals/fr/developers/Makefile manuals/fr/problems/Makefile manuals/fr/utility/Makefile manuals/fr/misc/Makefile manuals/es/console/Makefile manuals/es/main/Makefile manuals/es/developers/Makefile manuals/es/problems/Makefile manuals/es/utility/Makefile manuals/es/misc/Makefile bacula-web/Makefile bacula-web/version.tex images/svg/Makefile $PFILES" +ac_config_files="$ac_config_files autoconf/Make.common Makefile manuals/update_version manuals/version.tex manuals/bacula.sty manuals/en/console/Makefile manuals/en/main/Makefile manuals/en/developers/Makefile manuals/en/problems/Makefile manuals/en/utility/Makefile manuals/en/misc/Makefile manuals/de/console/Makefile manuals/de/main/Makefile manuals/de/developers/Makefile manuals/de/problems/Makefile manuals/de/utility/Makefile manuals/de/misc/Makefile manuals/fr/console/Makefile manuals/fr/main/Makefile manuals/fr/developers/Makefile manuals/fr/problems/Makefile manuals/fr/utility/Makefile manuals/fr/misc/Makefile manuals/es/console/Makefile manuals/es/main/Makefile manuals/es/developers/Makefile manuals/es/problems/Makefile manuals/es/utility/Makefile manuals/es/misc/Makefile bacula-web/Makefile bacula-web/version.tex images/svg/Makefile covers/svg/Makefile $PFILES" ac_config_commands="$ac_config_commands default" @@ -2995,6 +2995,7 @@ do "bacula-web/Makefile") CONFIG_FILES="$CONFIG_FILES bacula-web/Makefile" ;; "bacula-web/version.tex") CONFIG_FILES="$CONFIG_FILES bacula-web/version.tex" ;; "images/svg/Makefile") CONFIG_FILES="$CONFIG_FILES images/svg/Makefile" ;; + "covers/svg/Makefile") CONFIG_FILES="$CONFIG_FILES covers/svg/Makefile" ;; "$PFILES") CONFIG_FILES="$CONFIG_FILES $PFILES" ;; "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; diff --git a/docs/covers/svg/Makefile.in b/docs/covers/svg/Makefile.in new file mode 100644 index 00000000..85dad383 --- /dev/null +++ b/docs/covers/svg/Makefile.in @@ -0,0 +1,47 @@ +# +# Makefile for converting svg files +# to something else: png, pdf, eps +# +# 10-Oct-2012 - Philippe Chauvat / Bacula Systems +# +INKSCAPE=inkscape +INKSCAPE_FLAGS=-z +SVG_TO_PDF=-A +SVG_TO_EPS=-E +PDFDIR=../pdf +EPSDIR=../eps + +SVGS=$(wildcard *.svg) +PDFS=$(SVGS:.svg=.pdf) +EPSS=$(SVGS:.svg=.eps) + +vpath %.eps $(EPSDIR) + +first_rule: + +all: pdf eps + +.SUFFIXES: +.PHONY: +.DONTCARE: +# +# PDF images creation +pdf: $(PDFS) +$(PDFS): | $(PDFDIR) +$(PDFDIR): + @echo "Creating PDF images directory..." + @mkdir $(PDFDIR) + @echo "Done" +%.pdf: %.svg + ${INKSCAPE} ${INKSCAPE_FLAGS} ${SVG_TO_PDF} $(PDFDIR)/$@ $< +# +# EPS images creation +vpath %.pdf $(PDFDIR) +eps: $(EPSS) +$(EPSS): | $(EPSDIR) +$(EPSDIR): + @echo "Creating EPS images directory..." + @mkdir $(EPSDIR) + @echo "Done" +%.eps: %.svg + ${INKSCAPE} ${INKSCAPE_FLAGS} ${SVG_TO_EPS} $(EPSDIR)/$@ $< diff --git a/docs/manuals/bacula.sty.in b/docs/manuals/bacula.sty.in index e3cb0515..ac2c2589 100644 --- a/docs/manuals/bacula.sty.in +++ b/docs/manuals/bacula.sty.in @@ -33,8 +33,7 @@ %% %% define images directory -- KES 15Aug08 \def\idir{}%%%@BUILD_DIR@/images/} %% images directory -\graphicspath{{../../../images/pdf/}{../../../images/png/}{../../../images/}} -\DeclareGraphicsExtensions{.pdf,.png,.jpg,.jpeg,.eps} +\input{bsys-compiler-mode} \usepackage{multirow} \def\arraystretch{1.5} \pdfminorversion=4 diff --git a/docs/manuals/bsys-latex-mode.tex b/docs/manuals/bsys-latex-mode.tex new file mode 100644 index 00000000..e94627ec --- /dev/null +++ b/docs/manuals/bsys-latex-mode.tex @@ -0,0 +1,2 @@ +\graphicspath{{../../../images/hires/}{../../../images/eps/}{../../../images/pdf/}{../../../images/png/}{../../../images/}} +\DeclareGraphicsExtensions{.eps,.png,.jpg,.jpeg,.pdf} diff --git a/docs/manuals/bsys-pdflatex-mode.tex b/docs/manuals/bsys-pdflatex-mode.tex new file mode 100644 index 00000000..533e1f45 --- /dev/null +++ b/docs/manuals/bsys-pdflatex-mode.tex @@ -0,0 +1,2 @@ +\graphicspath{{../../../images/pdf/}{../../../images/png/}{../../../images/}{../../../images/hires/}{../../../images/eps/}} +\DeclareGraphicsExtensions{.pdf,.png,.jpg,.jpeg,.eps} diff --git a/docs/manuals/bsys-web-mode.tex b/docs/manuals/bsys-web-mode.tex new file mode 100644 index 00000000..8525459c --- /dev/null +++ b/docs/manuals/bsys-web-mode.tex @@ -0,0 +1,3 @@ +\DeclareGraphicsExtensions{.pdf,.eps,.png,.jpg,.jpeg} +\def\bsysexample{verbatim} +\def\bsysexampleinline{verb} diff --git a/docs/manuals/en/main/Makefile.in b/docs/manuals/en/main/Makefile.in index 49075a76..120e2e7e 100644 --- a/docs/manuals/en/main/Makefile.in +++ b/docs/manuals/en/main/Makefile.in @@ -34,28 +34,35 @@ # IMAGES=../../../images - +MANUALSDIR=../.. DOC=main MAINDOC=Bacula_Main_Reference.html BSYSMANUALDIR=../../../bsysmanual -COVERSDIR=../../../covers/pdf -LICENSESDIR=../../licences -COVERNAME=main-coverpage +COVERSDIR=../../../covers +PDFCOVERSDIR=$(COVERSDIR)/pdf +SVGCOVERSDIR=$(COVERSDIR)/svg +EPSCOVERSDIR=$(COVERSDIR)/eps +LICENSESDIR=$(MANUALSDIR)/licences +COVERNAME=coverpage-main BSYSMANNAME=bsysmanual-coverpagebackground LICENCES=$(wildcard $(LICENSESDIR)/*.tex) - +BSYSCOMPILERFILE=bsys-compiler-mode.tex +PDFCOMPILERFILE=$(MANUALSDIR)/bsys-pdflatex-mode.tex +TEXCOMPILERFILE=$(MANUALSDIR)/bsys-latex-mode.tex +WEBCOMPILERFILE=$(MANUALSDIR)/bsys-web-mode.tex first_rule: all all: tex web dvipdf mini-clean -.SUFFIXES: .tex .html .svg +.SUFFIXES: .tex .html .PHONY: .DONTCARE: pdfcovers: @echo -n "Linking coverpage and background PDF format..." - @ln -sf `pwd`/${COVERSDIR}/${COVERNAME}.pdf `pwd`/${BSYSMANUALDIR}/${BSYSMANNAME}.pdf + @(cd $(SVGCOVERSDIR) ; make pdf) + @ln -sf `pwd`/${PDFCOVERSDIR}/${COVERNAME}.pdf `pwd`/${BSYSMANUALDIR}/${BSYSMANNAME}.pdf @echo "Done." pdfimages: @@ -71,17 +78,15 @@ pngimages: epsimages: @echo "Generating EPS images..." @(cd ${IMAGES}/svg ; make eps) + @rm -rf ${IMAGES}/png + @rm -rf ${IMAGES}/pdf @echo "Done." epscovers: @echo -n "Linking coverpage and background EPS format..." - @(if [ ! -e ${COVERNAME}.eps ]; then \ - cd ${COVERSDIR} ; - pdf2ps ${COVERNAME}.pdf; - ps2eps ${COVERNAME}.ps; - rm ${COVERNAME}.ps; - fi) - @ln -sf `pwd`/${COVERSDIR}/${COVERNAME}.eps `pwd`/${BSYSMANUALDIR}/${BSYSMANNAME}.eps + @(cd $(SVGCOVERSDIR) ; make eps) + @ln -sf `pwd`/${EPSCOVERSDIR}/${COVERNAME}.eps `pwd`/${BSYSMANUALDIR}/${BSYSMANNAME}.eps + @rm -f `pwd`/${BSYSMANUALDIR}/${BSYSMANNAME}.pdf @echo "Done." commonfiles: @@ -89,10 +94,11 @@ commonfiles: @(for L in $(LICENCES); do ln -sf $$L .; done) @echo "Done" -tex: epscovers +tex: epscovers epsimages @../../update_version @echo "Making version `cat version.tex`" - @cp -fp ${IMAGES}/hires/*.eps . +# @cp -fp ${IMAGES}/hires/*.eps . + @ln -sf $(TEXCOMPILERFILE) $(BSYSCOMPILERFILE) @touch ${DOC}i-dir.tex ${DOC}i-fd.tex ${DOC}i-sd.tex \ ${DOC}i-console.tex ${DOC}i-general.tex latex -interaction=batchmode ${DOC}.tex @@ -109,6 +115,7 @@ pdf: dvipdfm -p a4 ${DOC}.dvi pdflatex: pdfcovers pdfimages commonfiles + @ln -sf $(PDFCOMPILERFILE) $(BSYSCOMPILERFILE) pdflatex -interaction=batchmode ${DOC}.tex makeindex ${DOC}.idx -o ${DOC}.ind 2>/dev/null makeindex ${DOC}.ddx -o ${DOC}.dnd >/dev/null 2>/dev/null @@ -126,8 +133,9 @@ dvipdf: html: @echo " " @echo "Making html" - @cp -fp ${IMAGES}/*.eps . - @rm -f next.eps next.png prev.eps prev.png up.eps up.png + @ln -sf $(WEBCOMPILERFILE) $(BSYSCOMPILERFILE) +# @cp -fp ${IMAGES}/*.eps . +# @rm -f next.eps next.png prev.eps prev.png up.eps up.png @(if [ -f imagename_translations ] ; then \ ./translate_images.pl --from_meaningful_names ${DOC}.html; \ fi) diff --git a/docs/manuals/en/main/bsplugins.tex b/docs/manuals/en/main/bsplugins.tex index 815507cf..67ab74a0 100644 --- a/docs/manuals/en/main/bsplugins.tex +++ b/docs/manuals/en/main/bsplugins.tex @@ -144,7 +144,7 @@ The system state component automatically respects all the excludes present in the FilesNotToBackup registry key, which includes things like \%TEMP\%, pagefile.sys, hiberfil.sys, etc. Each plugin may additionally specify files to exclude, eg the VSS Registry Writer will tell Bacula to not back -up the registry hives under \verb+C:\WINDOWS\system32\config+ because they +up the registry hives under \lstinline+C:\WINDOWS\system32\config+ because they are backed up as part of the system state. \subsubsection{Restore} diff --git a/docs/manuals/en/main/consoleconf.tex b/docs/manuals/en/main/consoleconf.tex index 4b6d2b90..f9a5266d 100644 --- a/docs/manuals/en/main/consoleconf.tex +++ b/docs/manuals/en/main/consoleconf.tex @@ -41,7 +41,7 @@ choose one when you start the {\bf Console} program. \index[dir]{DIRPort} Specify the port to use to connect to the Director. This value will most likely already be set to the value you specified on the {\bf - \verb:--:with-baseport} option of the {\bf ./configure} command. This port must be + \lstinline:--:with-baseport} option of the {\bf ./configure} command. This port must be identical to the {\bf DIRport} specified in the {\bf Director} resource of the \ilink{Director's configuration}{DirectorChapter} file. The default is 9101 so this directive is not normally specified. diff --git a/docs/manuals/en/main/dirdconf.tex b/docs/manuals/en/main/dirdconf.tex index ac0776e1..d62b8163 100644 --- a/docs/manuals/en/main/dirdconf.tex +++ b/docs/manuals/en/main/dirdconf.tex @@ -590,7 +590,7 @@ For a {\bf Backup} Job, the Level may be one of the following: cause st\_ctime to change and hence Bacula will backup the file during an Incremental or Differential backup. In the case of Sophos virus scanning, you can prevent it from resetting the access time (st\_atime) - and hence changing st\_ctime by using the {\bf \verb:--:no-reset-atime} + and hence changing st\_ctime by using the {\bf \lstinline:--:no-reset-atime} option. For other software, please see their manual. When Bacula does an Incremental backup, all modified files that are @@ -865,7 +865,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 - (\verb+|+), Bacula will use the specification as the name of a program to which + (\lstinline+|+), 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. @@ -1061,12 +1061,13 @@ during working hours. We can see it like \texttt{Max Start Delay + Max Run when the job starts, ({\bf not} necessarily the same as when the job was scheduled). This directive works as expected since bacula 2.3.18. -\begin{figure}[htbp] - \centering - \includegraphics[width=13cm]{\idir different_time} - \label{fig:differenttime} - \caption{Job time control directives} -\end{figure} +\bsysimageH{different_time}{Job time control directives}{fig:differenttime} +%% \begin{figure}[htbp] +%% \centering +%% \includegraphics[width=13cm]{\idir different_time} +%% \label{fig:differenttime} +%% \caption{Job time control directives} +%% \end{figure} \label{Job:MaximumBandwidth} \item [Maximum Bandwidth = \lt{}speed\gt{}] @@ -2544,11 +2545,12 @@ the Director. directive can be used in NAT environment where the configuration of the Client resolver is not possible. -\begin{figure}[htbp] - \centering - \includegraphics[width=10cm]{\idir BackupOverWan1} - \caption{Backup over WAN using FD Storage Address} -\end{figure} +\bsysimageH{BackupOverWan1}{Backup over WAN using FD Storage Address}{figdirdconf:backupwan} +%% \begin{figure}[htbp] +%% \centering +%% \includegraphics[width=10cm]{\idir BackupOverWan1} +%% \caption{Backup over WAN using FD Storage Address} +%% \end{figure} \label{Storage:SdPort} \item [SD Port = \lt{}port\gt{}] diff --git a/docs/manuals/en/main/fileset.tex b/docs/manuals/en/main/fileset.tex index bcc29c80..32c2a400 100644 --- a/docs/manuals/en/main/fileset.tex +++ b/docs/manuals/en/main/fileset.tex @@ -1032,8 +1032,8 @@ df -l | grep "^/dev/hd[ab]" | grep -v ".*/tmp" \ \end{lstlisting} \normalsize - 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 + If the vertical bar (\lstinline+|+) in front of my\_partitions is preceded by a + backslash as in \textbackslash{}\lstinline+|+, 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 a0506a29..2eda4af1 100644 --- a/docs/manuals/en/main/install.tex +++ b/docs/manuals/en/main/install.tex @@ -556,7 +556,7 @@ the {\bf examples} directory. This script contains the statements that you would normally use, and each developer/user may modify them to suit his needs. You should find additional useful examples in this directory as well. -The {\bf \verb:--:enable-conio} or {\bf \verb:--:enable-readline} options are +The {\bf \lstinline:--:enable-conio} or {\bf \lstinline:--:enable-readline} options are useful because they provide a command line history, editing capability for the Console program and tab completion on various option. If you have included either option in the build, either the {\bf termcap} or the {\bf ncurses} @@ -600,7 +600,7 @@ LDFLAGS="-lssl -lcyrpto" \ On some systems such as Mandriva, readline tends to gobble up prompts, which makes it totally useless. If this happens to you, use the disable option, or if you are using version 1.33 and above try using {\bf -\verb:--:enable-conio} to use a built-in readline replacement. You will still need +\lstinline:--:enable-conio} to use a built-in readline replacement. You will still need either the termcap or the ncurses library, but it is unlikely that the {\bf conio} package will gobble up prompts. @@ -843,7 +843,7 @@ $ nm /usr/local/lib/libpq.a | grep mutex using them without having the shared libraries loaded. If you have problems linking in the {\bf src/stored} directory, make sure you have not enabled this option, or explicitly disable static linking by adding - {\bf \verb:--:disable-static-tools}. + {\bf \lstinline:--:disable-static-tools}. \item [ {-}{\-}enable-static-fd] \index[general]{{-}{\-}enable-static-fd} @@ -852,7 +852,7 @@ $ nm /usr/local/lib/libpq.a | grep mutex statically linked libraries and is required for the Bare Metal recovery. This option is largely superseded by using {\bf make static-bacula-fd} from with in the {\bf src/filed} directory. Also, the {\bf - \verb:--:enable-client-only} option described below is useful for just + \lstinline:--:enable-client-only} option described below is useful for just building a client so that all the other parts of the program are not compiled. @@ -960,7 +960,7 @@ $ nm /usr/local/lib/libpq.a | grep mutex This option (default) causes Bacula to be built with 64 bit file address support if it is available on your system. This permits Bacula to read and write files greater than 2 GBytes in size. You may disable this feature and - revert to 32 bit file addresses by using {\bf \verb:--:disable-largefile}. + revert to 32 bit file addresses by using {\bf \lstinline:--:disable-largefile}. \item [ {-}{\-}disable-nls] \index[general]{{-}{\-}disable-nls} @@ -1116,7 +1116,7 @@ $ nm /usr/local/lib/libpq.a | grep mutex \index[general]{{-}{\-}with-baseport} In order to run, Bacula needs three TCP/IP ports (one for the Bacula Console, one for the Storage daemon, and one for the File daemon). The {\bf - \verb:--:with-baseport} option will automatically assign three ports beginning at + \lstinline:--:with-baseport} option will automatically assign three ports beginning at the base port address specified. You may also change the port number in the resulting configuration files. However, you need to take care that the numbers correspond correctly in each of the three daemon configuration @@ -1246,7 +1246,7 @@ $ nm /usr/local/lib/libpq.a | grep mutex \end{description} Note, many other options are presented when you do a {\bf ./configure -\verb:--:help}, but they are not implemented. +\lstinline:--:help}, but they are not implemented. \section{Recommended Options for Most Systems} \index[general]{Systems!Recommended Options for Most} @@ -1269,7 +1269,7 @@ For most systems, we recommend starting with the following options: If you want to install Bacula in an installation directory rather than run it out of the build directory (as developers will do most of the time), you -should also include the \verb:--:sbindir and \verb:--:sysconfdir options with appropriate +should also include the \lstinline:--:sbindir and \lstinline:--:sysconfdir options with appropriate paths. Neither are necessary if you do not use "make install" as is the case for most development work. The install process will create the sbindir and sysconfdir if they do not exist, but it will not automatically create the @@ -1514,8 +1514,8 @@ fresh copy of the source tree, or using {\bf make\ distclean} before the {\bf ./configure}. Since the File daemon does not access the Catalog database, you can remove -the {\bf \verb:--:with-mysql} or {\bf \verb:--:with-sqlite} options, then -add {\bf \verb:--:enable-client-only}. This will compile only the +the {\bf \lstinline:--:with-mysql} or {\bf \lstinline:--:with-sqlite} options, then +add {\bf \lstinline:--:enable-client-only}. This will compile only the necessary libraries and the client programs and thus avoids the necessity of installing one or another of those database programs to build the File daemon. With the above option, you simply enter {\bf make} and just the @@ -1675,7 +1675,7 @@ bwx-console.conf \index[general]{Installing Tray Monitor} The Tray Monitor is already installed if you used the {\bf -\verb:--:enable-tray-monitor} configure option and ran {\bf make install}. +\lstinline:--:enable-tray-monitor} configure option and ran {\bf make install}. As you don't run your graphical environment as root (if you do, you should change that bad habit), don't forget to allow your user to read {\bf diff --git a/docs/manuals/en/main/monitorconf.tex b/docs/manuals/en/main/monitorconf.tex index b7ae5f02..d82efb5c 100644 --- a/docs/manuals/en/main/monitorconf.tex +++ b/docs/manuals/en/main/monitorconf.tex @@ -104,7 +104,7 @@ configuration file. This record is required. \index[fd]{DIRPort } Specify the port to use to connect to the Director. This value will most likely already be set to the value you specified on the {\bf -\verb:--:with-baseport} option of the {\bf ./configure} command. This port must be +\lstinline:--:with-baseport} option of the {\bf ./configure} command. This port must be identical to the {\bf DIRport} specified in the {\bf Director} resource of the \ilink{Director's configuration}{DirectorChapter} file. The diff --git a/docs/manuals/en/main/mysql.tex b/docs/manuals/en/main/mysql.tex index 04184021..58cfa199 100644 --- a/docs/manuals/en/main/mysql.tex +++ b/docs/manuals/en/main/mysql.tex @@ -10,13 +10,13 @@ \index[general]{Installing and Configuring MySQL -- Phase I } \index[general]{Phase I!Installing and Configuring MySQL -- } -If you use the ./configure \verb:--:with-mysql=mysql-directory statement for +If you use the ./configure \lstinline:--:with-mysql=mysql-directory statement for configuring {\bf Bacula}, you will need MySQL version 4.1 or later installed in the {\bf mysql-directory}. If you are using one of the new modes such as ANSI/ISO compatibility, you may experience problems. If MySQL is installed in the standard system location, you need only enter -{\bf \verb:--:with-mysql} since the configure program will search all the +{\bf \lstinline:--:with-mysql} since the configure program will search all the standard locations. If you install MySQL in your home directory or some other non-standard directory, you will need to provide the full path to it. @@ -67,7 +67,7 @@ to do so. Beginning with Bacula version 1.31, the thread safe version of the MySQL client library is used, and hence you should add the {\bf -\verb:--:enable-thread-safe-client} option to the {\bf +\lstinline:--:enable-thread-safe-client} option to the {\bf ./configure} as shown below: \begin{enumerate} @@ -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 \verb+|+ tar xvf - } +{\bf zcat mysql-filename \lstinline+|+ tar xvf - } will probably accomplish the same thing. @@ -90,7 +90,7 @@ will probably accomplish the same thing. where you replace {\bf mysql-source-directory} with the directory name where you put the MySQL source code. -\item ./configure \verb:--:enable-thread-safe-client \verb:--:prefix=mysql-directory +\item ./configure \lstinline:--:enable-thread-safe-client \lstinline:--:prefix=mysql-directory where you replace {\bf mysql-directory} with the directory name where you want to install mysql. Normally for system wide use this is /usr/local/mysql. @@ -135,7 +135,7 @@ running MySQL, and you should have configured, built and installed {\bf Bacula}. If not, please complete these items before proceeding. Please note that the {\bf ./configure} used to build {\bf Bacula} will need to -include {\bf \verb:--:with-mysql=mysql-directory}, where {\bf mysql-directory} is the +include {\bf \lstinline:--:with-mysql=mysql-directory}, where {\bf mysql-directory} is the directory name that you specified on the ./configure command for configuring MySQL. This is needed so that Bacula can find the necessary include headers and library files for interfacing to MySQL. @@ -171,7 +171,7 @@ Now you will create the Bacula MySQL database and the tables that Bacula uses. create as well as the access databases will be located in \lt{}install-dir\gt{}/var/ in a subdirectory with the name of the database, where \lt{}install-dir\gt{} is the directory name that you - specified on the {\bf \verb:--:prefix} option. This can be important to + specified on the {\bf \lstinline:--:prefix} option. This can be important to know if you want to make a special backup of the Bacula database or to check its size. @@ -233,11 +233,11 @@ device name for your machine. After configuring Bacula with -./configure \verb:--:enable-thread-safe-client \verb:--:prefix=\lt{}mysql-directory\gt{} +./configure \lstinline:--:enable-thread-safe-client \lstinline:--:prefix=\lt{}mysql-directory\gt{} where \lt{}mysql-directory\gt{} is in my case {\bf /home/kern/mysql}, you may have to configure the loader so that it can find the MySQL shared libraries. If you have previously followed this procedure and later add the {\bf -\verb:--:enable-thread-safe-client} options, you will need to rerun the {\bf +\lstinline:--:enable-thread-safe-client} options, you will need to rerun the {\bf ldconfig} program shown below. If you put MySQL in a standard place such as {\bf /usr/lib} or {\bf /usr/local/lib} this will not be necessary, but in my case it is. The description that follows is Linux specific. For other diff --git a/docs/manuals/en/main/newbs4.0features.tex b/docs/manuals/en/main/newbs4.0features.tex index b8c984ac..88a780ef 100644 --- a/docs/manuals/en/main/newbs4.0features.tex +++ b/docs/manuals/en/main/newbs4.0features.tex @@ -2054,8 +2054,8 @@ without any additional installation. If the DLL can not be found automatically it will need to be copied into the Bacula installation -directory (eg C:\verb+\+Program Files\verb+\+Bacula\verb+\+bin). The Exchange API DLL is -named esebcli2.dll and is found in C:\verb+\+Program Files\verb+\+Exchsrvr\verb+\+bin on a +directory (eg C:\lstinline+\+Program Files\lstinline+\+Bacula\lstinline+\+bin). The Exchange API DLL is +named esebcli2.dll and is found in C:\lstinline+\+Program Files\lstinline+\+Exchsrvr\lstinline+\+bin on a default Exchange installation. \subsubsection{Backing Up} @@ -2130,7 +2130,7 @@ the following provisos: overwritten by restore" \item If an entire Storage Group is to be restored (eg all databases and logs in the Storage Group), then it is best to manually delete the - database files from the server (eg C:\verb+\+Program Files\verb+\+Exchsrvr\verb+\+mdbdata\verb+\+*) + database files from the server (eg C:\lstinline+\+Program Files\lstinline+\+Exchsrvr\lstinline+\+mdbdata\lstinline+\+*) as Exchange can get confused by stray log files lying around. \end{bsysitemize} diff --git a/docs/manuals/en/main/newfeatures.tex b/docs/manuals/en/main/newfeatures.tex index 0b9fed9d..b529594e 100644 --- a/docs/manuals/en/main/newfeatures.tex +++ b/docs/manuals/en/main/newfeatures.tex @@ -656,26 +656,26 @@ Order of testing for databases is: \end{bsysitemize} Each configured backend generates a file named: -\verb+libbaccats--.so+ +\lstinline+libbaccats--.so+ A dummy catalog library is created named libbaccats-version.so At configure time the first detected backend is used as the so called default backend and at install time the dummy -\verb+libbaccats-.so+ is replaced with the default backend type. +\lstinline+libbaccats-.so+ is replaced with the default backend type. If you configure all three backends you get three backend libraries and the postgresql gets installed as the default. When you want to switch to another database, first save any old catalog you may have then you can copy one of the three backend libraries over the -\verb+libbaccats-.so+ e.g. +\lstinline+libbaccats-.so+ e.g. An actual command, depending on your \mbacula{} version might be: \begin{lstlisting} cp libbaccats-postgresql-5.2.2.so libbaccats-5.2.2.so \end{lstlisting} -where the \verb+5.2.2+ must be replaced by the \mbacula{} release +where the \lstinline+5.2.2+ must be replaced by the \mbacula{} release version number. Then you must update the default backend in the following files: @@ -2322,8 +2322,8 @@ without any additional installation. If the DLL can not be found automatically it will need to be copied into the \mbacula{} installation -directory (eg C:\verb+\+Program Files\verb+\+Bacula\verb+\+bin). The Exchange API DLL is -named esebcli2.dll and is found in C:\verb+\+Program Files\verb+\+Exchsrvr\verb+\+bin on a +directory (eg C:\lstinline+\+Program Files\lstinline+\+Bacula\lstinline+\+bin). The Exchange API DLL is +named esebcli2.dll and is found in C:\lstinline+\+Program Files\lstinline+\+Exchsrvr\lstinline+\+bin on a default Exchange installation. \subsubsection{Backing Up} @@ -2398,7 +2398,7 @@ the following provisos: overwritten by restore" \item If an entire Storage Group is to be restored (eg all databases and logs in the Storage Group), then it is best to manually delete the - database files from the server (eg C:\verb+\+Program Files\verb+\+Exchsrvr\verb+\+mdbdata\verb+\+*) + database files from the server (eg C:\lstinline+\+Program Files\lstinline+\+Exchsrvr\lstinline+\+mdbdata\lstinline+\+*) as Exchange can get confused by stray log files lying around. \end{bsysitemize} diff --git a/docs/manuals/en/main/postgresql.tex b/docs/manuals/en/main/postgresql.tex index d9c1cd7d..66dcdcb0 100644 --- a/docs/manuals/en/main/postgresql.tex +++ b/docs/manuals/en/main/postgresql.tex @@ -19,20 +19,20 @@ useless because none of the new tools can access it due to the format change, and the PostgreSQL server will not be able to start. If you are building PostgreSQL from source, please be sure to add -the {\bf \verb:--:enable-thread-safety} option when doing the ./configure +the {\bf \lstinline:--:enable-thread-safety} option when doing the ./configure for PostgreSQL. \section{Installing PostgreSQL} \index[general]{PostgreSQL!Installing } -If you use the {\bf ./configure \verb:--:with-postgresql=PostgreSQL-Directory} +If you use the {\bf ./configure \lstinline:--:with-postgresql=PostgreSQL-Directory} statement for configuring {\bf Bacula}, you will need PostgreSQL version 7.4 or later installed. NOTE! PostgreSQL versions earlier than 7.4 do not work with Bacula. If PostgreSQL is installed in the standard system location, you -need only enter {\bf \verb:--:with-postgresql} since the configure program will +need only enter {\bf \lstinline:--:with-postgresql} since the configure program will search all the standard locations. If you install PostgreSQL in your home directory or some other non-standard directory, you will need to provide the -full path with the {\bf \verb:--:with-postgresql} option. +full path with the {\bf \lstinline:--:with-postgresql} option. Installing and configuring PostgreSQL is not difficult but can be confusing the first time. If you prefer, you may want to use a package provided by your @@ -50,7 +50,7 @@ useful configuration and setup information. If you configure the Batch Insert code in Bacula (attribute inserts are 10 times faster), you {\bf must} be using a PostgreSQL that was built with -the {\bf \verb:--:enable-thread-safety} option, otherwise you will get +the {\bf \lstinline:--:enable-thread-safety} option, otherwise you will get data corruption. Most major Linux distros have thread safety turned on, but it is better to check. One way is to see if the PostgreSQL library that Bacula will be linked against references pthreads. This can be done @@ -91,7 +91,7 @@ a running PostgreSQL, and you should have configured, built and installed {\bf Bacula}. If not, please complete these items before proceeding. Please note that the {\bf ./configure} used to build {\bf Bacula} will need to -include {\bf \verb:--:with-postgresql=PostgreSQL-directory}, where {\bf +include {\bf \lstinline:--:with-postgresql=PostgreSQL-directory}, where {\bf PostgreSQL-directory} is the directory name that you specified on the ./configure command for configuring PostgreSQL (if you didn't specify a directory or PostgreSQL is installed in a default location, you do not need to diff --git a/docs/manuals/en/main/quickstart.tex b/docs/manuals/en/main/quickstart.tex index 22b1f6f5..6f9a20bb 100644 --- a/docs/manuals/en/main/quickstart.tex +++ b/docs/manuals/en/main/quickstart.tex @@ -108,9 +108,9 @@ Console programs. If you have followed our recommendations, default configuration files as well as the daemon binaries will be located in your installation directory. In any case, the binaries are found in the directory you specified on the {\bf -\verb:--:sbindir} option to the {\bf ./configure} command, and +\lstinline:--:sbindir} option to the {\bf ./configure} command, and the configuration files are found in the directory you specified -on the {\bf \verb:--:sysconfdir} option. +on the {\bf \lstinline:--:sysconfdir} option. When initially setting up Bacula you will need to invest a bit of time in modifying the default configuration files to suit your environment. This may @@ -127,11 +127,11 @@ The Console program is used by the administrator to interact with the Director and to manually start/stop Jobs or to obtain Job status information. The Console configuration file is found in the directory specified on the -{\bf \verb:--:sysconfdir} option that you specified on the {\bf +{\bf \lstinline:--:sysconfdir} option that you specified on the {\bf ./configure} command and by default is named {\bf bconsole.conf}. The same applies to the wxWidgets console, which is build with the {\bf -\verb:--:enable-bwx-console} option, and the name of the default +\lstinline:--:enable-bwx-console} option, and the name of the default configuration file is, in this case, {\bf bwx-console.conf}. Normally, for first time users, no change is needed to these files. Reasonable @@ -160,7 +160,7 @@ status for each of the daemons. The image shows the status for the Storage daemon (MainSD) that is currently selected. The Monitor configuration file is found in the directory specified on the {\bf -\verb:--:sysconfdir} option that you specified on the {\bf ./configure} command +\lstinline:--:sysconfdir} option that you specified on the {\bf ./configure} command and by default is named {\bf tray-monitor.conf}. Normally, for first time users, you just need to change the permission of this file to allow non-root users to @@ -181,7 +181,7 @@ request of the Director, finds the files to be backed up and sends them (their data) to the Storage daemon. The File daemon configuration file is found in the directory specified on -the {\bf \verb:--:sysconfdir} option that you specified on the {\bf ./configure} +the {\bf \lstinline:--:sysconfdir} option that you specified on the {\bf ./configure} command. By default, the File daemon's configuration file is named {\bf bacula-fd.conf}. Normally, for first time users, no change is needed to this file. Reasonable defaults are set. However, if you are going to back up more @@ -202,7 +202,7 @@ The Director is the central control program for all the other daemons. It schedules and monitors all jobs to be backed up. The Director configuration file is found in the directory specified on the -{\bf \verb:--:sysconfdir} option that you specified on the {\bf ./configure} +{\bf \lstinline:--:sysconfdir} option that you specified on the {\bf ./configure} command. Normally the Director's configuration file is named {\bf bacula-dir.conf}. In general, the only change you must make is modify the FileSet resource so @@ -252,7 +252,7 @@ data from a File daemon and placing it on Storage media, or in the case of a restore request, to find the data and send it to the File daemon. The Storage daemon's configuration file is found in the directory specified on -the {\bf \verb:--:sysconfdir} option that you specified on the {\bf ./configure} +the {\bf \lstinline:--:sysconfdir} option that you specified on the {\bf ./configure} command. By default, the Storage daemon's file is named {\bf bacula-sd.conf}. Edit this file to contain the correct Archive device names for any tape devices that you have. If the configuration process properly detected your diff --git a/docs/manuals/en/main/security.tex b/docs/manuals/en/main/security.tex index 1e3f27da..1413c080 100644 --- a/docs/manuals/en/main/security.tex +++ b/docs/manuals/en/main/security.tex @@ -104,7 +104,7 @@ save you someday. \index[general]{libwrappers} TCP Wrappers are implemented if you turn them on when configuring -({\bf ./configure \verb:--:with-tcp-wrappers}). +({\bf ./configure \lstinline:--:with-tcp-wrappers}). With this code enabled, you may control who may access your daemons. This control is done by modifying the file: {\bf /etc/hosts.allow}. The program name that {\bf Bacula} uses when diff --git a/docs/manuals/en/main/sqlite.tex b/docs/manuals/en/main/sqlite.tex index 7f8ec6d4..9d94f8f6 100644 --- a/docs/manuals/en/main/sqlite.tex +++ b/docs/manuals/en/main/sqlite.tex @@ -21,7 +21,7 @@ such as {\bf bscan}, ... \index[general]{Phase I!Installing and Configuring SQLite -- } \index[general]{Installing and Configuring SQLite -- Phase I } -If you use the {\bf ./configure \verb:--:with-sqlite} statement for configuring {\bf +If you use the {\bf ./configure \lstinline:--:with-sqlite} statement for configuring {\bf Bacula}, you will need SQLite version 2.8.16 or later installed. Our standard location (for the moment) for SQLite is in the dependency package {\bf depkgs/sqlite-2.8.16}. Please note that the version will be updated as new @@ -54,14 +54,14 @@ Installing and Configuring is quite easy. Please note that the {\bf ./configure} used to build {\bf Bacula} will need to -include {\bf \verb:--:with-sqlite} or {\bf \verb:--:with-sqlite3} depending +include {\bf \lstinline:--:with-sqlite} or {\bf \lstinline:--:with-sqlite3} depending one which version of SQLite you are using. You should not use the {\bf -\verb:--:enable-batch-insert} configuration parameter for Bacula if you +\lstinline:--:enable-batch-insert} configuration parameter for Bacula if you are using SQLite version 2 as it is probably not thread safe. If you -are using SQLite version 3, you may use the {\bf \verb:--:enable-batch-insert} +are using SQLite version 3, you may use the {\bf \lstinline:--:enable-batch-insert} configuration option with Bacula, but when building SQLite3 you MUST -configure it with {\bf \verb:--:enable-threadsafe} and -{\bf \verb:--:enable-cross-thread-connections}. +configure it with {\bf \lstinline:--:enable-threadsafe} and +{\bf \lstinline:--:enable-cross-thread-connections}. By default, SQLite3 is now run with {\bf PRAGMA synchronous=OFF} this increases the speed by more than 30 time, but it also increases the diff --git a/docs/manuals/en/main/tls.tex b/docs/manuals/en/main/tls.tex index 9ee39136..d44077c1 100644 --- a/docs/manuals/en/main/tls.tex +++ b/docs/manuals/en/main/tls.tex @@ -35,7 +35,7 @@ subject to known plaintext attacks, and it should be considered considerably less secure than PKI certificate-based authentication. Appropriate autoconf macros have been added to detect and use OpenSSL -if enabled on the {\bf ./configure} line with {\bf \verb?--?with-openssl} +if enabled on the {\bf ./configure} line with {\bf \lstinline?--?with-openssl} \section{TLS Configuration Directives} Additional configuration directives have been added to all the daemons diff --git a/docs/manuals/en/main/tutorial.tex b/docs/manuals/en/main/tutorial.tex index e7202eb7..c1371843 100644 --- a/docs/manuals/en/main/tutorial.tex +++ b/docs/manuals/en/main/tutorial.tex @@ -72,7 +72,7 @@ you will not want to use {\bf startmysql} or {\bf stopmysql}. If you are running this in production, you will probably want to find some way to automatically start MySQL or PostgreSQL after each system reboot. -If you are using SQLite (i.e. you specified the {\bf \verb:--:with-sqlite=xxx} option +If you are using SQLite (i.e. you specified the {\bf \lstinline:--:with-sqlite=xxx} option on the {\bf ./configure} command, you need do nothing. SQLite is automatically started by {\bf Bacula}. @@ -131,7 +131,7 @@ from the top level directory, simply enter: ./bconsole Alternatively to running the command line console, if you have -Qt4 installed and used the {\bf \verb:--:enable-bat} on the configure command, +Qt4 installed and used the {\bf \lstinline:--:enable-bat} on the configure command, you may use the Bacula Administration Tool ({\bf bat}): ./bat @@ -227,7 +227,7 @@ Details of the console program's commands are explained in the At this point, we assume you have done the following: \begin{bsysitemize} -\item Configured Bacula with {\bf ./configure \verb:--:your-options} +\item Configured Bacula with {\bf ./configure \lstinline:--:your-options} \item Built Bacula using {\bf make} \item Installed Bacula using {\bf make install} \item Have created your database with, for example, {\bf diff --git a/docs/manuals/en/main/win32.tex b/docs/manuals/en/main/win32.tex index 6fc277e9..958f07e2 100644 --- a/docs/manuals/en/main/win32.tex +++ b/docs/manuals/en/main/win32.tex @@ -830,7 +830,7 @@ In order to avoid option clashes between the options necessary for {\bf Bacula} to run on Windows and the standard Bacula options, all Windows specific options are signaled with a forward slash character (/), while as usual, the standard Bacula options are signaled with a minus (-), or a minus -minus (\verb:--:). All the standard Bacula options can be used on the Windows +minus (\lstinline:--:). All the standard Bacula options can be used on the Windows version. In addition, the following Windows only options are implemented: \begin{description}