From 3db8a0b7ec15f76bc2eef072f7d0233f2098b7bf Mon Sep 17 00:00:00 2001 From: Joerg Steffens Date: Mon, 21 Sep 2015 17:10:49 +0200 Subject: [PATCH] make document work with babel --- .../en/main/bareos-manual-main-reference.tex | 3 ++ manuals/en/main/bareos.sty | 4 +++ .../director-resource-pool-definitions.tex | 28 ++++++++++--------- manuals/en/main/howto.tex | 2 +- manuals/en/main/restore.tex | 5 ++-- manuals/en/main/win32.tex | 3 +- 6 files changed, 28 insertions(+), 17 deletions(-) diff --git a/manuals/en/main/bareos-manual-main-reference.tex b/manuals/en/main/bareos-manual-main-reference.tex index df60707..b7927c2 100644 --- a/manuals/en/main/bareos-manual-main-reference.tex +++ b/manuals/en/main/bareos-manual-main-reference.tex @@ -14,6 +14,9 @@ \textheight 10in \textwidth 6.5in + +\usepackage[utf8]{inputenc} +\usepackage[english]{babel} \usepackage{float} \usepackage{graphicx} \DeclareGraphicsExtensions{.png,.jpg} diff --git a/manuals/en/main/bareos.sty b/manuals/en/main/bareos.sty index e91990a..37962e6 100644 --- a/manuals/en/main/bareos.sty +++ b/manuals/en/main/bareos.sty @@ -135,6 +135,7 @@ % % bcommand{command}{parameter} \newcommand{\bcommand}[2]{\path|#1| \path|#2|} +\newcommand{\bconsoleOutput}[1]{\path|#1|} \newcommand{\bnfvar}[1]{\lt#1\gt} \newcommand{\commandPrompt}{root{\at}linux:\~{}\# } \newcommand{\command}[1]{\path|#1|} @@ -152,6 +153,7 @@ \newcommand{\parameter}[1]{\path|#1|} \newcommand{\registrykey}[1]{\path|#1|} \newcommand{\variable}[1]{\path|#1|} +\newcommand{\volume}[1]{\path|#1|} \newcommand{\os}[2]{\ifthenelse{\isempty{#2}}{% \path|#1|\index[general]{Platform!#1}% }{% @@ -161,6 +163,8 @@ \newcommand{\vmware}{VMware\registered} \newcommand{\vSphere}{VMware vSphere\registered} +% Bareos quote +\newcommand{\bquote}[1]{``#1''} %% \newcommand{\debug}[1]{\marginpar{#1}} %% diff --git a/manuals/en/main/director-resource-pool-definitions.tex b/manuals/en/main/director-resource-pool-definitions.tex index bd4e80d..5abbf1c 100644 --- a/manuals/en/main/director-resource-pool-definitions.tex +++ b/manuals/en/main/director-resource-pool-definitions.tex @@ -95,33 +95,35 @@ Volume names during automatic Volume labeling. The {\bf format} should be specified in double quotes, and consists of -letters, numbers and the special characters hyphen ({\bf -}), underscore -({\bf \_}), colon ({\bf :}), and period ({\bf .}), which are the legal -characters for a Volume name. The {\bf format} should be enclosed in -double quotes ("). +letters, numbers and the special characters hyphen (\path|-|), underscore +(\path|_|), colon (\path|:|), and period (\path|.|), which are the legal +characters for a Volume name. The format should be enclosed in +double quotes (\path|"|). In addition, the format may contain a number of variable expansion characters which will be expanded by a complex algorithm allowing you to create Volume names of many different formats. In all cases, the expansion process must resolve to the set of characters noted above that are legal Volume names. Generally, these variable expansion characters -begin with a dollar sign ({\bf \$}) or a left bracket ({\bf [}). If you +begin with a dollar sign (\path|$|) +or a left bracket (\path|[|). If you specify variable expansion characters, you should always enclose the -format with double quote characters ({\bf "}). For more details on -variable expansion, please see the \ilink{Variable -Expansion}{VarsChapter} Chapter of this manual. +format with double quote characters (\path|"|). For more details on +variable expansion, please see the +\ilink{Variable Expansion}{VarsChapter} Chapter of this manual. If no variable expansion characters are found in the string, the Volume name will be formed from the {\bf format} string appended with the a unique number that increases. If you do not remove volumes from the pool, this number should be the number of volumes plus one, but this is not guaranteed. The unique number will be edited as four -digits with leading zeros. For example, with a {\bf Label Format = -"File-"}, the first volumes will be named {\bf File-0001}, {\bf -File-0002}, ... +digits with leading zeros. For example, with a +\configdirective{Label Format = "File-"}, +the first volumes will be named \volume{File-0001}, \volume{File-0002}, ... -With the exception of Job specific variables, you can test your {\bf -LabelFormat} by using the \ilink{var command}{var} the Console Chapter +With the exception of Job specific variables, you can test your +\configdirective{Label Format} +by using the \ilink{var command}{var} the Console Chapter of this manual. In almost all cases, you should enclose the format specification (part diff --git a/manuals/en/main/howto.tex b/manuals/en/main/howto.tex index 22a64c7..e8b4a73 100644 --- a/manuals/en/main/howto.tex +++ b/manuals/en/main/howto.tex @@ -767,7 +767,7 @@ \subsubsection{Backup of a MySQL Databases by using the Python MySQL plugin} \begin{itemize} \item \textit{db}, comma separated list of databases to save, where each database will be stored in a separate file. If ommited, all databases will be saved. \item \textit{dumpbinary}, command (with or without full path) to create the dumps. Default: mysqldump - \item \textit{dumpoptions}, options for dumpbinary, default: " --events --single-transaction" + \item \textit{dumpoptions}, options for dumpbinary, default: \bquote{ --events --single-transaction} \item \textit{mysqlhost}, MySQL host to connect to, default: localhost \item \textit{mysqluser}, MySQL user. Default: unset, the user running the file-daemon will be used (usually root) \item \textit{mysqlpassword}, MySQL password. Default: unset (better use my.cnf to store passwords) diff --git a/manuals/en/main/restore.tex b/manuals/en/main/restore.tex index 3fc53dc..596edd7 100644 --- a/manuals/en/main/restore.tex +++ b/manuals/en/main/restore.tex @@ -263,8 +263,9 @@ \section{The Restore Command} \end{verbatim} \normalsize -Depending on the number of {\bf JobFiles} for each JobId, the {\bf Building -directory tree ..."} can take a bit of time. If you notice ath all the +Depending on the number of {\bf JobFiles} for each JobId, +the \bquote{\bconsoleOutput{Building directory tree ...}} can take a bit of time. +If you notice ath all the JobFiles are zero, your Files have probably been pruned and you will not be able to select any individual files -- it will be restore everything or nothing. diff --git a/manuals/en/main/win32.tex b/manuals/en/main/win32.tex index ca347bc..f13808a 100644 --- a/manuals/en/main/win32.tex +++ b/manuals/en/main/win32.tex @@ -497,7 +497,8 @@ \section{Volume Shadow Copy Service (VSS)} \end{verbatim} \normalsize In the above Job Report listing, you see that the VSS snapshot was generated for drive C (if -other drives are backed up, they will be listed on the {\bf Drive(s)="C"}. You also see the +other drives are backed up, they will be listed on the \bconsoleOutput{Drive(s)="C"} line. +You also see the reports from each of the writer program. Here they all report VSS\_WS\_STABLE, which means that you will get a consistent snapshot of the data handled by that writer.